diff --git a/.gitignore b/.gitignore
index 8d05f8f3337..c027f5873c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ scripts/processDiagnosticMessages.js
 scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 src/harness/*.js
 src/compiler/diagnosticInformationMap.generated.ts
+src/compiler/diagnosticMessages.generated.json
 rwc-report.html
 *.swp
 build.json
diff --git a/.npmignore b/.npmignore
index 3af34bded4a..d295e9bbd77 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,6 @@
 built
 doc
+lib/README.md
 scripts
 src
 tests
diff --git a/.travis.yml b/.travis.yml
index 03e319f6b16..b31d1f10da0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 
 node_js:
+  - 'stable'
   - '4'
   - '0.10'
 
diff --git a/AUTHORS.md b/AUTHORS.md
index 0ade4c31221..486a15bf47f 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -8,6 +8,7 @@ TypeScript is authored by:
 * Basarat Ali Syed 
 * Ben Duffield
 * Bill Ticehurst 
+* Brett Mayen
 * Bryan Forbes 
 * Caitlin Potter 
 * Chris Bubernak
@@ -17,11 +18,14 @@ TypeScript is authored by:
 * Dan Quirk 
 * Daniel Rosenwasser
 * David Li 
-* Dick van den Brink 
-* Dirk Bäumer 
+* Denis Nedelyaev
+* Dick van den Brink
+* Dirk Bäumer
+* Eyas Sharaiha
 * Frank Wallis 
 * Gabriel Isenberg
 * Gilad Peleg 
+* Graeme Wicksted
 * Guillaume Salles 
 * Harald Niesche
 * Ingvar Stepanyan
@@ -31,30 +35,39 @@ TypeScript is authored by:
 * Jason Ramsay 
 * Jed Mao
 * Johannes Rieken 
+* John Vilk
 * Jonathan Bond-Caron
 * Jonathan Park
 * Jonathan Turner
 * Josh Kalderimis
+* Julian Williams
 * Kagami Sascha Rosylight
 * Keith Mashinter
+* Ken Howard
 * Kenji Imamula
 * Lorant Pinter 
+* Martin Všeti�ka
 * Masahiro Wakame
 * Max Deepfield
 * Micah Zoltu 
 * Mohamed Hegazy 
+* Nathan Shively-Sanders
 * Oleg Mihailik
 * Oleksandr Chekhovskyi 
 * Paul van Brenk 
 * Pedro Maltez 
 * Philip Bulley
 * piloopin
+* @progre
+* Punya Biswal
 * Ron Buckton 
 * Ryan Cavanaugh 
+* Ryohei Ikegami
+* Sébastien Arod
 * Sheetal Nandi
 * Shengping Zhong
 * Shyyko Serhiy
-* Simon Hürlimann
+* Simon Hürlimann
 * Solal Pirelli
 * Stan Thomas
 * Steve Lucco
@@ -63,8 +76,10 @@ TypeScript is authored by:
 * togru
 * Tomas Grubliauskas
 * TruongSinh Tran-Nguyen
+* Viliv Vane
 * Vladimir Matveev
 * Wesley Wigham
+* York Yao
 * Yui Tanglertsampan
 * Zev Spitz 
-* Zhengbo Li
\ No newline at end of file
+* Zhengbo Li
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2e2c28590c2..68d88854849 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,6 +32,19 @@ Your pull request should:
 * Follow the code conventions descriped in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
 * To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
 
+## Contributing `lib.d.ts` fixes
+ 
+The library sources are in: [src/lib](https://github.com/Microsoft/TypeScript/tree/master/src/lib)
+
+To build the library files, run
+```Shell
+jake lib
+```
+
+#### `src/lib/dom.generated.d.ts` and `src/lib/webworker.generated.d.ts`
+
+These two files represent the DOM typings and are auto-generated. To make any modifications to them, please submit a PR to  https://github.com/Microsoft/TSJS-lib-generator
+
 ## Running the Tests
 
 To run all tests, invoke the `runtests` target using jake:
diff --git a/Jakefile.js b/Jakefile.js
index 5b93462d855..5dfbcc26d74 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -96,7 +96,7 @@ var servicesSources = [
     return path.join(servicesDirectory, f);
 }));
 
-var serverSources = [
+var serverCoreSources = [
     "node.d.ts",
     "editorServices.ts",
     "protocol.d.ts",
@@ -104,7 +104,9 @@ var serverSources = [
     "server.ts"
 ].map(function (f) {
     return path.join(serverDirectory, f);
-}).concat(servicesSources);
+});
+
+var serverSources = serverCoreSources.concat(servicesSources);
 
 var languageServiceLibrarySources = [
     "editorServices.ts",
@@ -145,7 +147,8 @@ var harnessSources = harnessCoreSources.concat([
     "transpile.ts",
     "reuseProgramStructure.ts",
     "cachingInServerLSHost.ts",
-    "moduleResolution.ts"
+    "moduleResolution.ts",
+    "tsconfigParsing.ts"
 ].map(function (f) {
     return path.join(unittestsDirectory, f);
 })).concat([
@@ -164,7 +167,7 @@ var librarySourceMap = [
         { 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: ["core.d.ts", "es6.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.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"] }
 ];
 
 var libraryTargets = librarySourceMap.map(function (f) {
@@ -225,7 +228,7 @@ var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
 function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) {
     file(outFile, prereqs, function() {
         var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
-        var options = "--module commonjs --noImplicitAny --noEmitOnError";
+        var options = "--noImplicitAny --noEmitOnError --pretty";
 
         // Keep comments when specifically requested
         // or when in debug mode.
@@ -248,6 +251,9 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
         if (!noOutFile) {
             options += " --out " + outFile;
         }
+        else {
+            options += " --module commonjs"
+        }
 
         if(noResolve) {
             options += " --noResolve";
@@ -320,6 +326,8 @@ var processDiagnosticMessagesJs = path.join(scriptsDirectory, "processDiagnostic
 var processDiagnosticMessagesTs = path.join(scriptsDirectory, "processDiagnosticMessages.ts");
 var diagnosticMessagesJson = path.join(compilerDirectory, "diagnosticMessages.json");
 var diagnosticInfoMapTs = path.join(compilerDirectory, "diagnosticInformationMap.generated.ts");
+var generatedDiagnosticMessagesJSON = path.join(compilerDirectory, "diagnosticMessages.generated.json");
+var builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "diagnosticMessages.generated.json");
 
 file(processDiagnosticMessagesTs);
 
@@ -348,6 +356,12 @@ file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson],
     ex.run();
 }, {async: true});
 
+file(builtGeneratedDiagnosticMessagesJSON,[generatedDiagnosticMessagesJSON], function() {
+    if (fs.existsSync(builtLocalDirectory)) {
+        jake.cpR(generatedDiagnosticMessagesJSON, builtGeneratedDiagnosticMessagesJSON);
+    }
+});
+
 desc("Generates a diagnostic file in TypeScript based on an input JSON file");
 task("generate-diagnostics", [diagnosticInfoMapTs]);
 
@@ -444,6 +458,8 @@ compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].conca
                 // Stanalone/web definition file using global 'ts' namespace
                 jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, {silent: true});
                 var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
+                definitionFileContents = definitionFileContents.replace(/^(\s*)(export )?const enum (\S+) {(\s*)$/gm, '$1$2enum $3 {$4');
+                fs.writeFileSync(standaloneDefinitionsFile, definitionFileContents);
 
                 // Official node package definition file, pointed to by 'typings' in package.json
                 // Created by appending 'export = ts;' at the end of the standalone file to turn it into an external module
@@ -476,7 +492,7 @@ task("lssl", [lsslFile]);
 
 // Local target to build the compiler and services
 desc("Builds the full compiler and services");
-task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile]);
+task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON]);
 
 // Local target to build only tsc.js
 desc("Builds only the compiler");
@@ -626,9 +642,7 @@ function deleteTemporaryProjectOutput() {
     }
 }
 
-var testTimeout = 20000;
-desc("Runs the tests using the built run.js file. Syntax is jake runtests. Optional parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]', debug=true.");
-task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
+function runConsoleTests(defaultReporter, defaultSubsets, postLint) {
     cleanTestDirs();
     var debug = process.env.debug || process.env.d;
     tests = process.env.test || process.env.tests || process.env.t;
@@ -638,7 +652,7 @@ task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
         fs.unlinkSync(testConfigFile);
     }
 
-    if(tests || light) {
+    if (tests || light) {
         writeTestConfigFile(tests, light, testConfigFile);
     }
 
@@ -648,20 +662,48 @@ task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
 
     colors = process.env.colors || process.env.color
     colors = colors ? ' --no-colors ' : ' --colors ';
-    tests = tests ? ' -g ' + tests : '';
-    reporter = process.env.reporter || process.env.r || 'mocha-fivemat-progress-reporter';
+    reporter = process.env.reporter || process.env.r || defaultReporter;
+
     // timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally
     // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
-    var cmd = "mocha" + (debug ? " --debug-brk" : "") + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
-    console.log(cmd);
-    exec(cmd, function() {
-        deleteTemporaryProjectOutput();
-        var lint = jake.Task['lint'];
-        lint.addListener('complete', function () {
-            complete();
+    var subsetRegexes;
+    if(defaultSubsets.length === 0) {
+        subsetRegexes = [tests]
+    }
+    else {
+        var subsets = tests ? tests.split("|") : defaultSubsets;
+        subsetRegexes = subsets.map(function (sub) { return "^" + sub + ".*$"; });
+        subsetRegexes.push("^(?!" + subsets.join("|") + ").*$");
+    }
+    subsetRegexes.forEach(function (subsetRegex) {
+        tests = subsetRegex ? ' -g "' + subsetRegex + '"' : '';
+        var cmd = "mocha" + (debug ? " --debug-brk" : "") + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
+        console.log(cmd);
+        exec(cmd, function () {
+            deleteTemporaryProjectOutput();
+            if (postLint) {
+                var lint = jake.Task['lint'];
+                lint.addListener('complete', function () {
+                    complete();
+                });
+                lint.invoke();
+            }
+            else {
+                complete();
+            }
         });
-        lint.invoke();
     });
+}
+
+var testTimeout = 20000;
+desc("Runs all the tests in parallel using the built run.js file. Optional arguments are: t[ests]=category1|category2|... d[ebug]=true.");
+task("runtests-parallel", ["build-rules", "tests", builtLocalDirectory], function() {
+    runConsoleTests('min', ['compiler', 'conformance', 'Projects', 'fourslash']);
+}, {async: true});
+
+desc("Runs the tests using the built run.js file. Optional arguments are: t[ests]=regex r[eporter]=[list|spec|json|<more>] d[ebug]=true color[s]=false.");
+task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
+    runConsoleTests('mocha-fivemat-progress-reporter', [], /*postLint*/ true);
 }, {async: true});
 
 desc("Generates code coverage data via instanbul");
@@ -820,7 +862,9 @@ var tslintRuleDir = "scripts/tslint";
 var tslintRules = ([
     "nextLineRule",
     "noNullRule",
-    "booleanTriviaRule"
+    "preferConstRule",
+    "booleanTriviaRule",
+    "typeOperatorSpacingRule"
 ]);
 var tslintRulesFiles = tslintRules.map(function(p) {
     return path.join(tslintRuleDir, p + ".ts");
@@ -863,7 +907,9 @@ function lintFileAsync(options, path, cb) {
     });
 }
 
-var lintTargets = compilerSources.concat(harnessCoreSources);
+var lintTargets = compilerSources
+    .concat(harnessCoreSources)
+    .concat(serverCoreSources);
 
 desc("Runs tslint on the compiler sources");
 task("lint", ["build-rules"], function() {
diff --git a/README.md b/README.md
index e27e7a99fa7..13e1f3e4786 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
-[![npm version](https://badge.fury.io/js/typescript.svg)](http://badge.fury.io/js/typescript)
-[![Downloads](http://img.shields.io/npm/dm/TypeScript.svg)](https://npmjs.org/package/typescript)
+[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
+[![Downloads](https://img.shields.io/npm/dm/TypeScript.svg)](https://www.npmjs.com/package/typescript)
 
 # TypeScript
 
diff --git a/lib/README.md b/lib/README.md
new file mode 100644
index 00000000000..b2837989505
--- /dev/null
+++ b/lib/README.md
@@ -0,0 +1,4 @@
+# Read this!
+
+These files are not meant to be edited by hand.
+If you need to make modifications, the respective files should be changed within the repository's top-level `src` directory.
\ No newline at end of file
diff --git a/lib/lib.core.d.ts b/lib/lib.core.d.ts
index b588c9fdb77..50fd8a8e495 100644
--- a/lib/lib.core.d.ts
+++ b/lib/lib.core.d.ts
@@ -1225,7 +1225,7 @@ interface ArrayBuffer {
 interface ArrayBufferConstructor {
     prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
-    isView(arg: any): boolean;
+    isView(arg: any): arg is ArrayBufferView;
 }
 declare var ArrayBuffer: ArrayBufferConstructor;
 
diff --git a/lib/lib.core.es6.d.ts b/lib/lib.core.es6.d.ts
index 6d6a68559f8..857f5957a45 100644
--- a/lib/lib.core.es6.d.ts
+++ b/lib/lib.core.es6.d.ts
@@ -1225,7 +1225,7 @@ interface ArrayBuffer {
 interface ArrayBufferConstructor {
     prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
-    isView(arg: any): boolean;
+    isView(arg: any): arg is ArrayBufferView;
 }
 declare var ArrayBuffer: ArrayBufferConstructor;
 
diff --git a/lib/lib.d.ts b/lib/lib.d.ts
index 40a29796586..fd4c05da220 100644
--- a/lib/lib.d.ts
+++ b/lib/lib.d.ts
@@ -1225,7 +1225,7 @@ interface ArrayBuffer {
 interface ArrayBufferConstructor {
     prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
-    isView(arg: any): boolean;
+    isView(arg: any): arg is ArrayBufferView;
 }
 declare var ArrayBuffer: ArrayBufferConstructor;
 
@@ -6234,6 +6234,68 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
     createElement(tagName: "xmp"): HTMLBlockElement;
     createElement(tagName: string): HTMLElement;
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "clipPath"): SVGClipPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "componentTransferFunction"): SVGComponentTransferFunctionElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "defs"): SVGDefsElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "desc"): SVGDescElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "ellipse"): SVGEllipseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feBlend"): SVGFEBlendElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feColorMatrix"): SVGFEColorMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComponentTransfer"): SVGFEComponentTransferElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComposite"): SVGFECompositeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feConvolveMatrix"): SVGFEConvolveMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDiffuseLighting"): SVGFEDiffuseLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDisplacementMap"): SVGFEDisplacementMapElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDistantLight"): SVGFEDistantLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFlood"): SVGFEFloodElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncA"): SVGFEFuncAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncB"): SVGFEFuncBElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncG"): SVGFEFuncGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncR"): SVGFEFuncRElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feGaussianBlur"): SVGFEGaussianBlurElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feImage"): SVGFEImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMerge"): SVGFEMergeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMergeNode"): SVGFEMergeNodeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMorphology"): SVGFEMorphologyElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feOffset"): SVGFEOffsetElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "fePointLight"): SVGFEPointLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpecularLighting"): SVGFESpecularLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpotLight"): SVGFESpotLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTile"): SVGFETileElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTurbulence"): SVGFETurbulenceElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "filter"): SVGFilterElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "foreignObject"): SVGForeignObjectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "g"): SVGGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "image"): SVGImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "gradient"): SVGGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "line"): SVGLineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "linearGradient"): SVGLinearGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "marker"): SVGMarkerElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "mask"): SVGMaskElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "path"): SVGPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "metadata"): SVGMetadataElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "pattern"): SVGPatternElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polygon"): SVGPolygonElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polyline"): SVGPolylineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "radialGradient"): SVGRadialGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "rect"): SVGRectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "svg"): SVGSVGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "stop"): SVGStopElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "switch"): SVGSwitchElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "symbol"): SVGSymbolElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "tspan"): SVGTSpanElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textContent"): SVGTextContentElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "text"): SVGTextElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPath"): SVGTextPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPositioning"): SVGTextPositioningElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "use"): SVGUseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "view"): SVGViewElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement
     createElementNS(namespaceURI: string, qualifiedName: string): Element;
     createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
     createNSResolver(nodeResolver: Node): XPathNSResolver;
@@ -11055,14 +11117,12 @@ interface ImageData {
     width: number;
 }
 
-interface ImageDataConstructor {
+declare var ImageData: {
     prototype: ImageData;
     new(width: number, height: number): ImageData;
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-declare var ImageData: ImageDataConstructor; 
-
 interface KeyboardEvent extends UIEvent {
     altKey: boolean;
     char: string;
diff --git a/lib/lib.dom.d.ts b/lib/lib.dom.d.ts
index 41d569ba9f7..69014415c15 100644
--- a/lib/lib.dom.d.ts
+++ b/lib/lib.dom.d.ts
@@ -2410,6 +2410,68 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
     createElement(tagName: "xmp"): HTMLBlockElement;
     createElement(tagName: string): HTMLElement;
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "clipPath"): SVGClipPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "componentTransferFunction"): SVGComponentTransferFunctionElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "defs"): SVGDefsElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "desc"): SVGDescElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "ellipse"): SVGEllipseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feBlend"): SVGFEBlendElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feColorMatrix"): SVGFEColorMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComponentTransfer"): SVGFEComponentTransferElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComposite"): SVGFECompositeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feConvolveMatrix"): SVGFEConvolveMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDiffuseLighting"): SVGFEDiffuseLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDisplacementMap"): SVGFEDisplacementMapElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDistantLight"): SVGFEDistantLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFlood"): SVGFEFloodElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncA"): SVGFEFuncAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncB"): SVGFEFuncBElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncG"): SVGFEFuncGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncR"): SVGFEFuncRElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feGaussianBlur"): SVGFEGaussianBlurElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feImage"): SVGFEImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMerge"): SVGFEMergeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMergeNode"): SVGFEMergeNodeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMorphology"): SVGFEMorphologyElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feOffset"): SVGFEOffsetElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "fePointLight"): SVGFEPointLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpecularLighting"): SVGFESpecularLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpotLight"): SVGFESpotLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTile"): SVGFETileElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTurbulence"): SVGFETurbulenceElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "filter"): SVGFilterElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "foreignObject"): SVGForeignObjectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "g"): SVGGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "image"): SVGImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "gradient"): SVGGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "line"): SVGLineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "linearGradient"): SVGLinearGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "marker"): SVGMarkerElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "mask"): SVGMaskElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "path"): SVGPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "metadata"): SVGMetadataElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "pattern"): SVGPatternElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polygon"): SVGPolygonElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polyline"): SVGPolylineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "radialGradient"): SVGRadialGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "rect"): SVGRectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "svg"): SVGSVGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "stop"): SVGStopElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "switch"): SVGSwitchElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "symbol"): SVGSymbolElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "tspan"): SVGTSpanElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textContent"): SVGTextContentElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "text"): SVGTextElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPath"): SVGTextPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPositioning"): SVGTextPositioningElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "use"): SVGUseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "view"): SVGViewElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement
     createElementNS(namespaceURI: string, qualifiedName: string): Element;
     createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
     createNSResolver(nodeResolver: Node): XPathNSResolver;
@@ -7231,14 +7293,12 @@ interface ImageData {
     width: number;
 }
 
-interface ImageDataConstructor {
+declare var ImageData: {
     prototype: ImageData;
     new(width: number, height: number): ImageData;
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-declare var ImageData: ImageDataConstructor; 
-
 interface KeyboardEvent extends UIEvent {
     altKey: boolean;
     char: string;
diff --git a/lib/lib.es6.d.ts b/lib/lib.es6.d.ts
index a7bf8f05076..564c302031d 100644
--- a/lib/lib.es6.d.ts
+++ b/lib/lib.es6.d.ts
@@ -13,6 +13,1321 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
+declare type PropertyKey = string | number | symbol;
+
+interface Symbol {
+    /** Returns a string representation of an object. */
+    toString(): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): Object;
+
+    [Symbol.toStringTag]: string;
+}
+
+interface SymbolConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    prototype: Symbol;
+
+    /**
+      * Returns a new unique Symbol value.
+      * @param  description Description of the new Symbol object.
+      */
+    (description?: string|number): symbol;
+
+    /**
+      * Returns a Symbol object from the global symbol registry matching the given key if found. 
+      * Otherwise, returns a new symbol with this key.
+      * @param key key to search for.
+      */
+    for(key: string): symbol;
+
+    /**
+      * Returns a key from the global symbol registry matching the given Symbol if found. 
+      * Otherwise, returns a undefined.
+      * @param sym Symbol to find the key for.
+      */
+    keyFor(sym: symbol): string;
+
+    // Well-known Symbols
+
+    /** 
+      * A method that determines if a constructor object recognizes an object as one of the 
+      * constructor’s instances. Called by the semantics of the instanceof operator. 
+      */
+    hasInstance: symbol;
+
+    /** 
+      * A Boolean value that if true indicates that an object should flatten to its array elements
+      * by Array.prototype.concat.
+      */
+    isConcatSpreadable: symbol;
+
+    /** 
+      * A method that returns the default iterator for an object. Called by the semantics of the 
+      * for-of statement.
+      */
+    iterator: symbol;
+
+    /**
+      * A regular expression method that matches the regular expression against a string. Called 
+      * by the String.prototype.match method. 
+      */
+    match: symbol;
+
+    /** 
+      * A regular expression method that replaces matched substrings of a string. Called by the 
+      * String.prototype.replace method.
+      */
+    replace: symbol;
+
+    /**
+      * A regular expression method that returns the index within a string that matches the 
+      * regular expression. Called by the String.prototype.search method.
+      */
+    search: symbol;
+
+    /** 
+      * A function valued property that is the constructor function that is used to create 
+      * derived objects.
+      */
+    species: symbol;
+
+    /**
+      * A regular expression method that splits a string at the indices that match the regular 
+      * expression. Called by the String.prototype.split method.
+      */
+    split: symbol;
+
+    /** 
+      * A method that converts an object to a corresponding primitive value.
+      * Called by the ToPrimitive abstract operation.
+      */
+    toPrimitive: symbol;
+
+    /** 
+      * A String value that is used in the creation of the default string description of an object.
+      * Called by the built-in method Object.prototype.toString.
+      */
+    toStringTag: symbol;
+
+    /**
+      * An Object whose own property names are property names that are excluded from the 'with'
+      * environment bindings of the associated objects.
+      */
+    unscopables: symbol;
+}
+declare var Symbol: SymbolConstructor;
+
+interface Object {
+    /**
+      * Determines whether an object has a property with the specified name. 
+      * @param v A property name.
+      */
+    hasOwnProperty(v: PropertyKey): boolean;
+
+    /** 
+      * Determines whether a specified property is enumerable.
+      * @param v A property name.
+      */
+    propertyIsEnumerable(v: PropertyKey): boolean;
+}
+
+interface ObjectConstructor {
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source The source object from which to copy properties.
+      */
+    assign<T, U>(target: T, source: U): T & U;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      */
+    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      * @param source3 The third source object from which to copy properties.
+      */
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param sources One or more source objects from which to copy properties
+      */
+    assign(target: any, ...sources: any[]): any;
+
+    /**
+      * Returns an array of all symbol properties found directly on object o.
+      * @param o Object to retrieve the symbols from.
+      */
+    getOwnPropertySymbols(o: any): symbol[];
+
+    /**
+      * Returns true if the values are the same value, false otherwise.
+      * @param value1 The first value.
+      * @param value2 The second value.
+      */
+    is(value1: any, value2: any): boolean;
+
+    /**
+      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
+      * @param o The object to change its prototype.
+      * @param proto The value of the new prototype or null.
+      */
+    setPrototypeOf(o: any, proto: any): any;
+
+    /**
+      * Gets the own property descriptor of the specified object. 
+      * An own property descriptor is one that is defined directly on the object and is not 
+      * inherited from the object's prototype. 
+      * @param o Object that contains the property.
+      * @param p Name of the property.
+    */
+    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
+
+    /**
+      * Adds a property to an object, or modifies attributes of an existing property. 
+      * @param o Object on which to add or modify the property. This can be a native JavaScript 
+      * object (that is, a user-defined object or a built in object) or a DOM object.
+      * @param p The property name.
+      * @param attributes Descriptor for the property. It can be for a data property or an accessor
+      *  property.
+      */
+    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
+}
+
+interface Function {
+    /**
+      * Returns the name of the function. Function names are read-only and can not be changed.
+      */
+    name: string;
+
+    /**
+     * Determines whether the given value inherits from this function if this function was used
+     * as a constructor function.
+     *
+     * A constructor function can control which objects are recognized as its instances by
+     * 'instanceof' by overriding this method.
+     */
+    [Symbol.hasInstance](value: any): boolean;
+}
+
+interface NumberConstructor {
+    /**
+      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
+      * that is representable as a Number value, which is approximately: 
+      * 2.2204460492503130808472633361816 x 10�−�16.
+      */
+    EPSILON: number;
+
+    /**
+      * Returns true if passed value is finite.
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
+      * number. Only finite values of the type number, result in true.
+      * @param number A numeric value.
+      */
+    isFinite(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is an integer, false otherwise.
+      * @param number A numeric value.
+      */
+    isInteger(number: number): boolean;
+
+    /**
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
+      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
+      * to a number. Only values of the type number, that are also NaN, result in true.
+      * @param number A numeric value.
+      */
+    isNaN(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is a safe integer.
+      * @param number A numeric value.
+      */
+    isSafeInteger(number: number): boolean;
+
+    /** 
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
+      */
+    MAX_SAFE_INTEGER: number;
+
+    /** 
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
+      */
+    MIN_SAFE_INTEGER: number;
+
+    /**
+      * Converts a string to a floating-point number. 
+      * @param string A string that contains a floating-point number. 
+      */
+    parseFloat(string: string): number;
+
+    /**
+      * Converts A string to an integer.
+      * @param s A string to convert into a number.
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
+      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+      * All other strings are considered decimal.
+      */
+    parseInt(string: string, radix?: number): number;
+}
+
+interface Array<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
+    /**
+     * Returns an object whose properties have the value 'true'
+     * when they will be absent when used in a 'with' statement.
+     */
+    [Symbol.unscopables](): {
+        copyWithin: boolean;
+        entries: boolean;
+        fill: boolean;
+        find: boolean;
+        findIndex: boolean;
+        keys: boolean;
+        values: boolean;
+    };
+
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, T]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<T>;
+
+    /** 
+      * Returns the value of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
+
+    /** 
+      * Returns the index of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
+
+    /**
+      * Returns the this object after filling the section identified by start and end with value
+      * @param value value to fill array section with
+      * @param start index to start filling the array at. If start is negative, it is treated as 
+      * length+start where length is the length of the array. 
+      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * length+end.
+      */
+    fill(value: T, start?: number, end?: number): T[];
+
+    /** 
+      * Returns the this object after copying a section of the array identified by start and end
+      * to the same array starting at position target
+      * @param target If target is negative, it is treated as length+target where length is the 
+      * length of the array. 
+      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * is treated as length+end.
+      * @param end If not specified, length of the this object is used as its default value. 
+      */
+    copyWithin(target: number, start: number, end?: number): T[];
+}
+
+interface IArguments {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<any>;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      */
+    from<T>(arrayLike: ArrayLike<T>): Array<T>;
+
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      */
+    from<T>(iterable: Iterable<T>): Array<T>;
+
+    /**
+      * Returns a new array from a set of elements.
+      * @param items A set of elements to include in the new array object.
+      */
+    of<T>(...items: T[]): Array<T>;
+}
+
+interface String {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<string>;
+
+    /**
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
+      * value of the UTF-16 encoded code point starting at the string element at position pos in 
+      * the String resulting from converting this object to a String. 
+      * If there is no element at that position, the result is undefined. 
+      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
+      */
+    codePointAt(pos: number): number;
+
+    /**
+      * Returns true if searchString appears as a substring of the result of converting this 
+      * object to a String, at one or more positions that are 
+      * greater than or equal to position; otherwise, returns false.
+      * @param searchString search string 
+      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
+      */
+    includes(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * endPosition – length(this). Otherwise returns false.
+      */
+    endsWith(searchString: string, endPosition?: number): boolean;
+
+    /**
+      * Returns the String value result of normalizing the string into the normalization form 
+      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
+      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
+      * is "NFC"
+      */
+    normalize(form?: string): string;
+
+    /**
+      * Returns a String value that is made from count copies appended together. If count is 0, 
+      * T is the empty String is returned.
+      * @param count number of copies to append
+      */
+    repeat(count: number): string;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * position. Otherwise returns false.
+      */
+    startsWith(searchString: string, position?: number): boolean;
+
+    // Overloads for objects with methods of well-known symbols.
+
+    /**
+      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
+      * @param matcher An object that supports being matched against.
+      */
+    match(matcher: { [Symbol.match](string: string): RegExpMatchArray; }): RegExpMatchArray;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replacer A function that returns the replacement text.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the first substring match in a regular expression search.
+      * @param searcher An object which supports searching within a string.
+      */
+    search(searcher: { [Symbol.search](string: string): number; }): number;
+
+    /**
+      * Split a string into substrings using the specified separator and return them as an array.
+      * @param splitter An object that can split a string.
+      * @param limit A value used to limit the number of elements returned in the array.
+      */
+    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
+
+    /**
+      * Returns an <a> HTML anchor element and sets the name attribute to the text value
+      * @param name
+      */
+    anchor(name: string): string;
+
+    /** Returns a <big> HTML element */
+    big(): string;
+
+    /** Returns a <blink> HTML element */
+    blink(): string;
+
+    /** Returns a <b> HTML element */
+    bold(): string;
+
+    /** Returns a <tt> HTML element */
+    fixed(): string
+
+    /** Returns a <font> HTML element and sets the color attribute value */
+    fontcolor(color: string): string
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: number): string;
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: string): string;
+
+    /** Returns an <i> HTML element */
+    italics(): string;
+
+    /** Returns an <a> HTML element and sets the href attribute value */
+    link(url: string): string;
+
+    /** Returns a <small> HTML element */
+    small(): string;
+
+    /** Returns a <strike> HTML element */
+    strike(): string;
+
+    /** Returns a <sub> HTML element */
+    sub(): string;
+
+    /** Returns a <sup> HTML element */
+    sup(): string;
+}
+
+interface StringConstructor {
+    /**
+      * Return the String value whose elements are, in order, the elements in the List elements.
+      * If length is 0, the empty string is returned.
+      */
+    fromCodePoint(...codePoints: number[]): string;
+
+    /**
+      * String.raw is intended for use as a tag function of a Tagged Template String. When called
+      * as such the first argument will be a well formed template call site object and the rest 
+      * parameter will contain the substitution values.
+      * @param template A well-formed template string call site representation.
+      * @param substitutions A set of substitution values.
+      */
+    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
+}
+
+interface IteratorResult<T> {
+    done: boolean;
+    value?: T;
+}
+
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+    return?(value?: any): IteratorResult<T>;
+    throw?(e?: any): IteratorResult<T>;
+}
+
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
+
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
+
+interface GeneratorFunction extends Function {
+
+}
+
+interface GeneratorFunctionConstructor {
+    /**
+      * Creates a new Generator function.
+      * @param args A list of arguments the function accepts.
+      */
+    new (...args: string[]): GeneratorFunction;
+    (...args: string[]): GeneratorFunction;
+    prototype: GeneratorFunction;
+}
+declare var GeneratorFunction: GeneratorFunctionConstructor;
+
+interface Math {
+    /**
+      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
+      * @param x A numeric expression.
+      */
+    clz32(x: number): number;
+
+    /**
+      * Returns the result of 32-bit multiplication of two numbers.
+      * @param x First number
+      * @param y Second number
+      */
+    imul(x: number, y: number): number;
+
+    /**
+      * Returns the sign of the x, indicating whether x is positive, negative or zero.
+      * @param x The numeric expression to test
+      */
+    sign(x: number): number;
+
+    /**
+      * Returns the base 10 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log10(x: number): number;
+
+    /**
+      * Returns the base 2 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log2(x: number): number;
+
+    /**
+      * Returns the natural logarithm of 1 + x.
+      * @param x A numeric expression.
+      */
+    log1p(x: number): number;
+
+    /**
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
+      * the natural logarithms).
+      * @param x A numeric expression.
+      */
+    expm1(x: number): number;
+
+    /**
+      * Returns the hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    cosh(x: number): number;
+
+    /**
+      * Returns the hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    sinh(x: number): number;
+
+    /**
+      * Returns the hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    tanh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    acosh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    asinh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    atanh(x: number): number;
+
+    /**
+      * Returns the square root of the sum of squares of its arguments.
+      * @param values Values to compute the square root for.
+      *     If no arguments are passed, the result is +0.
+      *     If there is only one argument, the result is the absolute value.
+      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
+      *     If any argument is NaN, the result is NaN.
+      *     If all arguments are either +0 or −0, the result is +0.
+      */
+    hypot(...values: number[] ): number;
+
+    /**
+      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+      * If x is already an integer, the result is x.
+      * @param x A numeric expression.
+      */
+    trunc(x: number): number;
+
+    /**
+      * Returns the nearest single precision float representation of a number.
+      * @param x A numeric expression.
+      */
+    fround(x: number): number;
+
+    /**
+      * Returns an implementation-dependent approximation to the cube root of number.
+      * @param x A numeric expression.
+      */
+    cbrt(x: number): number;
+
+    [Symbol.toStringTag]: string;
+}
+
+interface Date {
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "default"): string;
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "string"): string;
+    /**
+     * Converts a Date object to a number.
+     */
+    [Symbol.toPrimitive](hint: "number"): number;
+    /**
+     * Converts a Date object to a string or number.
+     *
+     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
+     *
+     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
+     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
+     */
+    [Symbol.toPrimitive](hint: string): string | number;
+}
+
+interface RegExp {
+    /**
+      * Matches a string with this regular expression, and returns an array containing the results of
+      * that search.
+      * @param string A string to search within.
+      */
+    [Symbol.match](string: string): RegExpMatchArray;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replaceValue A String object or string literal containing the text to replace for every 
+      *                     successful match of this regular expression.
+      */
+    [Symbol.replace](string: string, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replacer A function that returns the replacement text.
+      */
+    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the position beginning first substring match in a regular expression search
+      * using this regular expression.
+      *
+      * @param string The string to search within.
+      */
+    [Symbol.search](string: string): number;
+
+    /**
+      * Returns an array of substrings that were delimited by strings in the original input that
+      * match against this regular expression.
+      *
+      * If the regular expression contains capturing parentheses, then each time this
+      * regular expression matches, the results (including any undefined results) of the
+      * capturing parentheses are spliced.
+      *
+      * @param string string value to split
+      * @param limit if not undefined, the output array is truncated so that it contains no more
+      * than 'limit' elements.
+      */
+    [Symbol.split](string: string, limit?: number): string[];
+
+    /**
+      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
+      * The characters in this string are sequenced and concatenated in the following order:
+      *
+      *    - "g" for global
+      *    - "i" for ignoreCase
+      *    - "m" for multiline
+      *    - "u" for unicode
+      *    - "y" for sticky
+      *
+      * If no flags are set, the value is the empty string.
+      */
+    flags: string;
+
+    /** 
+      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    sticky: boolean;
+
+    /** 
+      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    unicode: boolean;
+}
+
+interface RegExpConstructor {
+    [Symbol.species](): RegExpConstructor;
+}
+
+interface Map<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    entries(): IterableIterator<[K, V]>;
+    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
+    get(key: K): V;
+    has(key: K): boolean;
+    keys(): IterableIterator<K>;
+    set(key: K, value?: V): Map<K, V>;
+    size: number;
+    values(): IterableIterator<V>;
+    [Symbol.iterator]():IterableIterator<[K,V]>;
+    [Symbol.toStringTag]: string;
+}
+
+interface MapConstructor {
+    new (): Map<any, any>;
+    new <K, V>(): Map<K, V>;
+    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
+    prototype: Map<any, any>;
+}
+declare var Map: MapConstructor;
+
+interface WeakMap<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    get(key: K): V;
+    has(key: K): boolean;
+    set(key: K, value?: V): WeakMap<K, V>;
+    [Symbol.toStringTag]: string;
+}
+
+interface WeakMapConstructor {
+    new (): WeakMap<any, any>;
+    new <K, V>(): WeakMap<K, V>;
+    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+    prototype: WeakMap<any, any>;
+}
+declare var WeakMap: WeakMapConstructor;
+
+interface Set<T> {
+    add(value: T): Set<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    entries(): IterableIterator<[T, T]>;
+    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
+    has(value: T): boolean;
+    keys(): IterableIterator<T>;
+    size: number;
+    values(): IterableIterator<T>;
+    [Symbol.iterator]():IterableIterator<T>;
+    [Symbol.toStringTag]: string;
+}
+
+interface SetConstructor {
+    new (): Set<any>;
+    new <T>(): Set<T>;
+    new <T>(iterable: Iterable<T>): Set<T>;
+    prototype: Set<any>;
+}
+declare var Set: SetConstructor;
+
+interface WeakSet<T> {
+    add(value: T): WeakSet<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    has(value: T): boolean;
+    [Symbol.toStringTag]: string;
+}
+
+interface WeakSetConstructor {
+    new (): WeakSet<any>;
+    new <T>(): WeakSet<T>;
+    new <T>(iterable: Iterable<T>): WeakSet<T>;
+    prototype: WeakSet<any>;
+}
+declare var WeakSet: WeakSetConstructor;
+
+interface JSON {
+    [Symbol.toStringTag]: string;
+}
+
+/**
+  * Represents a raw buffer of binary data, which is used to store data for the 
+  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
+  * but can be passed to a typed array or DataView Object to interpret the raw 
+  * buffer as needed. 
+  */
+interface ArrayBuffer {
+    [Symbol.toStringTag]: string;
+}
+
+interface DataView {
+    [Symbol.toStringTag]: string;
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Int8ArrayConstructor {
+    new (elements: Iterable<number>): Int8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Uint8ArrayConstructor {
+    new (elements: Iterable<number>): Uint8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Uint8ClampedArrayConstructor {
+    new (elements: Iterable<number>): Uint8ClampedArray;
+
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+
+
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Int16ArrayConstructor {
+    new (elements: Iterable<number>): Int16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Uint16ArrayConstructor {
+    new (elements: Iterable<number>): Uint16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Int32ArrayConstructor {
+    new (elements: Iterable<number>): Int32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Uint32ArrayConstructor {
+    new (elements: Iterable<number>): Uint32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Float32ArrayConstructor {
+    new (elements: Iterable<number>): Float32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
+}
+
+interface Float64ArrayConstructor {
+    new (elements: Iterable<number>): Float64Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
+}
+
+interface ProxyHandler<T> {
+    getPrototypeOf? (target: T): any;
+    setPrototypeOf? (target: T, v: any): boolean;
+    isExtensible? (target: T): boolean;
+    preventExtensions? (target: T): boolean;
+    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
+    has? (target: T, p: PropertyKey): boolean;
+    get? (target: T, p: PropertyKey, receiver: any): any;
+    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
+    deleteProperty? (target: T, p: PropertyKey): boolean;
+    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
+    enumerate? (target: T): PropertyKey[];
+    ownKeys? (target: T): PropertyKey[];
+    apply? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, thisArg: any, argArray?: any): any;
+}
+
+interface ProxyConstructor {
+    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
+    new <T>(target: T, handler: ProxyHandler<T>): T
+}
+declare var Proxy: ProxyConstructor;
+
+declare namespace Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function enumerate(target: any): IterableIterator<any>;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: string): boolean;
+    function has(target: any, propertyKey: symbol): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}
+
+/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
+    catch(onrejected?: (reason: any) => void): Promise<T>;
+
+    [Symbol.toStringTag]: string;
+}
+
+interface PromiseConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    prototype: Promise<any>;
+
+    /**
+     * Creates a new Promise.
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
+     * a resolve callback used resolve the promise with a value or the result of another promise, 
+     * and a reject callback used to reject the promise with a provided reason or error.
+     */
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T>(values: Iterable<T | PromiseLike<T>>): Promise<T[]>;
+
+    /**
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
+     * or rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject(reason: any): Promise<void>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject<T>(reason: any): Promise<T>;
+
+    /**
+      * Creates a new resolved promise for the provided value.
+      * @param value A promise.
+      * @returns A promise whose internal state matches the provided promise.
+      */
+    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+    /**
+     * Creates a new resolved promise .
+     * @returns A resolved promise.
+     */
+    resolve(): Promise<void>;
+
+    [Symbol.species]: Function;
+}
+
+declare var Promise: PromiseConstructor;
 /// <reference no-default-lib="true"/>
 
 /////////////////////////////
@@ -1225,7 +2540,7 @@ interface ArrayBuffer {
 interface ArrayBufferConstructor {
     prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
-    isView(arg: any): boolean;
+    isView(arg: any): arg is ArrayBufferView;
 }
 declare var ArrayBuffer: ArrayBufferConstructor;
 
@@ -3838,1321 +5153,6 @@ interface Float64ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
 }
 declare var Float64Array: Float64ArrayConstructor;
-declare type PropertyKey = string | number | symbol;
-
-interface Symbol {
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): Object;
-
-    [Symbol.toStringTag]: string;
-}
-
-interface SymbolConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    prototype: Symbol;
-
-    /**
-      * Returns a new unique Symbol value.
-      * @param  description Description of the new Symbol object.
-      */
-    (description?: string|number): symbol;
-
-    /**
-      * Returns a Symbol object from the global symbol registry matching the given key if found. 
-      * Otherwise, returns a new symbol with this key.
-      * @param key key to search for.
-      */
-    for(key: string): symbol;
-
-    /**
-      * Returns a key from the global symbol registry matching the given Symbol if found. 
-      * Otherwise, returns a undefined.
-      * @param sym Symbol to find the key for.
-      */
-    keyFor(sym: symbol): string;
-
-    // Well-known Symbols
-
-    /** 
-      * A method that determines if a constructor object recognizes an object as one of the 
-      * constructor’s instances. Called by the semantics of the instanceof operator. 
-      */
-    hasInstance: symbol;
-
-    /** 
-      * A Boolean value that if true indicates that an object should flatten to its array elements
-      * by Array.prototype.concat.
-      */
-    isConcatSpreadable: symbol;
-
-    /** 
-      * A method that returns the default iterator for an object. Called by the semantics of the 
-      * for-of statement.
-      */
-    iterator: symbol;
-
-    /**
-      * A regular expression method that matches the regular expression against a string. Called 
-      * by the String.prototype.match method. 
-      */
-    match: symbol;
-
-    /** 
-      * A regular expression method that replaces matched substrings of a string. Called by the 
-      * String.prototype.replace method.
-      */
-    replace: symbol;
-
-    /**
-      * A regular expression method that returns the index within a string that matches the 
-      * regular expression. Called by the String.prototype.search method.
-      */
-    search: symbol;
-
-    /** 
-      * A function valued property that is the constructor function that is used to create 
-      * derived objects.
-      */
-    species: symbol;
-
-    /**
-      * A regular expression method that splits a string at the indices that match the regular 
-      * expression. Called by the String.prototype.split method.
-      */
-    split: symbol;
-
-    /** 
-      * A method that converts an object to a corresponding primitive value.
-      * Called by the ToPrimitive abstract operation.
-      */
-    toPrimitive: symbol;
-
-    /** 
-      * A String value that is used in the creation of the default string description of an object.
-      * Called by the built-in method Object.prototype.toString.
-      */
-    toStringTag: symbol;
-
-    /**
-      * An Object whose own property names are property names that are excluded from the 'with'
-      * environment bindings of the associated objects.
-      */
-    unscopables: symbol;
-}
-declare var Symbol: SymbolConstructor;
-
-interface Object {
-    /**
-      * Determines whether an object has a property with the specified name. 
-      * @param v A property name.
-      */
-    hasOwnProperty(v: PropertyKey): boolean;
-
-    /** 
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-
-interface ObjectConstructor {
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source The source object from which to copy properties.
-      */
-    assign<T, U>(target: T, source: U): T & U;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      */
-    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      * @param source3 The third source object from which to copy properties.
-      */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param sources One or more source objects from which to copy properties
-      */
-    assign(target: any, ...sources: any[]): any;
-
-    /**
-      * Returns an array of all symbol properties found directly on object o.
-      * @param o Object to retrieve the symbols from.
-      */
-    getOwnPropertySymbols(o: any): symbol[];
-
-    /**
-      * Returns true if the values are the same value, false otherwise.
-      * @param value1 The first value.
-      * @param value2 The second value.
-      */
-    is(value1: any, value2: any): boolean;
-
-    /**
-      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
-      * @param o The object to change its prototype.
-      * @param proto The value of the new prototype or null.
-      */
-    setPrototypeOf(o: any, proto: any): any;
-
-    /**
-      * Gets the own property descriptor of the specified object. 
-      * An own property descriptor is one that is defined directly on the object and is not 
-      * inherited from the object's prototype. 
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property. 
-      * @param o Object on which to add or modify the property. This can be a native JavaScript 
-      * object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor
-      *  property.
-      */
-    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
-}
-
-interface Function {
-    /**
-      * Returns the name of the function. Function names are read-only and can not be changed.
-      */
-    name: string;
-
-    /**
-     * Determines whether the given value inherits from this function if this function was used
-     * as a constructor function.
-     *
-     * A constructor function can control which objects are recognized as its instances by
-     * 'instanceof' by overriding this method.
-     */
-    [Symbol.hasInstance](value: any): boolean;
-}
-
-interface NumberConstructor {
-    /**
-      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately: 
-      * 2.2204460492503130808472633361816 x 10�−�16.
-      */
-    EPSILON: number;
-
-    /**
-      * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
-      * number. Only finite values of the type number, result in true.
-      * @param number A numeric value.
-      */
-    isFinite(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is an integer, false otherwise.
-      * @param number A numeric value.
-      */
-    isInteger(number: number): boolean;
-
-    /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
-      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
-      * to a number. Only values of the type number, that are also NaN, result in true.
-      * @param number A numeric value.
-      */
-    isNaN(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is a safe integer.
-      * @param number A numeric value.
-      */
-    isSafeInteger(number: number): boolean;
-
-    /** 
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
-      */
-    MAX_SAFE_INTEGER: number;
-
-    /** 
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
-      */
-    MIN_SAFE_INTEGER: number;
-
-    /**
-      * Converts a string to a floating-point number. 
-      * @param string A string that contains a floating-point number. 
-      */
-    parseFloat(string: string): number;
-
-    /**
-      * Converts A string to an integer.
-      * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
-      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-      * All other strings are considered decimal.
-      */
-    parseInt(string: string, radix?: number): number;
-}
-
-interface Array<T> {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<T>;
-
-    /**
-     * Returns an object whose properties have the value 'true'
-     * when they will be absent when used in a 'with' statement.
-     */
-    [Symbol.unscopables](): {
-        copyWithin: boolean;
-        entries: boolean;
-        fill: boolean;
-        find: boolean;
-        findIndex: boolean;
-        keys: boolean;
-        values: boolean;
-    };
-
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, T]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<T>;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the this object after filling the section identified by start and end with value
-      * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
-      * length+end.
-      */
-    fill(value: T, start?: number, end?: number): T[];
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): T[];
-}
-
-interface IArguments {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<any>;
-}
-
-interface ArrayConstructor {
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      */
-    from<T>(arrayLike: ArrayLike<T>): Array<T>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      */
-    from<T>(iterable: Iterable<T>): Array<T>;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of<T>(...items: T[]): Array<T>;
-}
-
-interface String {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<string>;
-
-    /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
-      * value of the UTF-16 encoded code point starting at the string element at position pos in 
-      * the String resulting from converting this object to a String. 
-      * If there is no element at that position, the result is undefined. 
-      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
-      */
-    codePointAt(pos: number): number;
-
-    /**
-      * Returns true if searchString appears as a substring of the result of converting this 
-      * object to a String, at one or more positions that are 
-      * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string 
-      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
-      */
-    includes(searchString: string, position?: number): boolean;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * endPosition – length(this). Otherwise returns false.
-      */
-    endsWith(searchString: string, endPosition?: number): boolean;
-
-    /**
-      * Returns the String value result of normalizing the string into the normalization form 
-      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
-      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
-      * is "NFC"
-      */
-    normalize(form?: string): string;
-
-    /**
-      * Returns a String value that is made from count copies appended together. If count is 0, 
-      * T is the empty String is returned.
-      * @param count number of copies to append
-      */
-    repeat(count: number): string;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * position. Otherwise returns false.
-      */
-    startsWith(searchString: string, position?: number): boolean;
-
-    // Overloads for objects with methods of well-known symbols.
-
-    /**
-      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
-      * @param matcher An object that supports being matched against.
-      */
-    match(matcher: { [Symbol.match](string: string): RegExpMatchArray; }): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param searcher An object which supports searching within a string.
-      */
-    search(searcher: { [Symbol.search](string: string): number; }): number;
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param splitter An object that can split a string.
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
-
-    /**
-      * Returns an <a> HTML anchor element and sets the name attribute to the text value
-      * @param name
-      */
-    anchor(name: string): string;
-
-    /** Returns a <big> HTML element */
-    big(): string;
-
-    /** Returns a <blink> HTML element */
-    blink(): string;
-
-    /** Returns a <b> HTML element */
-    bold(): string;
-
-    /** Returns a <tt> HTML element */
-    fixed(): string
-
-    /** Returns a <font> HTML element and sets the color attribute value */
-    fontcolor(color: string): string
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: number): string;
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: string): string;
-
-    /** Returns an <i> HTML element */
-    italics(): string;
-
-    /** Returns an <a> HTML element and sets the href attribute value */
-    link(url: string): string;
-
-    /** Returns a <small> HTML element */
-    small(): string;
-
-    /** Returns a <strike> HTML element */
-    strike(): string;
-
-    /** Returns a <sub> HTML element */
-    sub(): string;
-
-    /** Returns a <sup> HTML element */
-    sup(): string;
-}
-
-interface StringConstructor {
-    /**
-      * Return the String value whose elements are, in order, the elements in the List elements.
-      * If length is 0, the empty string is returned.
-      */
-    fromCodePoint(...codePoints: number[]): string;
-
-    /**
-      * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest 
-      * parameter will contain the substitution values.
-      * @param template A well-formed template string call site representation.
-      * @param substitutions A set of substitution values.
-      */
-    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
-}
-
-interface IteratorResult<T> {
-    done: boolean;
-    value?: T;
-}
-
-interface Iterator<T> {
-    next(value?: any): IteratorResult<T>;
-    return?(value?: any): IteratorResult<T>;
-    throw?(e?: any): IteratorResult<T>;
-}
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface GeneratorFunction extends Function {
-
-}
-
-interface GeneratorFunctionConstructor {
-    /**
-      * Creates a new Generator function.
-      * @param args A list of arguments the function accepts.
-      */
-    new (...args: string[]): GeneratorFunction;
-    (...args: string[]): GeneratorFunction;
-    prototype: GeneratorFunction;
-}
-declare var GeneratorFunction: GeneratorFunctionConstructor;
-
-interface Math {
-    /**
-      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
-      * @param x A numeric expression.
-      */
-    clz32(x: number): number;
-
-    /**
-      * Returns the result of 32-bit multiplication of two numbers.
-      * @param x First number
-      * @param y Second number
-      */
-    imul(x: number, y: number): number;
-
-    /**
-      * Returns the sign of the x, indicating whether x is positive, negative or zero.
-      * @param x The numeric expression to test
-      */
-    sign(x: number): number;
-
-    /**
-      * Returns the base 10 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log10(x: number): number;
-
-    /**
-      * Returns the base 2 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log2(x: number): number;
-
-    /**
-      * Returns the natural logarithm of 1 + x.
-      * @param x A numeric expression.
-      */
-    log1p(x: number): number;
-
-    /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
-      * the natural logarithms).
-      * @param x A numeric expression.
-      */
-    expm1(x: number): number;
-
-    /**
-      * Returns the hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cosh(x: number): number;
-
-    /**
-      * Returns the hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sinh(x: number): number;
-
-    /**
-      * Returns the hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tanh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    acosh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    asinh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    atanh(x: number): number;
-
-    /**
-      * Returns the square root of the sum of squares of its arguments.
-      * @param values Values to compute the square root for.
-      *     If no arguments are passed, the result is +0.
-      *     If there is only one argument, the result is the absolute value.
-      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
-      *     If any argument is NaN, the result is NaN.
-      *     If all arguments are either +0 or −0, the result is +0.
-      */
-    hypot(...values: number[] ): number;
-
-    /**
-      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
-      * If x is already an integer, the result is x.
-      * @param x A numeric expression.
-      */
-    trunc(x: number): number;
-
-    /**
-      * Returns the nearest single precision float representation of a number.
-      * @param x A numeric expression.
-      */
-    fround(x: number): number;
-
-    /**
-      * Returns an implementation-dependent approximation to the cube root of number.
-      * @param x A numeric expression.
-      */
-    cbrt(x: number): number;
-
-    [Symbol.toStringTag]: string;
-}
-
-interface Date {
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "default"): string;
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "string"): string;
-    /**
-     * Converts a Date object to a number.
-     */
-    [Symbol.toPrimitive](hint: "number"): number;
-    /**
-     * Converts a Date object to a string or number.
-     *
-     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
-     *
-     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
-     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
-     */
-    [Symbol.toPrimitive](hint: string): string | number;
-}
-
-interface RegExp {
-    /**
-      * Matches a string with this regular expression, and returns an array containing the results of
-      * that search.
-      * @param string A string to search within.
-      */
-    [Symbol.match](string: string): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replaceValue A String object or string literal containing the text to replace for every 
-      *                     successful match of this regular expression.
-      */
-    [Symbol.replace](string: string, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replacer A function that returns the replacement text.
-      */
-    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the position beginning first substring match in a regular expression search
-      * using this regular expression.
-      *
-      * @param string The string to search within.
-      */
-    [Symbol.search](string: string): number;
-
-    /**
-      * Returns an array of substrings that were delimited by strings in the original input that
-      * match against this regular expression.
-      *
-      * If the regular expression contains capturing parentheses, then each time this
-      * regular expression matches, the results (including any undefined results) of the
-      * capturing parentheses are spliced.
-      *
-      * @param string string value to split
-      * @param limit if not undefined, the output array is truncated so that it contains no more
-      * than 'limit' elements.
-      */
-    [Symbol.split](string: string, limit?: number): string[];
-
-    /**
-      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
-      * The characters in this string are sequenced and concatenated in the following order:
-      *
-      *    - "g" for global
-      *    - "i" for ignoreCase
-      *    - "m" for multiline
-      *    - "u" for unicode
-      *    - "y" for sticky
-      *
-      * If no flags are set, the value is the empty string.
-      */
-    flags: string;
-
-    /** 
-      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    sticky: boolean;
-
-    /** 
-      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    unicode: boolean;
-}
-
-interface RegExpConstructor {
-    [Symbol.species](): RegExpConstructor;
-}
-
-interface Map<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    entries(): IterableIterator<[K, V]>;
-    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
-    get(key: K): V;
-    has(key: K): boolean;
-    keys(): IterableIterator<K>;
-    set(key: K, value?: V): Map<K, V>;
-    size: number;
-    values(): IterableIterator<V>;
-    [Symbol.iterator]():IterableIterator<[K,V]>;
-    [Symbol.toStringTag]: string;
-}
-
-interface MapConstructor {
-    new (): Map<any, any>;
-    new <K, V>(): Map<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
-    prototype: Map<any, any>;
-}
-declare var Map: MapConstructor;
-
-interface WeakMap<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    get(key: K): V;
-    has(key: K): boolean;
-    set(key: K, value?: V): WeakMap<K, V>;
-    [Symbol.toStringTag]: string;
-}
-
-interface WeakMapConstructor {
-    new (): WeakMap<any, any>;
-    new <K, V>(): WeakMap<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
-    prototype: WeakMap<any, any>;
-}
-declare var WeakMap: WeakMapConstructor;
-
-interface Set<T> {
-    add(value: T): Set<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    entries(): IterableIterator<[T, T]>;
-    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
-    has(value: T): boolean;
-    keys(): IterableIterator<T>;
-    size: number;
-    values(): IterableIterator<T>;
-    [Symbol.iterator]():IterableIterator<T>;
-    [Symbol.toStringTag]: string;
-}
-
-interface SetConstructor {
-    new (): Set<any>;
-    new <T>(): Set<T>;
-    new <T>(iterable: Iterable<T>): Set<T>;
-    prototype: Set<any>;
-}
-declare var Set: SetConstructor;
-
-interface WeakSet<T> {
-    add(value: T): WeakSet<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    has(value: T): boolean;
-    [Symbol.toStringTag]: string;
-}
-
-interface WeakSetConstructor {
-    new (): WeakSet<any>;
-    new <T>(): WeakSet<T>;
-    new <T>(iterable: Iterable<T>): WeakSet<T>;
-    prototype: WeakSet<any>;
-}
-declare var WeakSet: WeakSetConstructor;
-
-interface JSON {
-    [Symbol.toStringTag]: string;
-}
-
-/**
-  * Represents a raw buffer of binary data, which is used to store data for the 
-  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
-  * but can be passed to a typed array or DataView Object to interpret the raw 
-  * buffer as needed. 
-  */
-interface ArrayBuffer {
-    [Symbol.toStringTag]: string;
-}
-
-interface DataView {
-    [Symbol.toStringTag]: string;
-}
-
-/**
-  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Int8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Int8ArrayConstructor {
-    new (elements: Iterable<number>): Int8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Uint8ArrayConstructor {
-    new (elements: Iterable<number>): Uint8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
-  * If the requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8ClampedArray {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Uint8ClampedArrayConstructor {
-    new (elements: Iterable<number>): Uint8ClampedArray;
-
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
-}
-
-/**
-  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Int16ArrayConstructor {
-    new (elements: Iterable<number>): Int16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
-}
-
-/**
-  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Uint16ArrayConstructor {
-    new (elements: Iterable<number>): Uint16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
-}
-
-/**
-  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Int32ArrayConstructor {
-    new (elements: Iterable<number>): Int32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
-}
-
-/**
-  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Uint32ArrayConstructor {
-    new (elements: Iterable<number>): Uint32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
-}
-
-/**
-  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
-  * of bytes could not be allocated an exception is raised.
-  */
-interface Float32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Float32ArrayConstructor {
-    new (elements: Iterable<number>): Float32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
-}
-
-/**
-  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Float64Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-}
-
-interface Float64ArrayConstructor {
-    new (elements: Iterable<number>): Float64Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
-
-interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
-    setPrototypeOf? (target: T, v: any): boolean;
-    isExtensible? (target: T): boolean;
-    preventExtensions? (target: T): boolean;
-    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
-    has? (target: T, p: PropertyKey): boolean;
-    get? (target: T, p: PropertyKey, receiver: any): any;
-    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
-    deleteProperty? (target: T, p: PropertyKey): boolean;
-    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
-    enumerate? (target: T): PropertyKey[];
-    ownKeys? (target: T): PropertyKey[];
-    apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
-}
-
-interface ProxyConstructor {
-    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
-    new <T>(target: T, handler: ProxyHandler<T>): T
-}
-declare var Proxy: ProxyConstructor;
-
-declare namespace Reflect {
-    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
-    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
-    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
-    function enumerate(target: any): IterableIterator<any>;
-    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
-    function getPrototypeOf(target: any): any;
-    function has(target: any, propertyKey: string): boolean;
-    function has(target: any, propertyKey: symbol): boolean;
-    function isExtensible(target: any): boolean;
-    function ownKeys(target: any): Array<PropertyKey>;
-    function preventExtensions(target: any): boolean;
-    function set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
-    function setPrototypeOf(target: any, proto: any): boolean;
-}
-
-/**
- * Represents the completion of an asynchronous operation
- */
-interface Promise<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A Promise for the completion of the callback.
-     */
-    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
-    catch(onrejected?: (reason: any) => void): Promise<T>;
-
-    [Symbol.toStringTag]: string;
-}
-
-interface PromiseConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    prototype: Promise<any>;
-
-    /**
-     * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
-     * a resolve callback used resolve the promise with a value or the result of another promise, 
-     * and a reject callback used to reject the promise with a provided reason or error.
-     */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T>(values: Iterable<T | PromiseLike<T>>): Promise<T[]>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject(reason: any): Promise<void>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject<T>(reason: any): Promise<T>;
-
-    /**
-      * Creates a new resolved promise for the provided value.
-      * @param value A promise.
-      * @returns A promise whose internal state matches the provided promise.
-      */
-    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
-
-    /**
-     * Creates a new resolved promise .
-     * @returns A resolved promise.
-     */
-    resolve(): Promise<void>;
-
-    [Symbol.species]: Function;
-}
-
-declare var Promise: PromiseConstructor;
 /////////////////////////////
 /// ECMAScript Internationalization API 
 /////////////////////////////
@@ -7549,6 +7549,68 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
     createElement(tagName: "xmp"): HTMLBlockElement;
     createElement(tagName: string): HTMLElement;
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "clipPath"): SVGClipPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "componentTransferFunction"): SVGComponentTransferFunctionElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "defs"): SVGDefsElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "desc"): SVGDescElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "ellipse"): SVGEllipseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feBlend"): SVGFEBlendElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feColorMatrix"): SVGFEColorMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComponentTransfer"): SVGFEComponentTransferElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComposite"): SVGFECompositeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feConvolveMatrix"): SVGFEConvolveMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDiffuseLighting"): SVGFEDiffuseLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDisplacementMap"): SVGFEDisplacementMapElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDistantLight"): SVGFEDistantLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFlood"): SVGFEFloodElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncA"): SVGFEFuncAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncB"): SVGFEFuncBElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncG"): SVGFEFuncGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncR"): SVGFEFuncRElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feGaussianBlur"): SVGFEGaussianBlurElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feImage"): SVGFEImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMerge"): SVGFEMergeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMergeNode"): SVGFEMergeNodeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMorphology"): SVGFEMorphologyElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feOffset"): SVGFEOffsetElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "fePointLight"): SVGFEPointLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpecularLighting"): SVGFESpecularLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpotLight"): SVGFESpotLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTile"): SVGFETileElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTurbulence"): SVGFETurbulenceElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "filter"): SVGFilterElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "foreignObject"): SVGForeignObjectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "g"): SVGGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "image"): SVGImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "gradient"): SVGGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "line"): SVGLineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "linearGradient"): SVGLinearGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "marker"): SVGMarkerElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "mask"): SVGMaskElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "path"): SVGPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "metadata"): SVGMetadataElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "pattern"): SVGPatternElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polygon"): SVGPolygonElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polyline"): SVGPolylineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "radialGradient"): SVGRadialGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "rect"): SVGRectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "svg"): SVGSVGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "stop"): SVGStopElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "switch"): SVGSwitchElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "symbol"): SVGSymbolElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "tspan"): SVGTSpanElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textContent"): SVGTextContentElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "text"): SVGTextElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPath"): SVGTextPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPositioning"): SVGTextPositioningElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "use"): SVGUseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "view"): SVGViewElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement
     createElementNS(namespaceURI: string, qualifiedName: string): Element;
     createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
     createNSResolver(nodeResolver: Node): XPathNSResolver;
@@ -12370,14 +12432,12 @@ interface ImageData {
     width: number;
 }
 
-interface ImageDataConstructor {
+declare var ImageData: {
     prototype: ImageData;
     new(width: number, height: number): ImageData;
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-declare var ImageData: ImageDataConstructor; 
-
 interface KeyboardEvent extends UIEvent {
     altKey: boolean;
     char: string;
diff --git a/lib/lib.webworker.d.ts b/lib/lib.webworker.d.ts
index 7995a03a40f..7ce06a6b4ac 100644
--- a/lib/lib.webworker.d.ts
+++ b/lib/lib.webworker.d.ts
@@ -682,14 +682,12 @@ interface ImageData {
     width: number;
 }
 
-interface ImageDataConstructor {
+declare var ImageData: {
     prototype: ImageData;
     new(width: number, height: number): ImageData;
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-declare var ImageData: ImageDataConstructor; 
-
 interface MSApp {
     clearTemporaryWebDataAsync(): MSAppAsyncOperation;
     createBlobFromRandomAccessStream(type: string, seeker: any): Blob;
diff --git a/lib/tsc.js b/lib/tsc.js
index 07ff723b17c..87a413af729 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -49,40 +49,49 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function createFileMap(getCanonicalFileName) {
+    function createFileMap(keyMapper) {
         var files = {};
         return {
             get: get,
             set: set,
             contains: contains,
             remove: remove,
-            clear: clear,
-            forEachValue: forEachValueInMap
+            forEachValue: forEachValueInMap,
+            clear: clear
         };
-        function set(fileName, value) {
-            files[normalizeKey(fileName)] = value;
-        }
-        function get(fileName) {
-            return files[normalizeKey(fileName)];
-        }
-        function contains(fileName) {
-            return hasProperty(files, normalizeKey(fileName));
-        }
-        function remove(fileName) {
-            var key = normalizeKey(fileName);
-            delete files[key];
-        }
         function forEachValueInMap(f) {
-            forEachValue(files, f);
+            for (var key in files) {
+                f(key, files[key]);
+            }
         }
-        function normalizeKey(key) {
-            return getCanonicalFileName(normalizeSlashes(key));
+        function get(path) {
+            return files[toKey(path)];
+        }
+        function set(path, value) {
+            files[toKey(path)] = value;
+        }
+        function contains(path) {
+            return hasProperty(files, toKey(path));
+        }
+        function remove(path) {
+            var key = toKey(path);
+            delete files[key];
         }
         function clear() {
             files = {};
         }
+        function toKey(path) {
+            return keyMapper ? keyMapper(path) : path;
+        }
     }
     ts.createFileMap = createFileMap;
+    function toPath(fileName, basePath, getCanonicalFileName) {
+        var nonCanonicalizedPath = isRootedDiskPath(fileName)
+            ? normalizePath(fileName)
+            : getNormalizedAbsolutePath(fileName, basePath);
+        return getCanonicalFileName(nonCanonicalizedPath);
+    }
+    ts.toPath = toPath;
     function forEach(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -97,8 +106,8 @@ var ts;
     ts.forEach = forEach;
     function contains(array, value) {
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
+                var v = array_1[_i];
                 if (v === value) {
                     return true;
                 }
@@ -121,8 +130,8 @@ var ts;
     function countWhere(array, predicate) {
         var count = 0;
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+                var v = array_2[_i];
                 if (predicate(v)) {
                     count++;
                 }
@@ -135,8 +144,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_3 = array; _i < array_3.length; _i++) {
+                var item = array_3[_i];
                 if (f(item)) {
                     result.push(item);
                 }
@@ -149,8 +158,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_4 = array; _i < array_4.length; _i++) {
+                var v = array_4[_i];
                 result.push(f(v));
             }
         }
@@ -169,8 +178,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                var item = array_5[_i];
                 if (!contains(result, item)) {
                     result.push(item);
                 }
@@ -181,8 +190,8 @@ var ts;
     ts.deduplicate = deduplicate;
     function sum(array, prop) {
         var result = 0;
-        for (var _i = 0; _i < array.length; _i++) {
-            var v = array[_i];
+        for (var _i = 0, array_6 = array; _i < array_6.length; _i++) {
+            var v = array_6[_i];
             result += v[prop];
         }
         return result;
@@ -190,8 +199,8 @@ var ts;
     ts.sum = sum;
     function addRange(to, from) {
         if (to && from) {
-            for (var _i = 0; _i < from.length; _i++) {
-                var v = from[_i];
+            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+                var v = from_1[_i];
                 to.push(v);
             }
         }
@@ -354,9 +363,9 @@ var ts;
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key]
+            ? ts.localizedDiagnosticMessages[message.key]
+            : message.message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
@@ -367,7 +376,7 @@ var ts;
             Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
             Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         }
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
         }
@@ -382,7 +391,7 @@ var ts;
     }
     ts.createFileDiagnostic = createFileDiagnostic;
     function createCompilerDiagnostic(message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
             text = formatStringFromArgs(text, arguments, 1);
         }
@@ -397,7 +406,7 @@ var ts;
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
     function chainDiagnosticMessages(details, message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
             text = formatStringFromArgs(text, arguments, 2);
         }
@@ -512,8 +521,8 @@ var ts;
     function getNormalizedParts(normalizedSlashedPath, rootLength) {
         var parts = normalizedSlashedPath.substr(rootLength).split(ts.directorySeparator);
         var normalized = [];
-        for (var _i = 0; _i < parts.length; _i++) {
-            var part = parts[_i];
+        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+            var part = parts_1[_i];
             if (part !== ".") {
                 if (part === ".." && normalized.length > 0 && lastOrUndefined(normalized) !== "..") {
                     normalized.pop();
@@ -656,13 +665,13 @@ var ts;
     }
     ts.fileExtensionIs = fileExtensionIs;
     ts.supportedExtensions = [".ts", ".tsx", ".d.ts"];
-    ts.moduleFileExtensions = ts.supportedExtensions;
+    ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx");
     function isSupportedSourceFileName(fileName) {
         if (!fileName) {
             return false;
         }
-        for (var _i = 0; _i < ts.supportedExtensions.length; _i++) {
-            var extension = ts.supportedExtensions[_i];
+        for (var _i = 0, supportedExtensions_1 = ts.supportedExtensions; _i < supportedExtensions_1.length; _i++) {
+            var extension = supportedExtensions_1[_i];
             if (fileExtensionIs(fileName, extension)) {
                 return true;
             }
@@ -672,8 +681,8 @@ var ts;
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
     var extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
     function removeFileExtension(path) {
-        for (var _i = 0; _i < extensionsToRemove.length; _i++) {
-            var ext = extensionsToRemove[_i];
+        for (var _i = 0, extensionsToRemove_1 = extensionsToRemove; _i < extensionsToRemove_1.length; _i++) {
+            var ext = extensionsToRemove_1[_i];
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
             }
@@ -707,19 +716,16 @@ var ts;
     }
     function Signature(checker) {
     }
+    function Node(kind, pos, end) {
+        this.kind = kind;
+        this.pos = pos;
+        this.end = end;
+        this.flags = 0;
+        this.parent = undefined;
+    }
     ts.objectAllocator = {
-        getNodeConstructor: function (kind) {
-            function Node() {
-            }
-            Node.prototype = {
-                kind: kind,
-                pos: -1,
-                end: -1,
-                flags: 0,
-                parent: undefined
-            };
-            return Node;
-        },
+        getNodeConstructor: function () { return Node; },
+        getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
@@ -737,6 +743,7 @@ var ts;
                 if (verboseDebugInfo) {
                     verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
                 }
+                debugger;
                 throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
             }
         }
@@ -748,9 +755,10 @@ var ts;
     })(Debug = ts.Debug || (ts.Debug = {}));
     function copyListRemovingItem(item, list) {
         var copiedList = [];
-        for (var i = 0, len = list.length; i < len; i++) {
-            if (list[i] !== item) {
-                copiedList.push(list[i]);
+        for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
+            var e = list_1[_i];
+            if (e !== item) {
+                copiedList.push(e);
             }
         }
         return copiedList;
@@ -834,16 +842,16 @@ var ts;
                 function visitDirectory(path) {
                     var folder = fso.GetFolder(path || ".");
                     var files = getNames(folder.files);
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+                        var current = files_1[_i];
                         var name_1 = ts.combinePaths(path, current);
                         if ((!extension || ts.fileExtensionIs(name_1, extension)) && !ts.contains(exclude, getCanonicalPath(name_1))) {
                             result.push(name_1);
                         }
                     }
                     var subfolders = getNames(folder.subfolders);
-                    for (var _a = 0; _a < subfolders.length; _a++) {
-                        var current = subfolders[_a];
+                    for (var _a = 0, subfolders_1 = subfolders; _a < subfolders_1.length; _a++) {
+                        var current = subfolders_1[_a];
                         var name_2 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_2))) {
                             visitDirectory(name_2);
@@ -894,6 +902,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _tty = require("tty");
             function createWatchedFileSet(interval, chunkSize) {
                 if (interval === void 0) { interval = 2500; }
                 if (chunkSize === void 0) { chunkSize = 30; }
@@ -993,7 +1002,16 @@ var ts;
                 if (writeByteOrderMark) {
                     data = "\uFEFF" + data;
                 }
-                _fs.writeFileSync(fileName, data, "utf8");
+                var fd;
+                try {
+                    fd = _fs.openSync(fileName, "w");
+                    _fs.writeSync(fd, data, undefined, "utf8");
+                }
+                finally {
+                    if (fd !== undefined) {
+                        _fs.closeSync(fd);
+                    }
+                }
             }
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path.toLowerCase() : path;
@@ -1006,8 +1024,8 @@ var ts;
                 function visitDirectory(path) {
                     var files = _fs.readdirSync(path || ".").sort();
                     var directories = [];
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
+                        var current = files_2[_i];
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -1021,8 +1039,8 @@ var ts;
                             }
                         }
                     }
-                    for (var _a = 0; _a < directories.length; _a++) {
-                        var current = directories[_a];
+                    for (var _a = 0, directories_1 = directories; _a < directories_1.length; _a++) {
+                        var current = directories_1[_a];
                         visitDirectory(current);
                     }
                 }
@@ -1032,14 +1050,7 @@ var ts;
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 write: function (s) {
-                    var buffer = new Buffer(s, "utf8");
-                    var offset = 0;
-                    var toWrite = buffer.length;
-                    var written = 0;
-                    while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
-                        offset += written;
-                        toWrite -= written;
-                    }
+                    process.stdout.write(s);
                 },
                 readFile: readFile,
                 writeFile: writeFile,
@@ -1053,7 +1064,7 @@ var ts;
                     };
                 },
                 watchDirectory: function (path, callback, recursive) {
-                    return _fs.watch(path, { persisten: true, recursive: !!recursive }, function (eventName, relativeFileName) {
+                    return _fs.watch(path, { persistent: true, recursive: !!recursive }, function (eventName, relativeFileName) {
                         if (eventName === "rename") {
                             callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(path, relativeFileName)));
                         }
@@ -1106,624 +1117,634 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An index signature parameter type must be 'string' or 'number'." },
-        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a class element." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used in an ambient context." },
-        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with a class declaration." },
-        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used here." },
-        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a module element." },
-        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a valid async function return type." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An async function or method must have a valid awaitable return type." },
-        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand for 'await' does not have a valid callable 'then' member." },
-        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return expression in async function does not have a valid callable 'then' member." },
-        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression body for async arrow function does not have a valid callable 'then' member." },
-        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum member must have initializer." },
-        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
-        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a namespace." },
-        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In ambient enum declarations member initializer must be constant expression." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression expected." },
-        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum member expected." },
-        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration expected." },
-        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An object member cannot be declared optional." },
-        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A 'yield' expression is only allowed in a generator body." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A destructuring declaration must have an initializer." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An import declaration cannot have modifiers." },
-        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no default export." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
-        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line terminator not permitted before arrow." },
-        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
-        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
-        Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules into 'es6' when targeting 'ES5' or lower." },
-        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators are not valid here." },
-        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
-        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
-        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
-        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A class declaration without the 'default' modifier must have a name" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
-        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Modules are automatically in strict mode." },
-        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
-        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators are only available when targeting ECMAScript 6 or higher." },
-        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators are not allowed in an ambient context." },
-        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An overload signature cannot be declared as a generator." },
-        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "'{0}' tag already specified." },
-        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature '{0}' must have a type predicate." },
-        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot find parameter '{0}'." },
-        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type predicate '{0}' is not assignable to '{1}'." },
-        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' is not in the same position as parameter '{1}'." },
-        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A type predicate is only allowed in return type position for functions and methods." },
-        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference a rest parameter." },
-        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference element '{0}' in a binding pattern." },
-        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An export assignment can only be used in a module." },
-        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An import declaration can only be used in a namespace or module." },
-        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An export declaration can only be used in a module." },
-        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An ambient module declaration is only allowed at the top level in a file." },
-        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A namespace declaration is only allowed in a namespace or module." },
-        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The return type of a property decorator function must be either 'void' or 'any'." },
-        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The return type of a parameter decorator function must be either 'void' or 'any'." },
-        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of class decorator when called as an expression." },
-        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of parameter decorator when called as an expression." },
-        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of property decorator when called as an expression." },
-        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "'abstract' modifier can only appear on a class or method declaration." },
-        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with '{1}' modifier." },
-        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract methods can only appear within an abstract class." },
-        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method '{0}' cannot have an implementation because it is marked abstract." },
-        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in an async function block." },
-        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "'await' expression is only allowed within an async function." },
-        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async functions are only available when targeting ECMAScript 6 and higher." },
-        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "'=' can only be used in an object literal property inside a destructuring assignment." },
-        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
-        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not a module." },
-        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot find module '{0}'." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a module or namespace body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
-        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient modules cannot be nested in other modules or namespaces." },
-        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...of' statement." },
-        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
-        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An iterator must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
-        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
-        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type or a string type." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
-        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
-        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
-        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An interface can only extend an identifier/qualified-name with optional type arguments." },
-        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A class can only implement an identifier/qualified-name with optional type arguments." },
-        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A rest element cannot contain a binding pattern." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own type annotation." },
-        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot find namespace '{0}'." },
-        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No best common type exists among yield expressions." },
-        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A generator cannot have a 'void' type annotation." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own base expression." },
-        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a constructor function type." },
-        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No base constructor has the specified number of type arguments." },
-        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base constructor return type '{0}' is not a class or interface type." },
-        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base constructors must all have the same return type." },
-        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be abstract or not abstract." },
-        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
-        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes containing abstract methods must be marked abstract." },
-        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
-        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All declarations of an abstract method must be consecutive." },
-        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
-        Only_an_ambient_class_can_be_merged_with_an_interface: { code: 2518, category: ts.DiagnosticCategory.Error, key: "Only an ambient class can be merged with an interface." },
-        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
-        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
-        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
-        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "'yield' expressions cannot be used in a parameter initializer." },
-        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "'await' expressions cannot be used in a parameter initializer." },
-        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer provides no value for this binding element and the binding element has no default value." },
-        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A 'this' type is available only in a non-static member of a class or interface." },
-        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
-        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A module cannot have multiple default exports." },
-        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX element attributes type '{0}' must be an object type." },
-        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The return type of a JSX element constructor must return an object type." },
-        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
-        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
-        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' does not have any construct or call signatures." },
-        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' is not a constructor function for JSX elements." },
-        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of JSX spread attribute is not assignable to target property." },
-        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX element class does not support attributes because it does not have a '{0}' property" },
-        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The global type 'JSX.{0}' may not have more than one property" },
-        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot emit namespaced JSX elements in React" },
-        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
-        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
-        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
-        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition: { code: 2655, category: ts.DiagnosticCategory.Error, key: "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: ts.DiagnosticCategory.Error, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported file encoding." },
-        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed to parse file '{0}': {1}." },
-        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could not write file '{0}': {1}" },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher." },
-        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
-        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified without specifying option '{1}'." },
-        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified with option '{1}'." },
-        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A 'tsconfig.json' file is already defined at: '{0}'." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs if any errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es6'" },
-        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax: {0}" },
-        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options" },
-        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file" },
-        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options:" },
-        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND" },
-        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE" },
-        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION" },
-        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es6'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES6: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File '{0}' not found." },
-        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
-        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
-        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
-        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument for '--jsx' must be 'preserve' or 'react'." },
-        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 decorators." },
-        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for emitting type metadata for decorators." },
-        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
-        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes a TypeScript project and creates a tsconfig.json file." },
-        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully created a tsconfig.json file." },
-        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress excess property checks for object literals." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
-        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
-        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "'import ... =' can only be used in a .ts file." },
-        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "'export=' can only be used in a .ts file." },
-        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "'type parameter declarations' can only be used in a .ts file." },
-        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "'implements clauses' can only be used in a .ts file." },
-        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "'interface declarations' can only be used in a .ts file." },
-        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "'module declarations' can only be used in a .ts file." },
-        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "'type aliases' can only be used in a .ts file." },
-        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "'{0}' can only be used in a .ts file." },
-        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "'types' can only be used in a .ts file." },
-        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "'type arguments' can only be used in a .ts file." },
-        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "'parameter modifiers' can only be used in a .ts file." },
-        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "'property declarations' can only be used in a .ts file." },
-        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "'enum declarations' can only be used in a .ts file." },
-        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "'decorators' can only be used in a .ts file." },
-        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
-        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "'class' expressions are not currently supported." },
-        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX attributes must only be assigned a non-empty 'expression'." },
-        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX elements cannot have multiple attributes with the same name." },
-        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." },
-        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX attribute expected." },
-        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." },
-        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A constructor cannot contain a 'super' call when its class extends 'null'" },
-        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
+        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated_string_literal_1002", message: "Unterminated string literal." },
+        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_1003", message: "Identifier expected." },
+        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "_0_expected_1005", message: "'{0}' expected." },
+        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A_file_cannot_have_a_reference_to_itself_1006", message: "A file cannot have a reference to itself." },
+        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing_comma_not_allowed_1009", message: "Trailing comma not allowed." },
+        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "Asterisk_Slash_expected_1010", message: "'*/' expected." },
+        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_1012", message: "Unexpected token." },
+        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_last_in_a_parameter_list_1014", message: "A rest parameter must be last in a parameter list." },
+        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter_cannot_have_question_mark_and_initializer_1015", message: "Parameter cannot have question mark and initializer." },
+        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A_required_parameter_cannot_follow_an_optional_parameter_1016", message: "A required parameter cannot follow an optional parameter." },
+        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An_index_signature_cannot_have_a_rest_parameter_1017", message: "An index signature cannot have a rest parameter." },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018", message: "An index signature parameter cannot have an accessibility modifier." },
+        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_a_question_mark_1019", message: "An index signature parameter cannot have a question mark." },
+        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_initializer_1020", message: "An index signature parameter cannot have an initializer." },
+        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
+        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
+        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
+        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
+        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
+        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_class_element_1031", message: "'{0}' modifier cannot appear on a class element." },
+        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "super_must_be_followed_by_an_argument_list_or_member_access_1034", message: "'super' must be followed by an argument list or member access." },
+        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only_ambient_modules_can_use_quoted_names_1035", message: "Only ambient modules can use quoted names." },
+        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements_are_not_allowed_in_ambient_contexts_1036", message: "Statements are not allowed in ambient contexts." },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038", message: "A 'declare' modifier cannot be used in an already ambient context." },
+        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers_are_not_allowed_in_ambient_contexts_1039", message: "Initializers are not allowed in ambient contexts." },
+        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_in_an_ambient_context_1040", message: "'{0}' modifier cannot be used in an ambient context." },
+        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
+        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
+        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
+        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
+        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
+        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_have_an_initializer_1048", message: "A rest parameter cannot have an initializer." },
+        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_must_have_exactly_one_parameter_1049", message: "A 'set' accessor must have exactly one parameter." },
+        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_an_optional_parameter_1051", message: "A 'set' accessor cannot have an optional parameter." },
+        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
+        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
+        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
+        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
+        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
+        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
+        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return_expression_in_async_function_does_not_have_a_valid_callable_then_member_1059", message: "Return expression in async function does not have a valid callable 'then' member." },
+        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member_1060", message: "Expression body for async arrow function does not have a valid callable 'then' member." },
+        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
+        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
+        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
+        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
+        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_be_declared_in_an_ambient_context_1086", message: "An accessor cannot be declared in an ambient context." },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_constructor_declaration_1089", message: "'{0}' modifier cannot appear on a constructor declaration." },
+        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_parameter_1090", message: "'{0}' modifier cannot appear on a parameter." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091", message: "Only a single variable declaration is allowed in a 'for...in' statement." },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type_parameters_cannot_appear_on_a_constructor_declaration_1092", message: "Type parameters cannot appear on a constructor declaration." },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type_annotation_cannot_appear_on_a_constructor_declaration_1093", message: "Type annotation cannot appear on a constructor declaration." },
+        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_have_type_parameters_1094", message: "An accessor cannot have type parameters." },
+        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_a_return_type_annotation_1095", message: "A 'set' accessor cannot have a return type annotation." },
+        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_exactly_one_parameter_1096", message: "An index signature must have exactly one parameter." },
+        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "_0_list_cannot_be_empty_1097", message: "'{0}' list cannot be empty." },
+        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type_parameter_list_cannot_be_empty_1098", message: "Type parameter list cannot be empty." },
+        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type_argument_list_cannot_be_empty_1099", message: "Type argument list cannot be empty." },
+        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_in_strict_mode_1100", message: "Invalid use of '{0}' in strict mode." },
+        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_strict_mode_1101", message: "'with' statements are not allowed in strict mode." },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "delete_cannot_be_called_on_an_identifier_in_strict_mode_1102", message: "'delete' cannot be called on an identifier in strict mode." },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104", message: "A 'continue' statement can only be used within an enclosing iteration statement." },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105", message: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
+        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump_target_cannot_cross_function_boundary_1107", message: "Jump target cannot cross function boundary." },
+        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A_return_statement_can_only_be_used_within_a_function_body_1108", message: "A 'return' statement can only be used within a function body." },
+        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression_expected_1109", message: "Expression expected." },
+        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type_expected_1110", message: "Type expected." },
+        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A_class_member_cannot_be_declared_optional_1112", message: "A class member cannot be declared optional." },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", message: "A 'default' clause cannot appear more than once in a 'switch' statement." },
+        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate_label_0_1114", message: "Duplicate label '{0}'" },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", message: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116", message: "A 'break' statement can only jump to a label of an enclosing statement." },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117", message: "An object literal cannot have multiple properties with the same name in strict mode." },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118", message: "An object literal cannot have multiple get/set accessors with the same name." },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119", message: "An object literal cannot have property and accessor with the same name." },
+        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_have_modifiers_1120", message: "An export assignment cannot have modifiers." },
+        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_allowed_in_strict_mode_1121", message: "Octal literals are not allowed in strict mode." },
+        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A_tuple_type_element_list_cannot_be_empty_1122", message: "A tuple type element list cannot be empty." },
+        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_list_cannot_be_empty_1123", message: "Variable declaration list cannot be empty." },
+        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit_expected_1124", message: "Digit expected." },
+        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal_digit_expected_1125", message: "Hexadecimal digit expected." },
+        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected_end_of_text_1126", message: "Unexpected end of text." },
+        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid_character_1127", message: "Invalid character." },
+        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration_or_statement_expected_1128", message: "Declaration or statement expected." },
+        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement_expected_1129", message: "Statement expected." },
+        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "case_or_default_expected_1130", message: "'case' or 'default' expected." },
+        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property_or_signature_expected_1131", message: "Property or signature expected." },
+        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum_member_expected_1132", message: "Enum member expected." },
+        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_expected_1134", message: "Variable declaration expected." },
+        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument_expression_expected_1135", message: "Argument expression expected." },
+        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property_assignment_expected_1136", message: "Property assignment expected." },
+        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression_or_comma_expected_1137", message: "Expression or comma expected." },
+        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter_declaration_expected_1138", message: "Parameter declaration expected." },
+        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type_parameter_declaration_expected_1139", message: "Type parameter declaration expected." },
+        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type_argument_expected_1140", message: "Type argument expected." },
+        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
+        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
+        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
+        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
+        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
+        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_1148", message: "Cannot compile modules unless the '--module' flag is provided." },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
+        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
+        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "const_declarations_can_only_be_declared_inside_a_block_1156", message: "'const' declarations can only be declared inside a block." },
+        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "let_declarations_can_only_be_declared_inside_a_block_1157", message: "'let' declarations can only be declared inside a block." },
+        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated_template_literal_1160", message: "Unterminated template literal." },
+        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated_regular_expression_literal_1161", message: "Unterminated regular expression literal." },
+        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An_object_member_cannot_be_declared_optional_1162", message: "An object member cannot be declared optional." },
+        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A_yield_expression_is_only_allowed_in_a_generator_body_1163", message: "A 'yield' expression is only allowed in a generator body." },
+        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed_property_names_are_not_allowed_in_enums_1164", message: "Computed property names are not allowed in enums." },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol_1165", message: "A computed property name in an ambient context must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol_1166", message: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol_1168", message: "A computed property name in a method overload must directly refer to a built-in symbol." },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol_1169", message: "A computed property name in an interface must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol_1170", message: "A computed property name in a type literal must directly refer to a built-in symbol." },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A_comma_expression_is_not_allowed_in_a_computed_property_name_1171", message: "A comma expression is not allowed in a computed property name." },
+        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "extends_clause_already_seen_1172", message: "'extends' clause already seen." },
+        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "extends_clause_must_precede_implements_clause_1173", message: "'extends' clause must precede 'implements' clause." },
+        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes_can_only_extend_a_single_class_1174", message: "Classes can only extend a single class." },
+        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "implements_clause_already_seen_1175", message: "'implements' clause already seen." },
+        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface_declaration_cannot_have_implements_clause_1176", message: "Interface declaration cannot have 'implements' clause." },
+        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary_digit_expected_1177", message: "Binary digit expected." },
+        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal_digit_expected_1178", message: "Octal digit expected." },
+        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_expected_1179", message: "Unexpected token. '{' expected." },
+        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property_destructuring_pattern_expected_1180", message: "Property destructuring pattern expected." },
+        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array_element_destructuring_pattern_expected_1181", message: "Array element destructuring pattern expected." },
+        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A_destructuring_declaration_must_have_an_initializer_1182", message: "A destructuring declaration must have an initializer." },
+        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An_implementation_cannot_be_declared_in_ambient_contexts_1183", message: "An implementation cannot be declared in ambient contexts." },
+        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers_cannot_appear_here_1184", message: "Modifiers cannot appear here." },
+        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge_conflict_marker_encountered_1185", message: "Merge conflict marker encountered." },
+        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_have_an_initializer_1186", message: "A rest element cannot have an initializer." },
+        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_may_not_be_a_binding_pattern_1187", message: "A parameter property may not be a binding pattern." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188", message: "Only a single variable declaration is allowed in a 'for...of' statement." },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189", message: "The variable declaration of a 'for...in' statement cannot have an initializer." },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190", message: "The variable declaration of a 'for...of' statement cannot have an initializer." },
+        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_cannot_have_modifiers_1191", message: "An import declaration cannot have modifiers." },
+        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
+        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
+        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
+        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
+        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
+        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
+        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated_Unicode_escape_sequence_1199", message: "Unterminated Unicode escape sequence." },
+        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line_terminator_not_permitted_before_arrow_1200", message: "Line terminator not permitted before arrow." },
+        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk__1202", message: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
+        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_o_1203", message: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
+        Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower_1204", message: "Cannot compile modules into 'es2015' when targeting 'ES5' or lower." },
+        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators_are_not_valid_here_1206", message: "Decorators are not valid here." },
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", message: "Decorators cannot be applied to multiple get/set accessors of the same name." },
+        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", message: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
+        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", message: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
+        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", message: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
+        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", message: "A class declaration without the 'default' modifier must have a name" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", message: "Identifier expected. '{0}' is a reserved word in strict mode" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213", message: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
+        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
+        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
+        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
+        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
+        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "_0_tag_already_specified_1223", message: "'{0}' tag already specified." },
+        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature_0_must_have_a_type_predicate_1224", message: "Signature '{0}' must have a type predicate." },
+        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
+        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
+        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
+        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
+        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
+        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
+        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", message: "An import declaration can only be used in a namespace or module." },
+        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_can_only_be_used_in_a_module_1233", message: "An export declaration can only be used in a module." },
+        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", message: "An ambient module declaration is only allowed at the top level in a file." },
+        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235", message: "A namespace declaration is only allowed in a namespace or module." },
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236", message: "The return type of a property decorator function must be either 'void' or 'any'." },
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237", message: "The return type of a parameter decorator function must be either 'void' or 'any'." },
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238", message: "Unable to resolve signature of class decorator when called as an expression." },
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
+        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
+        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
+        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
+        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_an_async_function_block_1300", message: "'with' statements are not allowed in an async function block." },
+        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "await_expression_is_only_allowed_within_an_async_function_1308", message: "'await' expression is only allowed within an async function." },
+        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
+        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
+        The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
+        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
+        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular_definition_of_import_alias_0_2303", message: "Circular definition of import alias '{0}'." },
+        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_2304", message: "Cannot find name '{0}'." },
+        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_exported_member_1_2305", message: "Module '{0}' has no exported member '{1}'." },
+        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_a_module_2306", message: "File '{0}' is not a module." },
+        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot_find_module_0_2307", message: "Cannot find module '{0}'." },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", message: "An export assignment cannot be used in a module with other exported elements." },
+        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type_0_recursively_references_itself_as_a_base_type_2310", message: "Type '{0}' recursively references itself as a base type." },
+        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_extend_another_class_2311", message: "A class may only extend another class." },
+        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An_interface_may_only_extend_a_class_or_another_interface_2312", message: "An interface may only extend a class or another interface." },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list_2313", message: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
+        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic_type_0_requires_1_type_argument_s_2314", message: "Generic type '{0}' requires {1} type argument(s)." },
+        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_generic_2315", message: "Type '{0}' is not generic." },
+        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_be_a_class_or_interface_type_2316", message: "Global type '{0}' must be a class or interface type." },
+        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_have_1_type_parameter_s_2317", message: "Global type '{0}' must have {1} type parameter(s)." },
+        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_type_0_2318", message: "Cannot find global type '{0}'." },
+        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named_property_0_of_types_1_and_2_are_not_identical_2319", message: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface_0_cannot_simultaneously_extend_types_1_and_2_2320", message: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
+        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive_stack_depth_comparing_types_0_and_1_2321", message: "Excessive stack depth comparing types '{0}' and '{1}'." },
+        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_2322", message: "Type '{0}' is not assignable to type '{1}'." },
+        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property_0_is_missing_in_type_1_2324", message: "Property '{0}' is missing in type '{1}'." },
+        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_in_type_1_but_not_in_type_2_2325", message: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
+        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types_of_property_0_are_incompatible_2326", message: "Types of property '{0}' are incompatible." },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property_0_is_optional_in_type_1_but_required_in_type_2_2327", message: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
+        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types_of_parameters_0_and_1_are_incompatible_2328", message: "Types of parameters '{0}' and '{1}' are incompatible." },
+        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index_signature_is_missing_in_type_0_2329", message: "Index signature is missing in type '{0}'." },
+        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index_signatures_are_incompatible_2330", message: "Index signatures are incompatible." },
+        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_module_or_namespace_body_2331", message: "'this' cannot be referenced in a module or namespace body." },
+        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_current_location_2332", message: "'this' cannot be referenced in current location." },
+        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_constructor_arguments_2333", message: "'this' cannot be referenced in constructor arguments." },
+        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_static_property_initializer_2334", message: "'this' cannot be referenced in a static property initializer." },
+        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "super_can_only_be_referenced_in_a_derived_class_2335", message: "'super' can only be referenced in a derived class." },
+        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_constructor_arguments_2336", message: "'super' cannot be referenced in constructor arguments." },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337", message: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338", message: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
+        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_type_1_2339", message: "Property '{0}' does not exist on type '{1}'." },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340", message: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
+        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_and_only_accessible_within_class_1_2341", message: "Property '{0}' is private and only accessible within class '{1}'." },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342", message: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
+        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type_0_does_not_satisfy_the_constraint_1_2344", message: "Type '{0}' does not satisfy the constraint '{1}'." },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", message: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied_parameters_do_not_match_any_signature_of_call_target_2346", message: "Supplied parameters do not match any signature of call target." },
+        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped_function_calls_may_not_accept_type_arguments_2347", message: "Untyped function calls may not accept type arguments." },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", message: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
+        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
+        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
+        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371", message: "A parameter initializer is only allowed in a function or constructor implementation." },
+        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter_0_cannot_be_referenced_in_its_initializer_2372", message: "Parameter '{0}' cannot be referenced in its initializer." },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373", message: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
+        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate_string_index_signature_2374", message: "Duplicate string index signature." },
+        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate_number_index_signature_2375", message: "Duplicate number index signature." },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", message: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
+        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors_for_derived_classes_must_contain_a_super_call_2377", message: "Constructors for derived classes must contain a 'super' call." },
+        A_get_accessor_must_return_a_value: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_must_return_a_value_2378", message: "A 'get' accessor must return a value." },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", message: "Getter and setter accessors do not agree in visibility." },
+        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
+        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
+        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
+        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
+        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_be_static_2387", message: "Function overload must be static." },
+        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_not_be_static_2388", message: "Function overload must not be static." },
+        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function_implementation_name_must_be_0_2389", message: "Function implementation name must be '{0}'." },
+        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor_implementation_is_missing_2390", message: "Constructor implementation is missing." },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", message: "Function implementation is missing or not immediately following the declaration." },
+        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple_constructor_implementations_are_not_allowed_2392", message: "Multiple constructor implementations are not allowed." },
+        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate_function_implementation_2393", message: "Duplicate function implementation." },
+        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload_signature_is_not_compatible_with_function_implementation_2394", message: "Overload signature is not compatible with function implementation." },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", message: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", message: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", message: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", message: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", message: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402", message: "Expression resolves to '_super' that compiler uses to capture base class reference." },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
+        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
+        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All_symbols_within_a_with_block_will_be_resolved_to_any_2410", message: "All symbols within a 'with' block will be resolved to 'any'." },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411", message: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412", message: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413", message: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
+        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
+        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
+        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
+        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
+        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
+        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
+        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433", message: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
+        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434", message: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
+        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435", message: "Ambient modules cannot be nested in other modules or namespaces." },
+        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient_module_declaration_cannot_specify_relative_module_name_2436", message: "Ambient module declaration cannot specify relative module name." },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437", message: "Module '{0}' is hidden by a local declaration with the same name" },
+        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import_name_cannot_be_0_2438", message: "Import name cannot be '{0}'" },
+        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439", message: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
+        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import_declaration_conflicts_with_local_declaration_of_0_2440", message: "Import declaration conflicts with local declaration of '{0}'" },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
+        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types_have_separate_declarations_of_a_private_property_0_2442", message: "Types have separate declarations of a private property '{0}'." },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", message: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", message: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", message: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
+        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
+        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
+        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
+        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
+        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An_AMD_module_cannot_have_multiple_name_assignments_2458", message: "An AMD module cannot have multiple name assignments." },
+        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
+        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
+        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
+        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
+        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_a_computed_property_name_2466", message: "'super' cannot be referenced in a computed property name." },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467", message: "A computed property name cannot reference a type parameter from its containing type." },
+        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_value_0_2468", message: "Cannot find global value '{0}'." },
+        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The_0_operator_cannot_be_applied_to_type_symbol_2469", message: "The '{0}' operator cannot be applied to type 'symbol'." },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470", message: "'Symbol' reference does not refer to the global Symbol constructor object." },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471", message: "A computed property name of the form '{0}' must be of type 'symbol'." },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472", message: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
+        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum_declarations_must_all_be_const_or_non_const_2473", message: "Enum declarations must all be const or non-const." },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In_const_enum_declarations_member_initializer_must_be_constant_expression_2474", message: "In 'const' enum declarations member initializer must be constant expression." },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475", message: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476", message: "A const enum member can only be accessed using a string literal." },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477", message: "'const' enum member initializer was evaluated to a non-finite value." },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478", message: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
+        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_const_enum_1_2479", message: "Property '{0}' does not exist on 'const' enum '{1}'." },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480", message: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
+        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
+        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", message: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
+        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_identifier_0_in_catch_clause_2492", message: "Cannot redeclare identifier '{0}' in catch clause" },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2_2493", message: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494", message: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
+        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_or_a_string_type_2495", message: "Type '{0}' is not an array type or a string type." },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496", message: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
+        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct_2497", message: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
+        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498", message: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499", message: "An interface can only extend an identifier/qualified-name with optional type arguments." },
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500", message: "A class can only implement an identifier/qualified-name with optional type arguments." },
+        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_contain_a_binding_pattern_2501", message: "A rest element cannot contain a binding pattern." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502", message: "'{0}' is referenced directly or indirectly in its own type annotation." },
+        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot_find_namespace_0_2503", message: "Cannot find namespace '{0}'." },
+        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_yield_expressions_2504", message: "No best common type exists among yield expressions." },
+        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A_generator_cannot_have_a_void_type_annotation_2505", message: "A generator cannot have a 'void' type annotation." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506", message: "'{0}' is referenced directly or indirectly in its own base expression." },
+        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_constructor_function_type_2507", message: "Type '{0}' is not a constructor function type." },
+        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No_base_constructor_has_the_specified_number_of_type_arguments_2508", message: "No base constructor has the specified number of type arguments." },
+        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
+        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
+        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
+        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
+        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
+        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
+        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_abstract_method_must_be_consecutive_2516", message: "All declarations of an abstract method must be consecutive." },
+        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", message: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
+        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520", message: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
+        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521", message: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
+        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_2522", message: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
+        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523", message: "'yield' expressions cannot be used in a parameter initializer." },
+        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "await_expressions_cannot_be_used_in_a_parameter_initializer_2524", message: "'await' expressions cannot be used in a parameter initializer." },
+        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525", message: "Initializer provides no value for this binding element and the binding element has no default value." },
+        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
+        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
+        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_must_be_an_object_type_2600", message: "JSX element attributes type '{0}' must be an object type." },
+        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
+        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
+        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property_0_in_type_1_is_not_assignable_to_type_2_2603", message: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
+        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604", message: "JSX element type '{0}' does not have any construct or call signatures." },
+        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605", message: "JSX element type '{0}' is not a constructor function for JSX elements." },
+        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606", message: "Property '{0}' of JSX spread attribute is not assignable to target property." },
+        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607", message: "JSX element class does not support attributes because it does not have a '{0}' property" },
+        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The_global_type_JSX_0_may_not_have_more_than_one_property_2608", message: "The global type 'JSX.{0}' may not have more than one property" },
+        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot_emit_namespaced_JSX_elements_in_React_2650", message: "Cannot emit namespaced JSX elements in React" },
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", message: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
+        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", message: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
+        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653", message: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
+        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654", message: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
+        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656", message: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
+        JSX_expressions_must_have_one_parent_element: { code: 2657, category: ts.DiagnosticCategory.Error, key: "JSX_expressions_must_have_one_parent_element_2657", message: "JSX expressions must have one parent element" },
+        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006", message: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008", message: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010", message: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012", message: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014", message: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", message: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", message: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", message: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", message: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", message: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", message: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
+        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_private_name_1_4025", message: "Exported variable '{0}' has or is using private name '{1}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026", message: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027", message: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028", message: "Public static property '{0}' of exported class has or is using private name '{1}'." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029", message: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030", message: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031", message: "Public property '{0}' of exported class has or is using private name '{1}'." },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032", message: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033", message: "Property '{0}' of exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_4034", message: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1_4035", message: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_4036", message: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1_4037", message: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_externa_4038", message: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_4039", message: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0_4040", message: "Return type of public static property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_modul_4041", message: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_4042", message: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0_4043", message: "Return type of public property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044", message: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045", message: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046", message: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047", message: "Return type of call signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048", message: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049", message: "Return type of index signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050", message: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051", message: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052", message: "Return type of public static method from exported class has or is using private name '{0}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053", message: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054", message: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055", message: "Return type of public method from exported class has or is using private name '{0}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056", message: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057", message: "Return type of method from exported interface has or is using private name '{0}'." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058", message: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059", message: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_private_name_0_4060", message: "Return type of exported function has or is using private name '{0}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063", message: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064", message: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065", message: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066", message: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067", message: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070", message: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073", message: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074", message: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075", message: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076", message: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077", message: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
+        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
+        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
+        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
+        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported_file_encoding_5013", message: "Unsupported file encoding." },
+        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed_to_parse_file_0_Colon_1_5014", message: "Failed to parse file '{0}': {1}." },
+        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown_compiler_option_0_5023", message: "Unknown compiler option '{0}'." },
+        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_requires_a_value_of_type_1_5024", message: "Compiler option '{0}' requires a value of type {1}." },
+        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could_not_write_file_0_Colon_1_5033", message: "Could not write file '{0}': {1}" },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042", message: "Option 'project' cannot be mixed with source files on a command line." },
+        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047", message: "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher." },
+        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_prov_5051", message: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
+        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_without_specifying_option_1_5052", message: "Option '{0}' cannot be specified without specifying option '{1}'." },
+        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_with_option_1_5053", message: "Option '{0}' cannot be specified with option '{1}'." },
+        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054", message: "A 'tsconfig.json' file is already defined at: '{0}'." },
+        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
+        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
+        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
+        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
+        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_if_any_errors_were_reported_6008", message: "Do not emit outputs if any errors were reported." },
+        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
+        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
+        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
+        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
+        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile_the_project_in_the_given_directory_6020", message: "Compile the project in the given directory." },
+        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax_Colon_0_6023", message: "Syntax: {0}" },
+        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options_6024", message: "options" },
+        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file_6025", message: "file" },
+        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples_Colon_0_6026", message: "Examples: {0}" },
+        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options_Colon_6027", message: "Options:" },
+        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version_0_6029", message: "Version {0}" },
+        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert_command_line_options_and_files_from_a_file_6030", message: "Insert command line options and files from a file." },
+        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File_change_detected_Starting_incremental_compilation_6032", message: "File change detected. Starting incremental compilation..." },
+        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND_6034", message: "KIND" },
+        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE_6035", message: "FILE" },
+        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION_6036", message: "VERSION" },
+        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION_6037", message: "LOCATION" },
+        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY_6038", message: "DIRECTORY" },
+        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation_complete_Watching_for_file_changes_6042", message: "Compilation complete. Watching for file changes." },
+        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
+        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
+        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
+        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
+        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
+        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
+        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
+        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted_locale_file_0_6051", message: "Corrupted locale file {0}." },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052", message: "Raise error on expressions and declarations with an implied 'any' type." },
+        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File_0_not_found_6053", message: "File '{0}' not found." },
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
+        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
+        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
+        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
+        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
+        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
+        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
+        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
+        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
+        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
+        Stylize_errors_and_messages_using_color_and_context_experimental: { code: 6073, category: ts.DiagnosticCategory.Message, key: "Stylize_errors_and_messages_using_color_and_context_experimental_6073", message: "Stylize errors and messages using color and context. (experimental)" },
+        Do_not_report_errors_on_unused_labels: { code: 6074, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unused_labels_6074", message: "Do not report errors on unused labels." },
+        Report_error_when_not_all_code_paths_in_function_return_a_value: { code: 6075, category: ts.DiagnosticCategory.Message, key: "Report_error_when_not_all_code_paths_in_function_return_a_value_6075", message: "Report error when not all code paths in function return a value." },
+        Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
+        Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
+        Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
+        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
+        Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
+        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
+        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
+        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009", message: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010", message: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation_7016", message: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
+        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
+        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", message: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", message: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", message: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", message: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
+        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", message: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
+        Unreachable_code_detected: { code: 7027, category: ts.DiagnosticCategory.Error, key: "Unreachable_code_detected_7027", message: "Unreachable code detected." },
+        Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
+        Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
+        Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
+        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
+        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "export_can_only_be_used_in_a_ts_file_8003", message: "'export=' can only be used in a .ts file." },
+        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "type_parameter_declarations_can_only_be_used_in_a_ts_file_8004", message: "'type parameter declarations' can only be used in a .ts file." },
+        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "implements_clauses_can_only_be_used_in_a_ts_file_8005", message: "'implements clauses' can only be used in a .ts file." },
+        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "interface_declarations_can_only_be_used_in_a_ts_file_8006", message: "'interface declarations' can only be used in a .ts file." },
+        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "module_declarations_can_only_be_used_in_a_ts_file_8007", message: "'module declarations' can only be used in a .ts file." },
+        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "type_aliases_can_only_be_used_in_a_ts_file_8008", message: "'type aliases' can only be used in a .ts file." },
+        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "_0_can_only_be_used_in_a_ts_file_8009", message: "'{0}' can only be used in a .ts file." },
+        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "types_can_only_be_used_in_a_ts_file_8010", message: "'types' can only be used in a .ts file." },
+        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "type_arguments_can_only_be_used_in_a_ts_file_8011", message: "'type arguments' can only be used in a .ts file." },
+        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "parameter_modifiers_can_only_be_used_in_a_ts_file_8012", message: "'parameter modifiers' can only be used in a .ts file." },
+        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
+        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
+        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
+        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
+        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
+        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
+        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", message: "JSX elements cannot have multiple attributes with the same name." },
+        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected_corresponding_JSX_closing_tag_for_0_17002", message: "Expected corresponding JSX closing tag for '{0}'." },
+        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX_attribute_expected_17003", message: "JSX attribute expected." },
+        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004", message: "Cannot use JSX unless the '--jsx' flag is provided." },
+        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
+        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
+        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
     };
 })(ts || (ts = {}));
 var ts;
@@ -2136,7 +2157,7 @@ var ts;
     function getCommentRanges(text, pos, trailing) {
         var result;
         var collecting = trailing || pos === 0;
-        while (true) {
+        while (pos < text.length) {
             var ch = text.charCodeAt(pos);
             switch (ch) {
                 case 13:
@@ -2205,6 +2226,7 @@ var ts;
             }
             return result;
         }
+        return result;
     }
     function getLeadingCommentRanges(text, pos) {
         return getCommentRanges(text, pos, false);
@@ -2300,7 +2322,7 @@ var ts;
                     error(ts.Diagnostics.Digit_expected);
                 }
             }
-            return +(text.substring(start, end));
+            return "" + +(text.substring(start, end));
         }
         function scanOctalDigits() {
             var start = pos;
@@ -2692,7 +2714,7 @@ var ts;
                         return pos++, token = 36;
                     case 46:
                         if (isDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = "" + scanNumber();
+                            tokenValue = scanNumber();
                             return token = 8;
                         }
                         if (text.charCodeAt(pos + 1) === 46 && text.charCodeAt(pos + 2) === 46) {
@@ -2789,7 +2811,7 @@ var ts;
                     case 55:
                     case 56:
                     case 57:
-                        tokenValue = "" + scanNumber();
+                        tokenValue = scanNumber();
                         return token = 8;
                     case 58:
                         return pos++, token = 54;
@@ -3081,742 +3103,12 @@ var ts;
     ts.createScanner = createScanner;
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    ts.bindTime = 0;
-    function getModuleInstanceState(node) {
-        if (node.kind === 215 || node.kind === 216) {
-            return 0;
-        }
-        else if (ts.isConstEnumDeclaration(node)) {
-            return 2;
-        }
-        else if ((node.kind === 222 || node.kind === 221) && !(node.flags & 1)) {
-            return 0;
-        }
-        else if (node.kind === 219) {
-            var state = 0;
-            ts.forEachChild(node, function (n) {
-                switch (getModuleInstanceState(n)) {
-                    case 0:
-                        return false;
-                    case 2:
-                        state = 2;
-                        return false;
-                    case 1:
-                        state = 1;
-                        return true;
-                }
-            });
-            return state;
-        }
-        else if (node.kind === 218) {
-            return getModuleInstanceState(node.body);
-        }
-        else {
-            return 1;
-        }
-    }
-    ts.getModuleInstanceState = getModuleInstanceState;
-    function bindSourceFile(file) {
-        var start = new Date().getTime();
-        bindSourceFileWorker(file);
-        ts.bindTime += new Date().getTime() - start;
-    }
-    ts.bindSourceFile = bindSourceFile;
-    function bindSourceFileWorker(file) {
-        var parent;
-        var container;
-        var blockScopeContainer;
-        var lastContainer;
-        var seenThisKeyword;
-        var inStrictMode = !!file.externalModuleIndicator;
-        var symbolCount = 0;
-        var Symbol = ts.objectAllocator.getSymbolConstructor();
-        var classifiableNames = {};
-        if (!file.locals) {
-            bind(file);
-            file.symbolCount = symbolCount;
-            file.classifiableNames = classifiableNames;
-        }
-        return;
-        function createSymbol(flags, name) {
-            symbolCount++;
-            return new Symbol(flags, name);
-        }
-        function addDeclarationToSymbol(symbol, node, symbolFlags) {
-            symbol.flags |= symbolFlags;
-            node.symbol = symbol;
-            if (!symbol.declarations) {
-                symbol.declarations = [];
-            }
-            symbol.declarations.push(node);
-            if (symbolFlags & 1952 && !symbol.exports) {
-                symbol.exports = {};
-            }
-            if (symbolFlags & 6240 && !symbol.members) {
-                symbol.members = {};
-            }
-            if (symbolFlags & 107455 && !symbol.valueDeclaration) {
-                symbol.valueDeclaration = node;
-            }
-        }
-        function getDeclarationName(node) {
-            if (node.name) {
-                if (node.kind === 218 && node.name.kind === 9) {
-                    return "\"" + node.name.text + "\"";
-                }
-                if (node.name.kind === 136) {
-                    var nameExpression = node.name.expression;
-                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
-                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
-                }
-                return node.name.text;
-            }
-            switch (node.kind) {
-                case 144:
-                    return "__constructor";
-                case 152:
-                case 147:
-                    return "__call";
-                case 153:
-                case 148:
-                    return "__new";
-                case 149:
-                    return "__index";
-                case 228:
-                    return "__export";
-                case 227:
-                    return node.isExportEquals ? "export=" : "default";
-                case 213:
-                case 214:
-                    return node.flags & 1024 ? "default" : undefined;
-            }
-        }
-        function getDisplayName(node) {
-            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
-        }
-        function declareSymbol(symbolTable, parent, node, includes, excludes) {
-            ts.Debug.assert(!ts.hasDynamicName(node));
-            var isDefaultExport = node.flags & 1024;
-            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
-            var symbol;
-            if (name !== undefined) {
-                symbol = ts.hasProperty(symbolTable, name)
-                    ? symbolTable[name]
-                    : (symbolTable[name] = createSymbol(0, name));
-                if (name && (includes & 788448)) {
-                    classifiableNames[name] = name;
-                }
-                if (symbol.flags & excludes) {
-                    if (node.name) {
-                        node.name.parent = node;
-                    }
-                    var message = symbol.flags & 2
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        if (declaration.flags & 1024) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
-                        }
-                    });
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
-                    });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
-                    symbol = createSymbol(0, name);
-                }
-            }
-            else {
-                symbol = createSymbol(0, "__missing");
-            }
-            addDeclarationToSymbol(symbol, node, includes);
-            symbol.parent = parent;
-            return symbol;
-        }
-        function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
-            if (symbolFlags & 8388608) {
-                if (node.kind === 230 || (node.kind === 221 && hasExportModifier)) {
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-            else {
-                if (hasExportModifier || container.flags & 262144) {
-                    var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
-                        (symbolFlags & 793056 ? 2097152 : 0) |
-                        (symbolFlags & 1536 ? 4194304 : 0);
-                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
-                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                    node.localSymbol = local;
-                    return local;
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-        }
-        function bindChildren(node) {
-            var saveParent = parent;
-            var saveContainer = container;
-            var savedBlockScopeContainer = blockScopeContainer;
-            parent = node;
-            var containerFlags = getContainerFlags(node);
-            if (containerFlags & 1) {
-                container = blockScopeContainer = node;
-                if (containerFlags & 4) {
-                    container.locals = {};
-                }
-                addToContainerChain(container);
-            }
-            else if (containerFlags & 2) {
-                blockScopeContainer = node;
-                blockScopeContainer.locals = undefined;
-            }
-            if (node.kind === 215) {
-                seenThisKeyword = false;
-                ts.forEachChild(node, bind);
-                node.flags = seenThisKeyword ? node.flags | 524288 : node.flags & ~524288;
-            }
-            else {
-                ts.forEachChild(node, bind);
-            }
-            container = saveContainer;
-            parent = saveParent;
-            blockScopeContainer = savedBlockScopeContainer;
-        }
-        function getContainerFlags(node) {
-            switch (node.kind) {
-                case 186:
-                case 214:
-                case 215:
-                case 217:
-                case 155:
-                case 165:
-                    return 1;
-                case 147:
-                case 148:
-                case 149:
-                case 143:
-                case 142:
-                case 213:
-                case 144:
-                case 145:
-                case 146:
-                case 152:
-                case 153:
-                case 173:
-                case 174:
-                case 218:
-                case 248:
-                case 216:
-                    return 5;
-                case 244:
-                case 199:
-                case 200:
-                case 201:
-                case 220:
-                    return 2;
-                case 192:
-                    return ts.isFunctionLike(node.parent) ? 0 : 2;
-            }
-            return 0;
-        }
-        function addToContainerChain(next) {
-            if (lastContainer) {
-                lastContainer.nextContainer = next;
-            }
-            lastContainer = next;
-        }
-        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
-            declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
-        }
-        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
-            switch (container.kind) {
-                case 218:
-                    return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 248:
-                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 186:
-                case 214:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 217:
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 155:
-                case 165:
-                case 215:
-                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 152:
-                case 153:
-                case 147:
-                case 148:
-                case 149:
-                case 143:
-                case 142:
-                case 144:
-                case 145:
-                case 146:
-                case 213:
-                case 173:
-                case 174:
-                case 216:
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 128
-                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
-                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-        }
-        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
-            return ts.isExternalModule(file)
-                ? declareModuleMember(node, symbolFlags, symbolExcludes)
-                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
-        }
-        function isAmbientContext(node) {
-            while (node) {
-                if (node.flags & 2) {
-                    return true;
-                }
-                node = node.parent;
-            }
-            return false;
-        }
-        function hasExportDeclarations(node) {
-            var body = node.kind === 248 ? node : node.body;
-            if (body.kind === 248 || body.kind === 219) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 228 || stat.kind === 227) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function setExportContextFlag(node) {
-            if (isAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 262144;
-            }
-            else {
-                node.flags &= ~262144;
-            }
-        }
-        function bindModuleDeclaration(node) {
-            setExportContextFlag(node);
-            if (node.name.kind === 9) {
-                declareSymbolAndAddToSymbolTable(node, 512, 106639);
-            }
-            else {
-                var state = getModuleInstanceState(node);
-                if (state === 0) {
-                    declareSymbolAndAddToSymbolTable(node, 1024, 0);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 512, 106639);
-                    if (node.symbol.flags & (16 | 32 | 256)) {
-                        node.symbol.constEnumOnlyModule = false;
-                    }
-                    else {
-                        var currentModuleIsConstEnumOnly = state === 2;
-                        if (node.symbol.constEnumOnlyModule === undefined) {
-                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
-                        }
-                        else {
-                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
-                        }
-                    }
-                }
-            }
-        }
-        function bindFunctionOrConstructorType(node) {
-            var symbol = createSymbol(131072, getDeclarationName(node));
-            addDeclarationToSymbol(symbol, node, 131072);
-            var typeLiteralSymbol = createSymbol(2048, "__type");
-            addDeclarationToSymbol(typeLiteralSymbol, node, 2048);
-            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
-            var _a;
-        }
-        function bindObjectLiteralExpression(node) {
-            if (inStrictMode) {
-                var seen = {};
-                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (prop.name.kind !== 69) {
-                        continue;
-                    }
-                    var identifier = prop.name;
-                    var currentKind = prop.kind === 245 || prop.kind === 246 || prop.kind === 143
-                        ? 1
-                        : 2;
-                    var existingKind = seen[identifier.text];
-                    if (!existingKind) {
-                        seen[identifier.text] = currentKind;
-                        continue;
-                    }
-                    if (currentKind === 1 && existingKind === 1) {
-                        var span = ts.getErrorSpanForNode(file, identifier);
-                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
-                    }
-                }
-            }
-            return bindAnonymousDeclaration(node, 4096, "__object");
-        }
-        function bindAnonymousDeclaration(node, symbolFlags, name) {
-            var symbol = createSymbol(symbolFlags, name);
-            addDeclarationToSymbol(symbol, node, symbolFlags);
-        }
-        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
-            switch (blockScopeContainer.kind) {
-                case 218:
-                    declareModuleMember(node, symbolFlags, symbolExcludes);
-                    break;
-                case 248:
-                    if (ts.isExternalModule(container)) {
-                        declareModuleMember(node, symbolFlags, symbolExcludes);
-                        break;
-                    }
-                default:
-                    if (!blockScopeContainer.locals) {
-                        blockScopeContainer.locals = {};
-                        addToContainerChain(blockScopeContainer);
-                    }
-                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function bindBlockScopedVariableDeclaration(node) {
-            bindBlockScopedDeclaration(node, 2, 107455);
-        }
-        function checkStrictModeIdentifier(node) {
-            if (inStrictMode &&
-                node.originalKeywordKind >= 106 &&
-                node.originalKeywordKind <= 114 &&
-                !ts.isIdentifierName(node)) {
-                if (!file.parseDiagnostics.length) {
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
-                }
-            }
-        }
-        function getStrictModeIdentifierMessage(node) {
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
-        }
-        function checkStrictModeBinaryExpression(node) {
-            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                checkStrictModeEvalOrArguments(node, node.left);
-            }
-        }
-        function checkStrictModeCatchClause(node) {
-            if (inStrictMode && node.variableDeclaration) {
-                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
-            }
-        }
-        function checkStrictModeDeleteExpression(node) {
-            if (inStrictMode && node.expression.kind === 69) {
-                var span = ts.getErrorSpanForNode(file, node.expression);
-                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
-            }
-        }
-        function isEvalOrArgumentsIdentifier(node) {
-            return node.kind === 69 &&
-                (node.text === "eval" || node.text === "arguments");
-        }
-        function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 69) {
-                var identifier = name;
-                if (isEvalOrArgumentsIdentifier(identifier)) {
-                    var span = ts.getErrorSpanForNode(file, name);
-                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
-                }
-            }
-        }
-        function getStrictModeEvalOrArgumentsMessage(node) {
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
-        }
-        function checkStrictModeFunctionName(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-        }
-        function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 65536) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
-            }
-        }
-        function checkStrictModePostfixUnaryExpression(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.operand);
-            }
-        }
-        function checkStrictModePrefixUnaryExpression(node) {
-            if (inStrictMode) {
-                if (node.operator === 41 || node.operator === 42) {
-                    checkStrictModeEvalOrArguments(node, node.operand);
-                }
-            }
-        }
-        function checkStrictModeWithStatement(node) {
-            if (inStrictMode) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
-            }
-        }
-        function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) {
-            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
-            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
-        }
-        function getDestructuringParameterName(node) {
-            return "__" + ts.indexOf(node.parent.parameters, node);
-        }
-        function bind(node) {
-            node.parent = parent;
-            var savedInStrictMode = inStrictMode;
-            if (!savedInStrictMode) {
-                updateStrictMode(node);
-            }
-            bindWorker(node);
-            bindChildren(node);
-            inStrictMode = savedInStrictMode;
-        }
-        function updateStrictMode(node) {
-            switch (node.kind) {
-                case 248:
-                case 219:
-                    updateStrictModeStatementList(node.statements);
-                    return;
-                case 192:
-                    if (ts.isFunctionLike(node.parent)) {
-                        updateStrictModeStatementList(node.statements);
-                    }
-                    return;
-                case 214:
-                case 186:
-                    inStrictMode = true;
-                    return;
-            }
-        }
-        function updateStrictModeStatementList(statements) {
-            for (var _i = 0; _i < statements.length; _i++) {
-                var statement = statements[_i];
-                if (!ts.isPrologueDirective(statement)) {
-                    return;
-                }
-                if (isUseStrictPrologueDirective(statement)) {
-                    inStrictMode = true;
-                    return;
-                }
-            }
-        }
-        function isUseStrictPrologueDirective(node) {
-            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
-        }
-        function bindWorker(node) {
-            switch (node.kind) {
-                case 69:
-                    return checkStrictModeIdentifier(node);
-                case 181:
-                    return checkStrictModeBinaryExpression(node);
-                case 244:
-                    return checkStrictModeCatchClause(node);
-                case 175:
-                    return checkStrictModeDeleteExpression(node);
-                case 8:
-                    return checkStrictModeNumericLiteral(node);
-                case 180:
-                    return checkStrictModePostfixUnaryExpression(node);
-                case 179:
-                    return checkStrictModePrefixUnaryExpression(node);
-                case 205:
-                    return checkStrictModeWithStatement(node);
-                case 97:
-                    seenThisKeyword = true;
-                    return;
-                case 137:
-                    return declareSymbolAndAddToSymbolTable(node, 262144, 530912);
-                case 138:
-                    return bindParameter(node);
-                case 211:
-                case 163:
-                    return bindVariableDeclarationOrBindingElement(node);
-                case 141:
-                case 140:
-                    return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455);
-                case 245:
-                case 246:
-                    return bindPropertyOrMethodOrAccessor(node, 4, 107455);
-                case 247:
-                    return bindPropertyOrMethodOrAccessor(node, 8, 107455);
-                case 147:
-                case 148:
-                case 149:
-                    return declareSymbolAndAddToSymbolTable(node, 131072, 0);
-                case 143:
-                case 142:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263);
-                case 213:
-                    checkStrictModeFunctionName(node);
-                    return declareSymbolAndAddToSymbolTable(node, 16, 106927);
-                case 144:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
-                case 145:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
-                case 146:
-                    return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
-                case 152:
-                case 153:
-                    return bindFunctionOrConstructorType(node);
-                case 155:
-                    return bindAnonymousDeclaration(node, 2048, "__type");
-                case 165:
-                    return bindObjectLiteralExpression(node);
-                case 173:
-                case 174:
-                    checkStrictModeFunctionName(node);
-                    var bindingName = node.name ? node.name.text : "__function";
-                    return bindAnonymousDeclaration(node, 16, bindingName);
-                case 186:
-                case 214:
-                    return bindClassLikeDeclaration(node);
-                case 215:
-                    return bindBlockScopedDeclaration(node, 64, 792960);
-                case 216:
-                    return bindBlockScopedDeclaration(node, 524288, 793056);
-                case 217:
-                    return bindEnumDeclaration(node);
-                case 218:
-                    return bindModuleDeclaration(node);
-                case 221:
-                case 224:
-                case 226:
-                case 230:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
-                case 223:
-                    return bindImportClause(node);
-                case 228:
-                    return bindExportDeclaration(node);
-                case 227:
-                    return bindExportAssignment(node);
-                case 248:
-                    return bindSourceFileIfExternalModule();
-            }
-        }
-        function bindSourceFileIfExternalModule() {
-            setExportContextFlag(file);
-            if (ts.isExternalModule(file)) {
-                bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
-            }
-        }
-        function bindExportAssignment(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
-            }
-            else if (node.expression.kind === 69) {
-                declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608);
-            }
-            else {
-                declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455 | 8388608);
-            }
-        }
-        function bindExportDeclaration(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                bindAnonymousDeclaration(node, 1073741824, getDeclarationName(node));
-            }
-            else if (!node.exportClause) {
-                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0);
-            }
-        }
-        function bindImportClause(node) {
-            if (node.name) {
-                declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
-            }
-        }
-        function bindClassLikeDeclaration(node) {
-            if (node.kind === 214) {
-                bindBlockScopedDeclaration(node, 32, 899519);
-            }
-            else {
-                var bindingName = node.name ? node.name.text : "__class";
-                bindAnonymousDeclaration(node, 32, bindingName);
-                if (node.name) {
-                    classifiableNames[node.name.text] = node.name.text;
-                }
-            }
-            var symbol = node.symbol;
-            var prototypeSymbol = createSymbol(4 | 134217728, "prototype");
-            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
-                if (node.name) {
-                    node.name.parent = node;
-                }
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
-            }
-            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
-            prototypeSymbol.parent = symbol;
-        }
-        function bindEnumDeclaration(node) {
-            return ts.isConst(node)
-                ? bindBlockScopedDeclaration(node, 128, 899967)
-                : bindBlockScopedDeclaration(node, 256, 899327);
-        }
-        function bindVariableDeclarationOrBindingElement(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (!ts.isBindingPattern(node.name)) {
-                if (ts.isBlockOrCatchScoped(node)) {
-                    bindBlockScopedVariableDeclaration(node);
-                }
-                else if (ts.isParameterDeclaration(node)) {
-                    declareSymbolAndAddToSymbolTable(node, 1, 107455);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 1, 107454);
-                }
-            }
-        }
-        function bindParameter(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (ts.isBindingPattern(node.name)) {
-                bindAnonymousDeclaration(node, 1, getDestructuringParameterName(node));
-            }
-            else {
-                declareSymbolAndAddToSymbolTable(node, 1, 107455);
-            }
-            if (node.flags & 112 &&
-                node.parent.kind === 144 &&
-                ts.isClassLike(node.parent.parent)) {
-                var classDeclaration = node.parent.parent;
-                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455);
-            }
-        }
-        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
-            return ts.hasDynamicName(node)
-                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
-                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
-        }
-    }
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
                 if (declaration.kind === kind) {
                     return declaration;
                 }
@@ -3859,15 +3151,15 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(arr1, arr2, comparer) {
-        if (!arr1 || !arr2) {
-            return arr1 === arr2;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
         }
-        if (arr1.length !== arr2.length) {
+        if (array1.length !== array2.length) {
             return false;
         }
-        for (var i = 0; i < arr1.length; ++i) {
-            var equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];
+        for (var i = 0; i < array1.length; ++i) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
             if (!equals) {
                 return false;
             }
@@ -3986,7 +3278,7 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 49152) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 24576) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
@@ -4086,8 +3378,12 @@ var ts;
         return file.externalModuleIndicator !== undefined;
     }
     ts.isExternalModule = isExternalModule;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 8192) !== 0;
+        return (file.flags & 4096) !== 0;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
@@ -4117,11 +3413,11 @@ var ts;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 32768);
+        return !!(getCombinedNodeFlags(node) & 16384);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 16384);
+        return !!(getCombinedNodeFlags(node) & 8192);
     }
     ts.isLet = isLet;
     function isPrologueDirective(node) {
@@ -4132,18 +3428,26 @@ var ts;
         return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getLeadingCommentRangesOfNodeFromText(node, text) {
+        return ts.getLeadingCommentRanges(text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
     function getJsDocComments(node, sourceFileOfNode) {
-        var commentRanges = (node.kind === 138 || node.kind === 137) ?
-            ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) :
-            getLeadingCommentRangesOfNode(node, sourceFileOfNode);
-        return ts.filter(commentRanges, isJsDocComment);
-        function isJsDocComment(comment) {
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
-        }
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
     }
     ts.getJsDocComments = getJsDocComments;
+    function getJsDocCommentsFromText(node, text) {
+        var commentRanges = (node.kind === 138 || node.kind === 137) ?
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
+        return ts.filter(commentRanges, isJsDocComment);
+        function isJsDocComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 42 &&
+                text.charCodeAt(comment.pos + 3) !== 47;
+        }
+    }
+    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
@@ -4300,27 +3604,28 @@ var ts;
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 144:
-                case 173:
-                case 213:
-                case 174:
-                case 143:
-                case 142:
-                case 145:
-                case 146:
-                case 147:
-                case 148:
-                case 149:
-                case 152:
-                case 153:
-                    return true;
-            }
-        }
-        return false;
+        return node && isFunctionLikeKind(node.kind);
     }
     ts.isFunctionLike = isFunctionLike;
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 144:
+            case 173:
+            case 213:
+            case 174:
+            case 143:
+            case 142:
+            case 145:
+            case 146:
+            case 147:
+            case 148:
+            case 149:
+            case 152:
+            case 153:
+                return true;
+        }
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
             case 143:
@@ -4335,6 +3640,20 @@ var ts;
         return false;
     }
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 199:
+            case 200:
+            case 201:
+            case 197:
+            case 198:
+                return true;
+            case 207:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
         return node && node.kind === 192 && isFunctionLike(node.parent);
     }
@@ -4657,6 +3976,41 @@ var ts;
         return node.kind === 221 && node.moduleReference.kind !== 232;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJavaScript(file) {
+        return isInJavaScriptFile(file);
+    }
+    ts.isSourceFileJavaScript = isSourceFileJavaScript;
+    function isInJavaScriptFile(node) {
+        return node && !!(node.parserContextFlags & 32);
+    }
+    ts.isInJavaScriptFile = isInJavaScriptFile;
+    function isRequireCall(expression) {
+        return expression.kind === 168 &&
+            expression.expression.kind === 69 &&
+            expression.expression.text === "require" &&
+            expression.arguments.length === 1 &&
+            expression.arguments[0].kind === 9;
+    }
+    ts.isRequireCall = isRequireCall;
+    function isExportsPropertyAssignment(expression) {
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181) &&
+            (expression.operatorToken.kind === 56) &&
+            (expression.left.kind === 166) &&
+            (expression.left.expression.kind === 69) &&
+            ((expression.left.expression).text === "exports");
+    }
+    ts.isExportsPropertyAssignment = isExportsPropertyAssignment;
+    function isModuleExportsAssignment(expression) {
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181) &&
+            (expression.operatorToken.kind === 56) &&
+            (expression.left.kind === 166) &&
+            (expression.left.expression.kind === 69) &&
+            ((expression.left.expression).text === "module") &&
+            (expression.left.name.text === "exports");
+    }
+    ts.isModuleExportsAssignment = isModuleExportsAssignment;
     function getExternalModuleName(node) {
         if (node.kind === 222) {
             return node.moduleSpecifier;
@@ -4770,9 +4124,18 @@ var ts;
         return !!node && (node.kind === 162 || node.kind === 161);
     }
     ts.isBindingPattern = isBindingPattern;
+    function isNodeDescendentOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (2 | 8192)) {
+            if (node.flags & (4 | 4096)) {
                 return true;
             }
             node = node.parent;
@@ -4830,7 +4193,7 @@ var ts;
             case 207:
             case 204:
             case 206:
-            case 98:
+            case 208:
             case 209:
             case 193:
             case 198:
@@ -4929,8 +4292,8 @@ var ts;
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
     function getHeritageClause(clauses, kind) {
         if (clauses) {
-            for (var _i = 0; _i < clauses.length; _i++) {
-                var clause = clauses[_i];
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
                 if (clause.token === kind) {
                     return clause;
                 }
@@ -4942,7 +4305,6 @@ var ts;
     function tryResolveScriptReference(host, sourceFile, reference) {
         if (!host.getCompilerOptions().noResolve) {
             var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            referenceFileName = ts.getNormalizedAbsolutePath(referenceFileName, host.getCurrentDirectory());
             return host.getSourceFile(referenceFileName);
         }
     }
@@ -4960,8 +4322,8 @@ var ts;
     function getFileReferenceFromReferencePath(comment, commentRange) {
         var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
         var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.exec(comment)) {
-            if (isNoDefaultLibRegEx.exec(comment)) {
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
                 return {
                     isNoDefaultLib: true
                 };
@@ -5000,15 +4362,23 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && (node.flags & 512) !== 0 && !isAccessor(node);
+        return isFunctionLike(node) && (node.flags & 256) !== 0 && !isAccessor(node);
     }
     ts.isAsyncFunctionLike = isAsyncFunctionLike;
+    function isStringOrNumericLiteral(kind) {
+        return kind === 9 || kind === 8;
+    }
+    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 136 &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && isDynamicName(declaration.name);
     }
     ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 136 &&
+            !isStringOrNumericLiteral(name.expression.kind) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
     function isWellKnownSymbolSyntactically(node) {
         return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
     }
@@ -5089,7 +4459,7 @@ var ts;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
-        var node = ts.createNode(kind);
+        var node = ts.createNode(kind, -1, -1);
         node.startsOnNewLine = startsOnNewLine;
         return node;
     }
@@ -5229,11 +4599,11 @@ var ts;
     }
     ts.getIndentSize = getIndentSize;
     function createTextWriter(newLine) {
-        var output = "";
-        var indent = 0;
-        var lineStart = true;
-        var lineCount = 0;
-        var linePos = 0;
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
         function write(s) {
             if (s && s.length) {
                 if (lineStart) {
@@ -5243,6 +4613,13 @@ var ts;
                 output += s;
             }
         }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
         function rawWrite(s) {
             if (s !== undefined) {
                 if (lineStart) {
@@ -5269,9 +4646,10 @@ var ts;
                 lineStart = true;
             }
         }
-        function writeTextOfNode(sourceFile, node) {
-            write(getSourceTextOfNodeFromSourceFile(sourceFile, node));
+        function writeTextOfNode(text, node) {
+            write(getTextOfNodeFromSourceText(text, node));
         }
+        reset();
         return {
             write: write,
             rawWrite: rawWrite,
@@ -5284,10 +4662,17 @@ var ts;
             getTextPos: function () { return output.length; },
             getLine: function () { return lineCount + 1; },
             getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            getText: function () { return output; },
+            reset: reset
         };
     }
     ts.createTextWriter = createTextWriter;
+    function getExternalModuleNameFromPath(host, fileName) {
+        var dir = host.getCurrentDirectory();
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, false);
+        return ts.removeFileExtension(relativePath);
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
     function getOwnEmitOutputFilePath(sourceFile, host, extension) {
         var compilerOptions = host.getCompilerOptions();
         var emitOutputFilePathWithoutExtension;
@@ -5316,6 +4701,10 @@ var ts;
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
             if (member.kind === 144 && nodeIsPresent(member.body)) {
@@ -5358,7 +4747,7 @@ var ts;
         else {
             ts.forEach(declarations, function (member) {
                 if ((member.kind === 145 || member.kind === 146)
-                    && (member.flags & 128) === (accessor.flags & 128)) {
+                    && (member.flags & 64) === (accessor.flags & 64)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -5386,21 +4775,21 @@ var ts;
         };
     }
     ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
         if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
     ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) {
+    function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) {
         var emitLeadingSpace = !trailingSeparator;
         ts.forEach(comments, function (comment) {
             if (emitLeadingSpace) {
                 writer.write(" ");
                 emitLeadingSpace = false;
             }
-            writeComment(currentSourceFile, writer, comment, newLine);
+            writeComment(text, lineMap, writer, comment, newLine);
             if (comment.hasTrailingNewLine) {
                 writer.writeLine();
             }
@@ -5413,21 +4802,64 @@ var ts;
         });
     }
     ts.emitComments = emitComments;
-    function writeCommentRange(currentSourceFile, writer, comment, newLine) {
-        if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) {
-            var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
-            var lineCount = ts.getLineStarts(currentSourceFile).length;
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 33;
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, comment, newLine) {
+        if (text.charCodeAt(comment.pos + 1) === 42) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
+            var lineCount = lineMap.length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
                 if (pos !== comment.pos) {
                     if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
                     }
                     var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
                     if (spacesToEmit > 0) {
                         var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
                         var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
@@ -5441,52 +4873,52 @@ var ts;
                         writer.rawWrite("");
                     }
                 }
-                writeTrimmedCurrentLine(pos, nextLineStart);
+                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
                 pos = nextLineStart;
             }
         }
         else {
-            writer.write(currentSourceFile.text.substring(comment.pos, comment.end));
-        }
-        function writeTrimmedCurrentLine(pos, nextLineStart) {
-            var end = Math.min(comment.end, nextLineStart - 1);
-            var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-            if (currentLineText) {
-                writer.write(currentLineText);
-                if (end !== comment.end) {
-                    writer.writeLine();
-                }
-            }
-            else {
-                writer.writeLiteral(newLine);
-            }
-        }
-        function calculateIndent(pos, end) {
-            var currentLineIndent = 0;
-            for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) {
-                if (currentSourceFile.text.charCodeAt(pos) === 9) {
-                    currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-                }
-                else {
-                    currentLineIndent++;
-                }
-            }
-            return currentLineIndent;
+            writer.write(text.substring(comment.pos, comment.end));
         }
     }
     ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(comment.end, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            writer.write(currentLineText);
+            if (end !== comment.end) {
+                writer.writeLine();
+            }
+        }
+        else {
+            writer.writeLiteral(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9) {
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
     function modifierToFlag(token) {
         switch (token) {
-            case 113: return 128;
-            case 112: return 16;
-            case 111: return 64;
-            case 110: return 32;
-            case 115: return 256;
-            case 82: return 1;
-            case 122: return 2;
-            case 74: return 32768;
-            case 77: return 1024;
-            case 118: return 512;
+            case 113: return 64;
+            case 112: return 8;
+            case 111: return 32;
+            case 110: return 16;
+            case 115: return 128;
+            case 82: return 2;
+            case 122: return 4;
+            case 74: return 16384;
+            case 77: return 512;
+            case 118: return 256;
         }
         return 0;
     }
@@ -5565,17 +4997,17 @@ var ts;
     }
     ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
     function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 1024) ? symbol.valueDeclaration.localSymbol : undefined;
+        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512) ? symbol.valueDeclaration.localSymbol : undefined;
     }
     ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function isJavaScript(fileName) {
-        return ts.fileExtensionIs(fileName, ".js");
+    function hasJavaScriptFileExtension(fileName) {
+        return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isJavaScript = isJavaScript;
-    function isTsx(fileName) {
-        return ts.fileExtensionIs(fileName, ".tsx");
+    ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension;
+    function allowsJsxExpressions(fileName) {
+        return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isTsx = isTsx;
+    ts.allowsJsxExpressions = allowsJsxExpressions;
     function getExpandedCharCodes(input) {
         var output = [];
         var length = input.length;
@@ -5629,6 +5061,12 @@ var ts;
         return result;
     }
     ts.convertToBase64 = convertToBase64;
+    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
+        return !ts.isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, false);
+    }
+    ts.convertToRelativePath = convertToRelativePath;
     var carriageReturnLineFeed = "\r\n";
     var lineFeed = "\n";
     function getNewLineCharacter(options) {
@@ -5776,27 +5214,19 @@ var ts;
         }
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
-    function arrayStructurallyIsEqualTo(array1, array2) {
-        if (!array1 || !array2) {
-            return false;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        return ts.arrayIsEqualTo(array1.sort(), array2.sort());
-    }
-    ts.arrayStructurallyIsEqualTo = arrayStructurallyIsEqualTo;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(272);
     ts.parseTime = 0;
-    function getNodeConstructor(kind) {
-        return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
-    }
-    ts.getNodeConstructor = getNodeConstructor;
-    function createNode(kind) {
-        return new (getNodeConstructor(kind))();
+    var NodeConstructor;
+    var SourceFileConstructor;
+    function createNode(kind, pos, end) {
+        if (kind === 248) {
+            return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
+        }
+        else {
+            return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
+        }
     }
     ts.createNode = createNode;
     function visitNode(cbNode, node) {
@@ -5811,8 +5241,8 @@ var ts;
     }
     function visitEachNode(cbNode, nodes) {
         if (nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                var node = nodes_1[_i];
                 var result = cbNode(node);
                 if (result) {
                     return result;
@@ -6195,6 +5625,8 @@ var ts;
     (function (Parser) {
         var scanner = ts.createScanner(2, true);
         var disallowInAndDecoratorContext = 1 | 4;
+        var NodeConstructor;
+        var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
         var syntaxCursor;
@@ -6207,13 +5639,16 @@ var ts;
         var contextFlags;
         var parseErrorBeforeNextFinishedNode = false;
         function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor);
+            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
+            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
             var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+            NodeConstructor = ts.objectAllocator.getNodeConstructor();
+            SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
             parseDiagnostics = [];
@@ -6221,12 +5656,12 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = ts.isJavaScript(fileName) ? 32 : 0;
+            contextFlags = isJavaScriptFile ? 32 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 : 0);
+            scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 : 0);
         }
         function clearState() {
             scanner.setText("");
@@ -6239,6 +5674,9 @@ var ts;
         }
         function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
             sourceFile = createSourceFile(fileName, languageVersion);
+            if (contextFlags & 32) {
+                sourceFile.parserContextFlags = 32;
+            }
             token = nextToken();
             processReferenceComments(sourceFile);
             sourceFile.statements = parseList(0, parseStatement);
@@ -6252,7 +5690,7 @@ var ts;
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 addJSDocComments();
             }
             return sourceFile;
@@ -6273,8 +5711,8 @@ var ts;
         function addJSDocComment(node) {
             var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
             if (comments) {
-                for (var _i = 0; _i < comments.length; _i++) {
-                    var comment = comments[_i];
+                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                    var comment = comments_1[_i];
                     var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
                     if (jsDocComment) {
                         node.jsDocComment = jsDocComment;
@@ -6298,15 +5736,14 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion) {
-            var sourceFile = createNode(248, 0);
-            sourceFile.pos = 0;
-            sourceFile.end = sourceText.length;
+            var sourceFile = new SourceFileConstructor(248, 0, sourceText.length);
+            nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 8192 : 0;
-            sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 : 0;
+            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 : 0;
+            sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 : 0;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -6525,13 +5962,10 @@ var ts;
         }
         function createNode(kind, pos) {
             nodeCount++;
-            var node = new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))();
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            node.pos = pos;
-            node.end = pos;
-            return node;
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -6669,7 +6103,7 @@ var ts;
                 case 12:
                     return token === 19 || token === 37 || isLiteralPropertyName();
                 case 9:
-                    return isLiteralPropertyName();
+                    return token === 19 || isLiteralPropertyName();
                 case 7:
                     if (token === 15) {
                         return lookAhead(isValidHeritageClauseObjectLiteral);
@@ -7144,7 +6578,7 @@ var ts;
             if (node.kind === 8
                 && sourceText.charCodeAt(tokenPos) === 48
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 65536;
+                node.flags |= 32768;
             }
             return node;
         }
@@ -7190,9 +6624,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(54)) {
-                return token === 9
-                    ? parseLiteralNode(true)
-                    : parseType();
+                return parseType();
             }
             return undefined;
         }
@@ -7449,6 +6881,8 @@ var ts;
                 case 131:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReferenceOrTypePredicate();
+                case 9:
+                    return parseLiteralNode(true);
                 case 103:
                 case 97:
                     return parseTokenNode();
@@ -7478,6 +6912,7 @@ var ts;
                 case 19:
                 case 25:
                 case 92:
+                case 9:
                     return true;
                 case 17:
                     return lookAhead(isStartOfParenthesizedOrFunctionType);
@@ -7713,7 +7148,7 @@ var ts;
             if (!arrowFunction) {
                 return undefined;
             }
-            var isAsync = !!(arrowFunction.flags & 512);
+            var isAsync = !!(arrowFunction.flags & 256);
             var lastToken = token;
             arrowFunction.equalsGreaterThanToken = parseExpectedToken(34, false, ts.Diagnostics._0_expected, "=>");
             arrowFunction.body = (lastToken === 34 || lastToken === 15)
@@ -7805,7 +7240,7 @@ var ts;
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
             var node = createNode(174);
             setModifiers(node, parseModifiersForArrowFunction());
-            var isAsync = !!(node.flags & 512);
+            var isAsync = !!(node.flags & 256);
             fillSignature(54, false, isAsync, !allowAmbiguity, node);
             if (!node.parameters) {
                 return undefined;
@@ -7991,7 +7426,6 @@ var ts;
             var unaryOperator = token;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38) {
-                var diagnostic;
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 if (simpleUnaryExpression.kind === 171) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
@@ -8084,17 +7518,32 @@ var ts;
         }
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
+            var result;
             if (opening.kind === 235) {
                 var node = createNode(233, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
-                return finishNode(node);
+                result = finishNode(node);
             }
             else {
                 ts.Debug.assert(opening.kind === 234);
-                return opening;
+                result = opening;
             }
+            if (inExpressionContext && token === 25) {
+                var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
+                if (invalidElement) {
+                    parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
+                    var badNode = createNode(181, result.pos);
+                    badNode.end = invalidElement.end;
+                    badNode.left = result;
+                    badNode.right = invalidElement;
+                    badNode.operatorToken = createMissingNode(24, false, undefined);
+                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
+                    return badNode;
+                }
+            }
+            return result;
         }
         function parseJsxText() {
             var node = createNode(236, scanner.getStartPos());
@@ -8404,7 +7853,7 @@ var ts;
             var node = createNode(164);
             parseExpected(19);
             if (scanner.hasPrecedingLineBreak())
-                node.flags |= 2048;
+                node.flags |= 1024;
             node.elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement);
             parseExpected(20);
             return finishNode(node);
@@ -8459,7 +7908,7 @@ var ts;
             var node = createNode(165);
             parseExpected(15);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 2048;
+                node.flags |= 1024;
             }
             node.properties = parseDelimitedList(12, parseObjectLiteralElement, true);
             parseExpected(16);
@@ -8475,7 +7924,7 @@ var ts;
             parseExpected(87);
             node.asteriskToken = parseOptionalToken(37);
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512);
+            var isAsync = !!(node.flags & 256);
             node.name =
                 isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
                     isGenerator ? doInYieldContext(parseOptionalIdentifier) :
@@ -9013,10 +8462,10 @@ var ts;
                 case 102:
                     break;
                 case 108:
-                    node.flags |= 16384;
+                    node.flags |= 8192;
                     break;
                 case 74:
-                    node.flags |= 32768;
+                    node.flags |= 16384;
                     break;
                 default:
                     ts.Debug.fail();
@@ -9050,9 +8499,9 @@ var ts;
             setModifiers(node, modifiers);
             parseExpected(87);
             node.asteriskToken = parseOptionalToken(37);
-            node.name = node.flags & 1024 ? parseOptionalIdentifier() : parseIdentifier();
+            node.name = node.flags & 512 ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512);
+            var isAsync = !!(node.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
@@ -9074,7 +8523,7 @@ var ts;
             method.name = name;
             method.questionToken = questionToken;
             var isGenerator = !!asteriskToken;
-            var isAsync = !!(method.flags & 512);
+            var isAsync = !!(method.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
             return finishNode(method);
@@ -9086,7 +8535,7 @@ var ts;
             property.name = name;
             property.questionToken = questionToken;
             property.type = parseTypeAnnotation();
-            property.initializer = modifiers && modifiers.flags & 128
+            property.initializer = modifiers && modifiers.flags & 64
                 ? allowInAnd(parseNonParameterInitializer)
                 : doOutsideOfContext(2 | 1, parseNonParameterInitializer);
             parseSemicolon();
@@ -9376,13 +8825,13 @@ var ts;
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
             var node = createNode(218, fullStart);
-            var namespaceFlag = flags & 131072;
+            var namespaceFlag = flags & 65536;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 1 | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 2 | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
@@ -9397,7 +8846,7 @@ var ts;
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
             if (parseOptional(126)) {
-                flags |= 131072;
+                flags |= 65536;
             }
             else {
                 parseExpected(125);
@@ -9611,7 +9060,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1
+                return node.flags & 2
                     || node.kind === 221 && node.moduleReference.kind === 232
                     || node.kind === 222
                     || node.kind === 227
@@ -9640,7 +9089,7 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2, undefined);
+                initializeState("file.js", content, 2, true, undefined);
                 var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -9891,7 +9340,7 @@ var ts;
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2, undefined);
+                initializeState("file.js", content, 2, true, undefined);
                 var jsDocComment = parseJSDocComment(undefined, start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -10185,8 +9634,8 @@ var ts;
                 array._children = undefined;
                 array.pos += delta;
                 array.end += delta;
-                for (var _i = 0; _i < array.length; _i++) {
-                    var node = array[_i];
+                for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
+                    var node = array_7[_i];
                     visitNode(node);
                 }
             }
@@ -10258,8 +9707,8 @@ var ts;
                     array.intersectsChange = true;
                     array._children = undefined;
                     adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    for (var _i = 0; _i < array.length; _i++) {
-                        var node = array[_i];
+                    for (var _i = 0, array_8 = array; _i < array_8.length; _i++) {
+                        var node = array_8[_i];
                         visitNode(node);
                     }
                     return;
@@ -10410,6 +9859,1075 @@ var ts;
     })(IncrementalParser || (IncrementalParser = {}));
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    ts.bindTime = 0;
+    function or(state1, state2) {
+        return (state1 | state2) & 2
+            ? 2
+            : (state1 & state2) & 8
+                ? 8
+                : 4;
+    }
+    function getModuleInstanceState(node) {
+        if (node.kind === 215 || node.kind === 216) {
+            return 0;
+        }
+        else if (ts.isConstEnumDeclaration(node)) {
+            return 2;
+        }
+        else if ((node.kind === 222 || node.kind === 221) && !(node.flags & 2)) {
+            return 0;
+        }
+        else if (node.kind === 219) {
+            var state = 0;
+            ts.forEachChild(node, function (n) {
+                switch (getModuleInstanceState(n)) {
+                    case 0:
+                        return false;
+                    case 2:
+                        state = 2;
+                        return false;
+                    case 1:
+                        state = 1;
+                        return true;
+                }
+            });
+            return state;
+        }
+        else if (node.kind === 218) {
+            return getModuleInstanceState(node.body);
+        }
+        else {
+            return 1;
+        }
+    }
+    ts.getModuleInstanceState = getModuleInstanceState;
+    var binder = createBinder();
+    function bindSourceFile(file, options) {
+        var start = new Date().getTime();
+        binder(file, options);
+        ts.bindTime += new Date().getTime() - start;
+    }
+    ts.bindSourceFile = bindSourceFile;
+    function createBinder() {
+        var file;
+        var options;
+        var parent;
+        var container;
+        var blockScopeContainer;
+        var lastContainer;
+        var seenThisKeyword;
+        var hasExplicitReturn;
+        var currentReachabilityState;
+        var labelStack;
+        var labelIndexMap;
+        var implicitLabels;
+        var inStrictMode;
+        var symbolCount = 0;
+        var Symbol;
+        var classifiableNames;
+        function bindSourceFile(f, opts) {
+            file = f;
+            options = opts;
+            inStrictMode = !!file.externalModuleIndicator;
+            classifiableNames = {};
+            Symbol = ts.objectAllocator.getSymbolConstructor();
+            if (!file.locals) {
+                bind(file);
+                file.symbolCount = symbolCount;
+                file.classifiableNames = classifiableNames;
+            }
+            parent = undefined;
+            container = undefined;
+            blockScopeContainer = undefined;
+            lastContainer = undefined;
+            seenThisKeyword = false;
+            hasExplicitReturn = false;
+            labelStack = undefined;
+            labelIndexMap = undefined;
+            implicitLabels = undefined;
+        }
+        return bindSourceFile;
+        function createSymbol(flags, name) {
+            symbolCount++;
+            return new Symbol(flags, name);
+        }
+        function addDeclarationToSymbol(symbol, node, symbolFlags) {
+            symbol.flags |= symbolFlags;
+            node.symbol = symbol;
+            if (!symbol.declarations) {
+                symbol.declarations = [];
+            }
+            symbol.declarations.push(node);
+            if (symbolFlags & 1952 && !symbol.exports) {
+                symbol.exports = {};
+            }
+            if (symbolFlags & 6240 && !symbol.members) {
+                symbol.members = {};
+            }
+            if (symbolFlags & 107455 && !symbol.valueDeclaration) {
+                symbol.valueDeclaration = node;
+            }
+        }
+        function getDeclarationName(node) {
+            if (node.name) {
+                if (node.kind === 218 && node.name.kind === 9) {
+                    return "\"" + node.name.text + "\"";
+                }
+                if (node.name.kind === 136) {
+                    var nameExpression = node.name.expression;
+                    if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
+                        return nameExpression.text;
+                    }
+                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
+                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
+                }
+                return node.name.text;
+            }
+            switch (node.kind) {
+                case 144:
+                    return "__constructor";
+                case 152:
+                case 147:
+                    return "__call";
+                case 153:
+                case 148:
+                    return "__new";
+                case 149:
+                    return "__index";
+                case 228:
+                    return "__export";
+                case 227:
+                    return node.isExportEquals ? "export=" : "default";
+                case 181:
+                    return "export=";
+                case 213:
+                case 214:
+                    return node.flags & 512 ? "default" : undefined;
+            }
+        }
+        function getDisplayName(node) {
+            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
+        }
+        function declareSymbol(symbolTable, parent, node, includes, excludes) {
+            ts.Debug.assert(!ts.hasDynamicName(node));
+            var isDefaultExport = node.flags & 512;
+            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
+            var symbol;
+            if (name !== undefined) {
+                symbol = ts.hasProperty(symbolTable, name)
+                    ? symbolTable[name]
+                    : (symbolTable[name] = createSymbol(0, name));
+                if (name && (includes & 788448)) {
+                    classifiableNames[name] = name;
+                }
+                if (symbol.flags & excludes) {
+                    if (node.name) {
+                        node.name.parent = node;
+                    }
+                    var message = symbol.flags & 2
+                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
+                        : ts.Diagnostics.Duplicate_identifier_0;
+                    ts.forEach(symbol.declarations, function (declaration) {
+                        if (declaration.flags & 512) {
+                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                        }
+                    });
+                    ts.forEach(symbol.declarations, function (declaration) {
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                    });
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    symbol = createSymbol(0, name);
+                }
+            }
+            else {
+                symbol = createSymbol(0, "__missing");
+            }
+            addDeclarationToSymbol(symbol, node, includes);
+            symbol.parent = parent;
+            return symbol;
+        }
+        function declareModuleMember(node, symbolFlags, symbolExcludes) {
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2;
+            if (symbolFlags & 8388608) {
+                if (node.kind === 230 || (node.kind === 221 && hasExportModifier)) {
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                }
+                else {
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+            else {
+                if (hasExportModifier || container.flags & 131072) {
+                    var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
+                        (symbolFlags & 793056 ? 2097152 : 0) |
+                        (symbolFlags & 1536 ? 4194304 : 0);
+                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
+                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                    node.localSymbol = local;
+                    return local;
+                }
+                else {
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+        }
+        function bindChildren(node) {
+            var saveParent = parent;
+            var saveContainer = container;
+            var savedBlockScopeContainer = blockScopeContainer;
+            parent = node;
+            var containerFlags = getContainerFlags(node);
+            if (containerFlags & 1) {
+                container = blockScopeContainer = node;
+                if (containerFlags & 4) {
+                    container.locals = {};
+                }
+                addToContainerChain(container);
+            }
+            else if (containerFlags & 2) {
+                blockScopeContainer = node;
+                blockScopeContainer.locals = undefined;
+            }
+            var savedReachabilityState;
+            var savedLabelStack;
+            var savedLabels;
+            var savedImplicitLabels;
+            var savedHasExplicitReturn;
+            var kind = node.kind;
+            var flags = node.flags;
+            flags &= ~1572864;
+            if (kind === 215) {
+                seenThisKeyword = false;
+            }
+            var saveState = kind === 248 || kind === 219 || ts.isFunctionLikeKind(kind);
+            if (saveState) {
+                savedReachabilityState = currentReachabilityState;
+                savedLabelStack = labelStack;
+                savedLabels = labelIndexMap;
+                savedImplicitLabels = implicitLabels;
+                savedHasExplicitReturn = hasExplicitReturn;
+                currentReachabilityState = 2;
+                hasExplicitReturn = false;
+                labelStack = labelIndexMap = implicitLabels = undefined;
+            }
+            bindReachableStatement(node);
+            if (currentReachabilityState === 2 && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
+                flags |= 524288;
+                if (hasExplicitReturn) {
+                    flags |= 1048576;
+                }
+            }
+            if (kind === 215) {
+                flags = seenThisKeyword ? flags | 262144 : flags & ~262144;
+            }
+            node.flags = flags;
+            if (saveState) {
+                hasExplicitReturn = savedHasExplicitReturn;
+                currentReachabilityState = savedReachabilityState;
+                labelStack = savedLabelStack;
+                labelIndexMap = savedLabels;
+                implicitLabels = savedImplicitLabels;
+            }
+            container = saveContainer;
+            parent = saveParent;
+            blockScopeContainer = savedBlockScopeContainer;
+        }
+        function bindReachableStatement(node) {
+            if (checkUnreachable(node)) {
+                ts.forEachChild(node, bind);
+                return;
+            }
+            switch (node.kind) {
+                case 198:
+                    bindWhileStatement(node);
+                    break;
+                case 197:
+                    bindDoStatement(node);
+                    break;
+                case 199:
+                    bindForStatement(node);
+                    break;
+                case 200:
+                case 201:
+                    bindForInOrForOfStatement(node);
+                    break;
+                case 196:
+                    bindIfStatement(node);
+                    break;
+                case 204:
+                case 208:
+                    bindReturnOrThrow(node);
+                    break;
+                case 203:
+                case 202:
+                    bindBreakOrContinueStatement(node);
+                    break;
+                case 209:
+                    bindTryStatement(node);
+                    break;
+                case 206:
+                    bindSwitchStatement(node);
+                    break;
+                case 220:
+                    bindCaseBlock(node);
+                    break;
+                case 207:
+                    bindLabeledStatement(node);
+                    break;
+                default:
+                    ts.forEachChild(node, bind);
+                    break;
+            }
+        }
+        function bindWhileStatement(n) {
+            var preWhileState = n.expression.kind === 84 ? 4 : currentReachabilityState;
+            var postWhileState = n.expression.kind === 99 ? 4 : currentReachabilityState;
+            bind(n.expression);
+            currentReachabilityState = preWhileState;
+            var postWhileLabel = pushImplicitLabel();
+            bind(n.statement);
+            popImplicitLabel(postWhileLabel, postWhileState);
+        }
+        function bindDoStatement(n) {
+            var preDoState = currentReachabilityState;
+            var postDoLabel = pushImplicitLabel();
+            bind(n.statement);
+            var postDoState = n.expression.kind === 99 ? 4 : preDoState;
+            popImplicitLabel(postDoLabel, postDoState);
+            bind(n.expression);
+        }
+        function bindForStatement(n) {
+            var preForState = currentReachabilityState;
+            var postForLabel = pushImplicitLabel();
+            bind(n.initializer);
+            bind(n.condition);
+            bind(n.incrementor);
+            bind(n.statement);
+            var isInfiniteLoop = (!n.condition || n.condition.kind === 99);
+            var postForState = isInfiniteLoop ? 4 : preForState;
+            popImplicitLabel(postForLabel, postForState);
+        }
+        function bindForInOrForOfStatement(n) {
+            var preStatementState = currentReachabilityState;
+            var postStatementLabel = pushImplicitLabel();
+            bind(n.initializer);
+            bind(n.expression);
+            bind(n.statement);
+            popImplicitLabel(postStatementLabel, preStatementState);
+        }
+        function bindIfStatement(n) {
+            var ifTrueState = n.expression.kind === 84 ? 4 : currentReachabilityState;
+            var ifFalseState = n.expression.kind === 99 ? 4 : currentReachabilityState;
+            currentReachabilityState = ifTrueState;
+            bind(n.expression);
+            bind(n.thenStatement);
+            if (n.elseStatement) {
+                var preElseState = currentReachabilityState;
+                currentReachabilityState = ifFalseState;
+                bind(n.elseStatement);
+                currentReachabilityState = or(currentReachabilityState, preElseState);
+            }
+            else {
+                currentReachabilityState = or(currentReachabilityState, ifFalseState);
+            }
+        }
+        function bindReturnOrThrow(n) {
+            bind(n.expression);
+            if (n.kind === 204) {
+                hasExplicitReturn = true;
+            }
+            currentReachabilityState = 4;
+        }
+        function bindBreakOrContinueStatement(n) {
+            bind(n.label);
+            var isValidJump = jumpToLabel(n.label, n.kind === 203 ? currentReachabilityState : 4);
+            if (isValidJump) {
+                currentReachabilityState = 4;
+            }
+        }
+        function bindTryStatement(n) {
+            var preTryState = currentReachabilityState;
+            bind(n.tryBlock);
+            var postTryState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.catchClause);
+            var postCatchState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.finallyBlock);
+            currentReachabilityState = or(postTryState, postCatchState);
+        }
+        function bindSwitchStatement(n) {
+            var preSwitchState = currentReachabilityState;
+            var postSwitchLabel = pushImplicitLabel();
+            bind(n.expression);
+            bind(n.caseBlock);
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242; });
+            var postSwitchState = hasDefault && currentReachabilityState !== 2 ? 4 : preSwitchState;
+            popImplicitLabel(postSwitchLabel, postSwitchState);
+        }
+        function bindCaseBlock(n) {
+            var startState = currentReachabilityState;
+            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
+                var clause = _a[_i];
+                currentReachabilityState = startState;
+                bind(clause);
+                if (clause.statements.length && currentReachabilityState === 2 && options.noFallthroughCasesInSwitch) {
+                    errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
+                }
+            }
+        }
+        function bindLabeledStatement(n) {
+            bind(n.label);
+            var ok = pushNamedLabel(n.label);
+            bind(n.statement);
+            if (ok) {
+                popNamedLabel(n.label, currentReachabilityState);
+            }
+        }
+        function getContainerFlags(node) {
+            switch (node.kind) {
+                case 186:
+                case 214:
+                case 215:
+                case 217:
+                case 155:
+                case 165:
+                    return 1;
+                case 147:
+                case 148:
+                case 149:
+                case 143:
+                case 142:
+                case 213:
+                case 144:
+                case 145:
+                case 146:
+                case 152:
+                case 153:
+                case 173:
+                case 174:
+                case 218:
+                case 248:
+                case 216:
+                    return 5;
+                case 244:
+                case 199:
+                case 200:
+                case 201:
+                case 220:
+                    return 2;
+                case 192:
+                    return ts.isFunctionLike(node.parent) ? 0 : 2;
+            }
+            return 0;
+        }
+        function addToContainerChain(next) {
+            if (lastContainer) {
+                lastContainer.nextContainer = next;
+            }
+            lastContainer = next;
+        }
+        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
+            declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
+        }
+        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
+            switch (container.kind) {
+                case 218:
+                    return declareModuleMember(node, symbolFlags, symbolExcludes);
+                case 248:
+                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
+                case 186:
+                case 214:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 217:
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                case 155:
+                case 165:
+                case 215:
+                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+                case 152:
+                case 153:
+                case 147:
+                case 148:
+                case 149:
+                case 143:
+                case 142:
+                case 144:
+                case 145:
+                case 146:
+                case 213:
+                case 173:
+                case 174:
+                case 216:
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function declareClassMember(node, symbolFlags, symbolExcludes) {
+            return node.flags & 64
+                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
+                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+        }
+        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
+            return ts.isExternalModule(file)
+                ? declareModuleMember(node, symbolFlags, symbolExcludes)
+                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
+        }
+        function hasExportDeclarations(node) {
+            var body = node.kind === 248 ? node : node.body;
+            if (body.kind === 248 || body.kind === 219) {
+                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
+                    var stat = _a[_i];
+                    if (stat.kind === 228 || stat.kind === 227) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function setExportContextFlag(node) {
+            if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
+                node.flags |= 131072;
+            }
+            else {
+                node.flags &= ~131072;
+            }
+        }
+        function bindModuleDeclaration(node) {
+            setExportContextFlag(node);
+            if (node.name.kind === 9) {
+                declareSymbolAndAddToSymbolTable(node, 512, 106639);
+            }
+            else {
+                var state = getModuleInstanceState(node);
+                if (state === 0) {
+                    declareSymbolAndAddToSymbolTable(node, 1024, 0);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512, 106639);
+                    if (node.symbol.flags & (16 | 32 | 256)) {
+                        node.symbol.constEnumOnlyModule = false;
+                    }
+                    else {
+                        var currentModuleIsConstEnumOnly = state === 2;
+                        if (node.symbol.constEnumOnlyModule === undefined) {
+                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
+                        }
+                        else {
+                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
+                        }
+                    }
+                }
+            }
+        }
+        function bindFunctionOrConstructorType(node) {
+            var symbol = createSymbol(131072, getDeclarationName(node));
+            addDeclarationToSymbol(symbol, node, 131072);
+            var typeLiteralSymbol = createSymbol(2048, "__type");
+            addDeclarationToSymbol(typeLiteralSymbol, node, 2048);
+            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
+            var _a;
+        }
+        function bindObjectLiteralExpression(node) {
+            if (inStrictMode) {
+                var seen = {};
+                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (prop.name.kind !== 69) {
+                        continue;
+                    }
+                    var identifier = prop.name;
+                    var currentKind = prop.kind === 245 || prop.kind === 246 || prop.kind === 143
+                        ? 1
+                        : 2;
+                    var existingKind = seen[identifier.text];
+                    if (!existingKind) {
+                        seen[identifier.text] = currentKind;
+                        continue;
+                    }
+                    if (currentKind === 1 && existingKind === 1) {
+                        var span = ts.getErrorSpanForNode(file, identifier);
+                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
+                    }
+                }
+            }
+            return bindAnonymousDeclaration(node, 4096, "__object");
+        }
+        function bindAnonymousDeclaration(node, symbolFlags, name) {
+            var symbol = createSymbol(symbolFlags, name);
+            addDeclarationToSymbol(symbol, node, symbolFlags);
+        }
+        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
+            switch (blockScopeContainer.kind) {
+                case 218:
+                    declareModuleMember(node, symbolFlags, symbolExcludes);
+                    break;
+                case 248:
+                    if (ts.isExternalModule(container)) {
+                        declareModuleMember(node, symbolFlags, symbolExcludes);
+                        break;
+                    }
+                default:
+                    if (!blockScopeContainer.locals) {
+                        blockScopeContainer.locals = {};
+                        addToContainerChain(blockScopeContainer);
+                    }
+                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function bindBlockScopedVariableDeclaration(node) {
+            bindBlockScopedDeclaration(node, 2, 107455);
+        }
+        function checkStrictModeIdentifier(node) {
+            if (inStrictMode &&
+                node.originalKeywordKind >= 106 &&
+                node.originalKeywordKind <= 114 &&
+                !ts.isIdentifierName(node)) {
+                if (!file.parseDiagnostics.length) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
+                }
+            }
+        }
+        function getStrictModeIdentifierMessage(node) {
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
+        }
+        function checkStrictModeBinaryExpression(node) {
+            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
+                checkStrictModeEvalOrArguments(node, node.left);
+            }
+        }
+        function checkStrictModeCatchClause(node) {
+            if (inStrictMode && node.variableDeclaration) {
+                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
+            }
+        }
+        function checkStrictModeDeleteExpression(node) {
+            if (inStrictMode && node.expression.kind === 69) {
+                var span = ts.getErrorSpanForNode(file, node.expression);
+                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
+            }
+        }
+        function isEvalOrArgumentsIdentifier(node) {
+            return node.kind === 69 &&
+                (node.text === "eval" || node.text === "arguments");
+        }
+        function checkStrictModeEvalOrArguments(contextNode, name) {
+            if (name && name.kind === 69) {
+                var identifier = name;
+                if (isEvalOrArgumentsIdentifier(identifier)) {
+                    var span = ts.getErrorSpanForNode(file, name);
+                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
+                }
+            }
+        }
+        function getStrictModeEvalOrArgumentsMessage(node) {
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
+        }
+        function checkStrictModeFunctionName(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+        }
+        function checkStrictModeNumericLiteral(node) {
+            if (inStrictMode && node.flags & 32768) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
+            }
+        }
+        function checkStrictModePostfixUnaryExpression(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.operand);
+            }
+        }
+        function checkStrictModePrefixUnaryExpression(node) {
+            if (inStrictMode) {
+                if (node.operator === 41 || node.operator === 42) {
+                    checkStrictModeEvalOrArguments(node, node.operand);
+                }
+            }
+        }
+        function checkStrictModeWithStatement(node) {
+            if (inStrictMode) {
+                errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
+            }
+        }
+        function errorOnFirstToken(node, message, arg0, arg1, arg2) {
+            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
+            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
+        }
+        function getDestructuringParameterName(node) {
+            return "__" + ts.indexOf(node.parent.parameters, node);
+        }
+        function bind(node) {
+            if (!node) {
+                return;
+            }
+            node.parent = parent;
+            var savedInStrictMode = inStrictMode;
+            if (!savedInStrictMode) {
+                updateStrictMode(node);
+            }
+            bindWorker(node);
+            bindChildren(node);
+            inStrictMode = savedInStrictMode;
+        }
+        function updateStrictMode(node) {
+            switch (node.kind) {
+                case 248:
+                case 219:
+                    updateStrictModeStatementList(node.statements);
+                    return;
+                case 192:
+                    if (ts.isFunctionLike(node.parent)) {
+                        updateStrictModeStatementList(node.statements);
+                    }
+                    return;
+                case 214:
+                case 186:
+                    inStrictMode = true;
+                    return;
+            }
+        }
+        function updateStrictModeStatementList(statements) {
+            for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) {
+                var statement = statements_1[_i];
+                if (!ts.isPrologueDirective(statement)) {
+                    return;
+                }
+                if (isUseStrictPrologueDirective(statement)) {
+                    inStrictMode = true;
+                    return;
+                }
+            }
+        }
+        function isUseStrictPrologueDirective(node) {
+            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
+            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+        }
+        function bindWorker(node) {
+            switch (node.kind) {
+                case 69:
+                    return checkStrictModeIdentifier(node);
+                case 181:
+                    if (ts.isInJavaScriptFile(node)) {
+                        if (ts.isExportsPropertyAssignment(node)) {
+                            bindExportsPropertyAssignment(node);
+                        }
+                        else if (ts.isModuleExportsAssignment(node)) {
+                            bindModuleExportsAssignment(node);
+                        }
+                    }
+                    return checkStrictModeBinaryExpression(node);
+                case 244:
+                    return checkStrictModeCatchClause(node);
+                case 175:
+                    return checkStrictModeDeleteExpression(node);
+                case 8:
+                    return checkStrictModeNumericLiteral(node);
+                case 180:
+                    return checkStrictModePostfixUnaryExpression(node);
+                case 179:
+                    return checkStrictModePrefixUnaryExpression(node);
+                case 205:
+                    return checkStrictModeWithStatement(node);
+                case 97:
+                    seenThisKeyword = true;
+                    return;
+                case 137:
+                    return declareSymbolAndAddToSymbolTable(node, 262144, 530912);
+                case 138:
+                    return bindParameter(node);
+                case 211:
+                case 163:
+                    return bindVariableDeclarationOrBindingElement(node);
+                case 141:
+                case 140:
+                    return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455);
+                case 245:
+                case 246:
+                    return bindPropertyOrMethodOrAccessor(node, 4, 107455);
+                case 247:
+                    return bindPropertyOrMethodOrAccessor(node, 8, 107455);
+                case 147:
+                case 148:
+                case 149:
+                    return declareSymbolAndAddToSymbolTable(node, 131072, 0);
+                case 143:
+                case 142:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263);
+                case 213:
+                    checkStrictModeFunctionName(node);
+                    return declareSymbolAndAddToSymbolTable(node, 16, 106927);
+                case 144:
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 145:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 146:
+                    return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
+                case 152:
+                case 153:
+                    return bindFunctionOrConstructorType(node);
+                case 155:
+                    return bindAnonymousDeclaration(node, 2048, "__type");
+                case 165:
+                    return bindObjectLiteralExpression(node);
+                case 173:
+                case 174:
+                    checkStrictModeFunctionName(node);
+                    var bindingName = node.name ? node.name.text : "__function";
+                    return bindAnonymousDeclaration(node, 16, bindingName);
+                case 168:
+                    if (ts.isInJavaScriptFile(node)) {
+                        bindCallExpression(node);
+                    }
+                    break;
+                case 186:
+                case 214:
+                    return bindClassLikeDeclaration(node);
+                case 215:
+                    return bindBlockScopedDeclaration(node, 64, 792960);
+                case 216:
+                    return bindBlockScopedDeclaration(node, 524288, 793056);
+                case 217:
+                    return bindEnumDeclaration(node);
+                case 218:
+                    return bindModuleDeclaration(node);
+                case 221:
+                case 224:
+                case 226:
+                case 230:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+                case 223:
+                    return bindImportClause(node);
+                case 228:
+                    return bindExportDeclaration(node);
+                case 227:
+                    return bindExportAssignment(node);
+                case 248:
+                    return bindSourceFileIfExternalModule();
+            }
+        }
+        function bindSourceFileIfExternalModule() {
+            setExportContextFlag(file);
+            if (ts.isExternalModule(file)) {
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindSourceFileAsExternalModule() {
+            bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+        }
+        function bindExportAssignment(node) {
+            var boundExpression = node.kind === 227 ? node.expression : node.right;
+            if (!container.symbol || !container.symbol.exports) {
+                bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
+            }
+            else if (boundExpression.kind === 69) {
+                declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608);
+            }
+            else {
+                declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455 | 8388608);
+            }
+        }
+        function bindExportDeclaration(node) {
+            if (!container.symbol || !container.symbol.exports) {
+                bindAnonymousDeclaration(node, 1073741824, getDeclarationName(node));
+            }
+            else if (!node.exportClause) {
+                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0);
+            }
+        }
+        function bindImportClause(node) {
+            if (node.name) {
+                declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+            }
+        }
+        function setCommonJsModuleIndicator(node) {
+            if (!file.commonJsModuleIndicator) {
+                file.commonJsModuleIndicator = node;
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindExportsPropertyAssignment(node) {
+            setCommonJsModuleIndicator(node);
+            declareSymbol(file.symbol.exports, file.symbol, node.left, 4 | 7340032, 0);
+        }
+        function bindModuleExportsAssignment(node) {
+            setCommonJsModuleIndicator(node);
+            bindExportAssignment(node);
+        }
+        function bindCallExpression(node) {
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+                setCommonJsModuleIndicator(node);
+            }
+        }
+        function bindClassLikeDeclaration(node) {
+            if (node.kind === 214) {
+                bindBlockScopedDeclaration(node, 32, 899519);
+            }
+            else {
+                var bindingName = node.name ? node.name.text : "__class";
+                bindAnonymousDeclaration(node, 32, bindingName);
+                if (node.name) {
+                    classifiableNames[node.name.text] = node.name.text;
+                }
+            }
+            var symbol = node.symbol;
+            var prototypeSymbol = createSymbol(4 | 134217728, "prototype");
+            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
+                if (node.name) {
+                    node.name.parent = node;
+                }
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
+            }
+            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
+            prototypeSymbol.parent = symbol;
+        }
+        function bindEnumDeclaration(node) {
+            return ts.isConst(node)
+                ? bindBlockScopedDeclaration(node, 128, 899967)
+                : bindBlockScopedDeclaration(node, 256, 899327);
+        }
+        function bindVariableDeclarationOrBindingElement(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (!ts.isBindingPattern(node.name)) {
+                if (ts.isBlockOrCatchScoped(node)) {
+                    bindBlockScopedVariableDeclaration(node);
+                }
+                else if (ts.isParameterDeclaration(node)) {
+                    declareSymbolAndAddToSymbolTable(node, 1, 107455);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 1, 107454);
+                }
+            }
+        }
+        function bindParameter(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (ts.isBindingPattern(node.name)) {
+                bindAnonymousDeclaration(node, 1, getDestructuringParameterName(node));
+            }
+            else {
+                declareSymbolAndAddToSymbolTable(node, 1, 107455);
+            }
+            if (node.flags & 56 &&
+                node.parent.kind === 144 &&
+                ts.isClassLike(node.parent.parent)) {
+                var classDeclaration = node.parent.parent;
+                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455);
+            }
+        }
+        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
+            return ts.hasDynamicName(node)
+                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
+                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
+        }
+        function pushNamedLabel(name) {
+            initializeReachabilityStateIfNecessary();
+            if (ts.hasProperty(labelIndexMap, name.text)) {
+                return false;
+            }
+            labelIndexMap[name.text] = labelStack.push(1) - 1;
+            return true;
+        }
+        function pushImplicitLabel() {
+            initializeReachabilityStateIfNecessary();
+            var index = labelStack.push(1) - 1;
+            implicitLabels.push(index);
+            return index;
+        }
+        function popNamedLabel(label, outerState) {
+            var index = labelIndexMap[label.text];
+            ts.Debug.assert(index !== undefined);
+            ts.Debug.assert(labelStack.length == index + 1);
+            labelIndexMap[label.text] = undefined;
+            setCurrentStateAtLabel(labelStack.pop(), outerState, label);
+        }
+        function popImplicitLabel(implicitLabelIndex, outerState) {
+            if (labelStack.length !== implicitLabelIndex + 1) {
+                ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex);
+            }
+            var i = implicitLabels.pop();
+            if (implicitLabelIndex !== i) {
+                ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex);
+            }
+            setCurrentStateAtLabel(labelStack.pop(), outerState, undefined);
+        }
+        function setCurrentStateAtLabel(innerMergedState, outerState, label) {
+            if (innerMergedState === 1) {
+                if (label && !options.allowUnusedLabels) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label));
+                }
+                currentReachabilityState = outerState;
+            }
+            else {
+                currentReachabilityState = or(innerMergedState, outerState);
+            }
+        }
+        function jumpToLabel(label, outerState) {
+            initializeReachabilityStateIfNecessary();
+            var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels);
+            if (index === undefined) {
+                return false;
+            }
+            var stateAtLabel = labelStack[index];
+            labelStack[index] = stateAtLabel === 1 ? outerState : or(stateAtLabel, outerState);
+            return true;
+        }
+        function checkUnreachable(node) {
+            switch (currentReachabilityState) {
+                case 4:
+                    var reportError = (ts.isStatement(node) && node.kind !== 194) ||
+                        node.kind === 214 ||
+                        (node.kind === 218 && shouldReportErrorOnModuleDeclaration(node)) ||
+                        (node.kind === 217 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    if (reportError) {
+                        currentReachabilityState = 8;
+                        var reportUnreachableCode = !options.allowUnreachableCode &&
+                            !ts.isInAmbientContext(node) &&
+                            (node.kind !== 193 ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 24576 ||
+                                ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
+                        if (reportUnreachableCode) {
+                            errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
+                        }
+                    }
+                case 8:
+                    return true;
+                default:
+                    return false;
+            }
+            function shouldReportErrorOnModuleDeclaration(node) {
+                var instanceState = getModuleInstanceState(node);
+                return instanceState === 1 || (instanceState === 2 && options.preserveConstEnums);
+            }
+        }
+        function initializeReachabilityStateIfNecessary() {
+            if (labelIndexMap) {
+                return;
+            }
+            currentReachabilityState = 2;
+            labelIndexMap = {};
+            labelStack = [];
+            implicitLabels = [];
+        }
+    }
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     var nextSymbolId = 1;
     var nextNodeId = 1;
@@ -10469,7 +10987,7 @@ var ts;
             symbolToString: symbolToString,
             getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
             getRootSymbols: getRootSymbols,
-            getContextualType: getContextualType,
+            getContextualType: getApparentTypeOfContextualType,
             getFullyQualifiedName: getFullyQualifiedName,
             getResolvedSignature: getResolvedSignature,
             getConstantValue: getConstantValue,
@@ -10532,6 +11050,7 @@ var ts;
         var getInstantiatedGlobalPromiseLikeType;
         var getGlobalPromiseConstructorLikeType;
         var getGlobalThenableType;
+        var jsxElementClassType;
         var tupleTypes = {};
         var unionTypes = {};
         var intersectionTypes = {};
@@ -10724,7 +11243,7 @@ var ts;
             return ts.getAncestor(node, 248);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 248 && !ts.isExternalModule(node);
+            return node.kind === 248 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -10780,7 +11299,7 @@ var ts;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
                         current.parent.kind === 141 &&
-                        (current.parent.flags & 128) === 0 &&
+                        (current.parent.flags & 64) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -10810,23 +11329,24 @@ var ts;
                 }
                 switch (location.kind) {
                     case 248:
-                        if (!ts.isExternalModule(location))
+                        if (!ts.isExternalOrCommonJsModule(location))
                             break;
                     case 218:
                         var moduleExports = getSymbolOfNode(location).exports;
                         if (location.kind === 248 ||
                             (location.kind === 218 && location.name.kind === 9)) {
+                            if (result = moduleExports["default"]) {
+                                var localSymbol = ts.getLocalSymbolForExportDefault(result);
+                                if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
+                                    break loop;
+                                }
+                                result = undefined;
+                            }
                             if (ts.hasProperty(moduleExports, name) &&
                                 moduleExports[name].flags === 8388608 &&
                                 ts.getDeclarationOfKind(moduleExports[name], 230)) {
                                 break;
                             }
-                            result = moduleExports["default"];
-                            var localSymbol = ts.getLocalSymbolForExportDefault(result);
-                            if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) {
-                                break loop;
-                            }
-                            result = undefined;
                         }
                         if (result = getSymbol(moduleExports, name, meaning & 8914931)) {
                             break loop;
@@ -10839,7 +11359,7 @@ var ts;
                         break;
                     case 141:
                     case 140:
-                        if (ts.isClassLike(location.parent) && !(location.flags & 128)) {
+                        if (ts.isClassLike(location.parent) && !(location.flags & 64)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455)) {
@@ -10852,7 +11372,7 @@ var ts;
                     case 186:
                     case 215:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056)) {
-                            if (lastLocation && lastLocation.flags & 128) {
+                            if (lastLocation && lastLocation.flags & 64) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
                                 return undefined;
                             }
@@ -11184,6 +11704,9 @@ var ts;
             if (moduleName === undefined) {
                 return;
             }
+            if (moduleName.indexOf("!") >= 0) {
+                moduleName = moduleName.substr(0, moduleName.indexOf("!"));
+            }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
                 var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
@@ -11286,8 +11809,8 @@ var ts;
         }
         function findConstructorDeclaration(node) {
             var members = node.members;
-            for (var _i = 0; _i < members.length; _i++) {
-                var member = members[_i];
+            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                var member = members_1[_i];
                 if (member.kind === 144 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
@@ -11354,7 +11877,7 @@ var ts;
                 }
                 switch (location_1.kind) {
                     case 248:
-                        if (!ts.isExternalModule(location_1)) {
+                        if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
                     case 218:
@@ -11481,7 +12004,7 @@ var ts;
         }
         function hasExternalModuleSymbol(declaration) {
             return (declaration.kind === 218 && declaration.name.kind === 9) ||
-                (declaration.kind === 248 && ts.isExternalModule(declaration));
+                (declaration.kind === 248 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -11493,7 +12016,7 @@ var ts;
                 if (!isDeclarationVisible(declaration)) {
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 1) &&
+                        !(anyImportSyntax.flags & 2) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -11623,8 +12146,8 @@ var ts;
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
-                            for (var _i = 0; _i < accessibleSymbolChain.length; _i++) {
-                                var accessibleSymbol = accessibleSymbolChain[_i];
+                            for (var _i = 0, accessibleSymbolChain_1 = accessibleSymbolChain; _i < accessibleSymbolChain_1.length; _i++) {
+                                var accessibleSymbol = accessibleSymbolChain_1[_i];
                                 appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
                             }
                         }
@@ -11679,7 +12202,7 @@ var ts;
                         writeAnonymousType(type, flags);
                     }
                     else if (type.flags & 256) {
-                        writer.writeStringLiteral(type.text);
+                        writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\"");
                     }
                     else {
                         writePunctuation(writer, 15);
@@ -11790,7 +12313,7 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 128; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
@@ -11896,8 +12419,8 @@ var ts;
                         var t = getTypeOfSymbol(p);
                         if (p.flags & (16 | 8192) && !getPropertiesOfObjectType(t).length) {
                             var signatures = getSignaturesOfType(t, 0);
-                            for (var _f = 0; _f < signatures.length; _f++) {
-                                var signature = signatures[_f];
+                            for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
+                                var signature = signatures_1[_f];
                                 buildSymbolDisplay(p, writer);
                                 if (p.flags & 536870912) {
                                     writePunctuation(writer, 53);
@@ -12043,7 +12566,7 @@ var ts;
                         }
                     }
                     else if (node.kind === 248) {
-                        return ts.isExternalModule(node) ? node : undefined;
+                        return ts.isExternalOrCommonJsModule(node) ? node : undefined;
                     }
                 }
                 ts.Debug.fail("getContainingModule cant reach here");
@@ -12100,7 +12623,7 @@ var ts;
                     case 217:
                     case 221:
                         var parent_4 = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
+                        if (!(ts.getCombinedNodeFlags(node) & 2) &&
                             !(node.kind !== 221 && parent_4.kind !== 248 && ts.isInAmbientContext(parent_4))) {
                             return isGlobalSourceFile(parent_4);
                         }
@@ -12111,7 +12634,7 @@ var ts;
                     case 146:
                     case 143:
                     case 142:
-                        if (node.flags & (32 | 64)) {
+                        if (node.flags & (16 | 32)) {
                             return false;
                         }
                     case 144:
@@ -12248,6 +12771,23 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node);
         }
+        function getTextOfPropertyName(name) {
+            switch (name.kind) {
+                case 69:
+                    return name.text;
+                case 9:
+                case 8:
+                    return name.text;
+                case 136:
+                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
+                        return name.expression.text;
+                    }
+            }
+            return undefined;
+        }
+        function isComputedNonLiteralName(name) {
+            return name.kind === 136 && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
             var parentType = getTypeForBindingElementParent(pattern.parent);
@@ -12263,8 +12803,12 @@ var ts;
             var type;
             if (pattern.kind === 161) {
                 var name_10 = declaration.propertyName || declaration.name;
-                type = getTypeOfPropertyOfType(parentType, name_10.text) ||
-                    isNumericLiteralName(name_10.text) && getIndexTypeOfType(parentType, 1) ||
+                if (isComputedNonLiteralName(name_10)) {
+                    return anyType;
+                }
+                var text = getTextOfPropertyName(name_10);
+                type = getTypeOfPropertyOfType(parentType, text) ||
+                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
                     getIndexTypeOfType(parentType, 0);
                 if (!type) {
                     error(name_10, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_10));
@@ -12342,10 +12886,16 @@ var ts;
         }
         function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
             var members = {};
+            var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
-                var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
                 var name = e.propertyName || e.name;
-                var symbol = createSymbol(flags, name.text);
+                if (isComputedNonLiteralName(name)) {
+                    hasComputedProperties = true;
+                    return;
+                }
+                var text = getTextOfPropertyName(name);
+                var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
+                var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType);
                 symbol.bindingElement = e;
                 members[symbol.name] = symbol;
@@ -12354,6 +12904,9 @@ var ts;
             if (includePatternInType) {
                 result.pattern = pattern;
             }
+            if (hasComputedProperties) {
+                result.flags |= 67108864;
+            }
             return result;
         }
         function getTypeFromArrayBindingPattern(pattern, includePatternInType) {
@@ -12404,6 +12957,12 @@ var ts;
                 if (declaration.kind === 227) {
                     return links.type = checkExpression(declaration.expression);
                 }
+                if (declaration.kind === 181) {
+                    return links.type = checkExpression(declaration.right);
+                }
+                if (declaration.kind === 166) {
+                    return checkExpressionCached(declaration.parent.right);
+                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
@@ -12540,8 +13099,8 @@ var ts;
             }
         }
         function appendTypeParameters(typeParameters, declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
+                var declaration = declarations_2[_i];
                 var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
                 if (!typeParameters) {
                     typeParameters = [tp];
@@ -12632,33 +13191,40 @@ var ts;
             }
             return type.resolvedBaseConstructorType;
         }
+        function hasClassBaseType(type) {
+            return !!ts.forEach(getBaseTypes(type), function (t) { return !!(t.symbol.flags & 32); });
+        }
         function getBaseTypes(type) {
+            var isClass = type.symbol.flags & 32;
+            var isInterface = type.symbol.flags & 64;
             if (!type.resolvedBaseTypes) {
-                if (type.symbol.flags & 32) {
+                if (!isClass && !isInterface) {
+                    ts.Debug.fail("type must be class or interface");
+                }
+                if (isClass) {
                     resolveBaseTypesOfClass(type);
                 }
-                else if (type.symbol.flags & 64) {
+                if (isInterface) {
                     resolveBaseTypesOfInterface(type);
                 }
-                else {
-                    ts.Debug.fail("type must be class or interface");
-                }
             }
             return type.resolvedBaseTypes;
         }
         function resolveBaseTypesOfClass(type) {
-            type.resolvedBaseTypes = emptyArray;
-            var baseContructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseContructorType.flags & 80896)) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
+            var baseConstructorType = getBaseConstructorTypeOfClass(type);
+            if (!(baseConstructorType.flags & 80896)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
             var baseType;
-            if (baseContructorType.symbol && baseContructorType.symbol.flags & 32) {
-                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol);
+            var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined;
+            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 &&
+                areAllOuterTypeParametersApplied(originalBaseType)) {
+                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol);
             }
             else {
-                var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments);
+                var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments);
                 if (!constructors.length) {
                     error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
                     return;
@@ -12676,10 +13242,24 @@ var ts;
                 error(type.symbol.valueDeclaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, undefined, 1));
                 return;
             }
-            type.resolvedBaseTypes = [baseType];
+            if (type.resolvedBaseTypes === emptyArray) {
+                type.resolvedBaseTypes = [baseType];
+            }
+            else {
+                type.resolvedBaseTypes.push(baseType);
+            }
+        }
+        function areAllOuterTypeParametersApplied(type) {
+            var outerTypeParameters = type.outerTypeParameters;
+            if (outerTypeParameters) {
+                var last = outerTypeParameters.length - 1;
+                var typeArguments = type.typeArguments;
+                return outerTypeParameters[last].symbol !== typeArguments[last].symbol;
+            }
+            return true;
         }
         function resolveBaseTypesOfInterface(type) {
-            type.resolvedBaseTypes = [];
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215 && ts.getInterfaceBaseTypeNodes(declaration)) {
@@ -12689,7 +13269,12 @@ var ts;
                         if (baseType !== unknownType) {
                             if (getTargetType(baseType).flags & (1024 | 2048)) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
-                                    type.resolvedBaseTypes.push(baseType);
+                                    if (type.resolvedBaseTypes === emptyArray) {
+                                        type.resolvedBaseTypes = [baseType];
+                                    }
+                                    else {
+                                        type.resolvedBaseTypes.push(baseType);
+                                    }
                                 }
                                 else {
                                     error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, undefined, 1));
@@ -12707,13 +13292,13 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215) {
-                    if (declaration.flags & 524288) {
+                    if (declaration.flags & 262144) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
                     if (baseTypeNodes) {
-                        for (var _b = 0; _b < baseTypeNodes.length; _b++) {
-                            var node = baseTypeNodes[_b];
+                        for (var _b = 0, baseTypeNodes_1 = baseTypeNodes; _b < baseTypeNodes_1.length; _b++) {
+                            var node = baseTypeNodes_1[_b];
                             if (ts.isSupportedExpressionWithTypeArguments(node)) {
                                 var baseSymbol = resolveEntityName(node.expression, 793056, true);
                                 if (!baseSymbol || !(baseSymbol.flags & 64) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
@@ -12744,7 +13329,7 @@ var ts;
                     type.typeArguments = type.typeParameters;
                     type.thisType = createType(512 | 33554432);
                     type.thisType.symbol = symbol;
-                    type.thisType.constraint = getTypeWithThisArgument(type);
+                    type.thisType.constraint = type;
                 }
             }
             return links.declaredType;
@@ -12881,23 +13466,23 @@ var ts;
         }
         function createSymbolTable(symbols) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                var symbol = symbols_1[_i];
                 result[symbol.name] = symbol;
             }
             return result;
         }
         function createInstantiatedSymbolTable(symbols, mapper, mappingThisOnly) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                var symbol = symbols_2[_i];
                 result[symbol.name] = mappingThisOnly && isIndependentMember(symbol) ? symbol : instantiateSymbol(symbol, mapper);
             }
             return result;
         }
         function addInheritedMembers(symbols, baseSymbols) {
-            for (var _i = 0; _i < baseSymbols.length; _i++) {
-                var s = baseSymbols[_i];
+            for (var _i = 0, baseSymbols_1 = baseSymbols; _i < baseSymbols_1.length; _i++) {
+                var s = baseSymbols_1[_i];
                 if (!ts.hasProperty(symbols, s.name)) {
                     symbols[s.name] = s;
                 }
@@ -12905,8 +13490,8 @@ var ts;
         }
         function addInheritedSignatures(signatures, baseSignatures) {
             if (baseSignatures) {
-                for (var _i = 0; _i < baseSignatures.length; _i++) {
-                    var signature = baseSignatures[_i];
+                for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
+                    var signature = baseSignatures_1[_i];
                     signatures.push(signature);
                 }
             }
@@ -12949,8 +13534,8 @@ var ts;
                     members = createSymbolTable(source.declaredProperties);
                 }
                 var thisArgument = ts.lastOrUndefined(typeArguments);
-                for (var _i = 0; _i < baseTypes.length; _i++) {
-                    var baseType = baseTypes[_i];
+                for (var _i = 0, baseTypes_1 = baseTypes; _i < baseTypes_1.length; _i++) {
+                    var baseType = baseTypes_1[_i];
                     var instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0));
@@ -12987,7 +13572,7 @@ var ts;
             return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
-            if (!getBaseTypes(classType).length) {
+            if (!hasClassBaseType(classType)) {
                 return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
@@ -12996,8 +13581,8 @@ var ts;
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
-            for (var _i = 0; _i < baseSignatures.length; _i++) {
-                var baseSig = baseSignatures[_i];
+            for (var _i = 0, baseSignatures_2 = baseSignatures; _i < baseSignatures_2.length; _i++) {
+                var baseSig = baseSignatures_2[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
                     var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
@@ -13025,8 +13610,8 @@ var ts;
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
         }
         function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
-            for (var _i = 0; _i < signatureList.length; _i++) {
-                var s = signatureList[_i];
+            for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
+                var s = signatureList_1[_i];
                 if (compareSignatures(s, signature, partialMatch, ignoreReturnTypes, compareTypes)) {
                     return s;
                 }
@@ -13080,8 +13665,8 @@ var ts;
         }
         function getUnionIndexType(types, kind) {
             var indexTypes = [];
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
+                var type = types_1[_i];
                 var indexType = getIndexTypeOfType(type, kind);
                 if (!indexType) {
                     return undefined;
@@ -13219,14 +13804,19 @@ var ts;
             type = getApparentType(type);
             return type.flags & 49152 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
         }
+        function getApparentTypeOfTypeParameter(type) {
+            if (!type.resolvedApparentType) {
+                var constraintType = getConstraintOfTypeParameter(type);
+                while (constraintType && constraintType.flags & 512) {
+                    constraintType = getConstraintOfTypeParameter(constraintType);
+                }
+                type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type);
+            }
+            return type.resolvedApparentType;
+        }
         function getApparentType(type) {
             if (type.flags & 512) {
-                do {
-                    type = getConstraintOfTypeParameter(type);
-                } while (type && type.flags & 512);
-                if (!type) {
-                    type = emptyObjectType;
-                }
+                type = getApparentTypeOfTypeParameter(type);
             }
             if (type.flags & 258) {
                 type = globalStringType;
@@ -13245,12 +13835,12 @@ var ts;
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
+                var current = types_2[_i];
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (32 | 64))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 | 32))) {
                         if (!props) {
                             props = [prop];
                         }
@@ -13271,8 +13861,8 @@ var ts;
             }
             var propTypes = [];
             var declarations = [];
-            for (var _a = 0; _a < props.length; _a++) {
-                var prop = props[_a];
+            for (var _a = 0, props_1 = props; _a < props_1.length; _a++) {
+                var prop = props_1[_a];
                 if (prop.declarations) {
                     ts.addRange(declarations, prop.declarations);
                 }
@@ -13379,7 +13969,7 @@ var ts;
             if (node.initializer) {
                 var signatureDeclaration = node.parent;
                 var signature = getSignatureFromDeclaration(signatureDeclaration);
-                var parameterIndex = signatureDeclaration.parameters.indexOf(node);
+                var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
                 ts.Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
@@ -13388,7 +13978,9 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 144 ? getDeclaredTypeOfClassOrInterface(declaration.parent.symbol) : undefined;
+                var classType = declaration.kind === 144 ?
+                    getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
+                    : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
@@ -13472,6 +14064,16 @@ var ts;
             }
             return result;
         }
+        function resolveExternalModuleTypeByLiteral(name) {
+            var moduleSym = resolveExternalModuleName(name, name);
+            if (moduleSym) {
+                var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                if (resolvedModuleSymbol) {
+                    return getTypeOfSymbol(resolvedModuleSymbol);
+                }
+            }
+            return anyType;
+        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3)) {
@@ -13603,8 +14205,8 @@ var ts;
         }
         function getPropagatingFlagsOfTypes(types) {
             var result = 0;
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
+                var type = types_3[_i];
                 result |= type.flags;
             }
             return result & 14680064;
@@ -13725,8 +14327,8 @@ var ts;
         function getTypeOfGlobalSymbol(symbol, arity) {
             function getTypeDeclaration(symbol) {
                 var declarations = symbol.declarations;
-                for (var _i = 0; _i < declarations.length; _i++) {
-                    var declaration = declarations[_i];
+                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                    var declaration = declarations_3[_i];
                     switch (declaration.kind) {
                         case 214:
                         case 215:
@@ -13824,8 +14426,8 @@ var ts;
             }
         }
         function addTypesToSet(typeSet, types, typeSetKind) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
+                var type = types_4[_i];
                 addTypeToSet(typeSet, type, typeSetKind);
             }
         }
@@ -13847,8 +14449,8 @@ var ts;
             }
         }
         function containsTypeAny(types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var type = types_5[_i];
                 if (isTypeAny(type)) {
                     return true;
                 }
@@ -13933,11 +14535,12 @@ var ts;
             return links.resolvedType;
         }
         function getStringLiteralType(node) {
-            if (ts.hasProperty(stringLiteralTypes, node.text)) {
-                return stringLiteralTypes[node.text];
+            var text = node.text;
+            if (ts.hasProperty(stringLiteralTypes, text)) {
+                return stringLiteralTypes[text];
             }
-            var type = stringLiteralTypes[node.text] = createType(256);
-            type.text = ts.getTextOfNode(node);
+            var type = stringLiteralTypes[text] = createType(256);
+            type.text = text;
             return type;
         }
         function getTypeFromStringLiteral(node) {
@@ -13951,7 +14554,8 @@ var ts;
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
             if (parent && (ts.isClassLike(parent) || parent.kind === 215)) {
-                if (!(container.flags & 128)) {
+                if (!(container.flags & 64) &&
+                    (container.kind !== 144 || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -14016,8 +14620,8 @@ var ts;
         function instantiateList(items, mapper, instantiator) {
             if (items && items.length) {
                 var result = [];
-                for (var _i = 0; _i < items.length; _i++) {
-                    var v = items[_i];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var v = items_1[_i];
                     result.push(instantiator(v, mapper));
                 }
                 return result;
@@ -14056,8 +14660,8 @@ var ts;
                 case 2: return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
-                for (var _i = 0; _i < sources.length; _i++) {
-                    var source = sources[_i];
+                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
+                    var source = sources_1[_i];
                     if (t === source) {
                         return anyType;
                     }
@@ -14352,7 +14956,7 @@ var ts;
                     var apparentType = getApparentType(source);
                     if (apparentType.flags & (80896 | 32768) && target.flags & 80896) {
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                        if (result = objectTypeRelatedTo(apparentType, target, reportStructuralErrors)) {
+                        if (result = objectTypeRelatedTo(apparentType, source, target, reportStructuralErrors)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
@@ -14371,7 +14975,7 @@ var ts;
                             return result;
                         }
                     }
-                    return objectTypeRelatedTo(source, target, false);
+                    return objectTypeRelatedTo(source, source, target, false);
                 }
                 if (source.flags & 512 && target.flags & 512) {
                     return typeParameterIdenticalTo(source, target);
@@ -14393,36 +14997,37 @@ var ts;
                         resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
                         return true;
                     }
-                    return false;
                 }
-                if (type.flags & 49152) {
+                else if (type.flags & 49152) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
                     }
-                    return false;
                 }
-                return true;
+                return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (!isKnownProperty(target, prop.name)) {
-                        if (reportErrors) {
-                            errorNode = prop.valueDeclaration;
-                            reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                if (!(target.flags & 67108864) && someConstituentTypeHasKind(target, 80896)) {
+                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        if (!isKnownProperty(target, prop.name)) {
+                            if (reportErrors) {
+                                errorNode = prop.valueDeclaration;
+                                reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                            }
+                            return true;
                         }
-                        return true;
                     }
                 }
+                return false;
             }
             function eachTypeRelatedToSomeType(source, target) {
                 var result = -1;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
+                    var sourceType = sourceTypes_1[_i];
                     var related = typeRelatedToSomeType(sourceType, target, false);
                     if (!related) {
                         return 0;
@@ -14444,8 +15049,8 @@ var ts;
             function typeRelatedToEachType(source, target, reportErrors) {
                 var result = -1;
                 var targetTypes = target.types;
-                for (var _i = 0; _i < targetTypes.length; _i++) {
-                    var targetType = targetTypes[_i];
+                for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
+                    var targetType = targetTypes_1[_i];
                     var related = isRelatedTo(source, targetType, reportErrors);
                     if (!related) {
                         return 0;
@@ -14467,8 +15072,8 @@ var ts;
             function eachTypeRelatedToType(source, target, reportErrors) {
                 var result = -1;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_2 = sourceTypes; _i < sourceTypes_2.length; _i++) {
+                    var sourceType = sourceTypes_2[_i];
                     var related = isRelatedTo(sourceType, target, reportErrors);
                     if (!related) {
                         return 0;
@@ -14494,9 +15099,6 @@ var ts;
                 return result;
             }
             function typeParameterIdenticalTo(source, target) {
-                if (source.symbol.name !== target.symbol.name) {
-                    return 0;
-                }
                 if (source.constraint === target.constraint) {
                     return -1;
                 }
@@ -14505,11 +15107,11 @@ var ts;
                 }
                 return isIdenticalTo(source.constraint, target.constraint);
             }
-            function objectTypeRelatedTo(source, target, reportErrors) {
+            function objectTypeRelatedTo(apparentSource, originalSource, target, reportErrors) {
                 if (overflow) {
                     return 0;
                 }
-                var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
+                var id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     if (!elaborateErrors || (related === 3)) {
@@ -14533,13 +15135,13 @@ var ts;
                     maybeStack = [];
                     expandingFlags = 0;
                 }
-                sourceStack[depth] = source;
+                sourceStack[depth] = apparentSource;
                 targetStack[depth] = target;
                 maybeStack[depth] = {};
                 maybeStack[depth][id] = 1;
                 depth++;
                 var saveExpandingFlags = expandingFlags;
-                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack, depth))
+                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(apparentSource, sourceStack, depth))
                     expandingFlags |= 1;
                 if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth))
                     expandingFlags |= 2;
@@ -14548,15 +15150,15 @@ var ts;
                     result = 1;
                 }
                 else {
-                    result = propertiesRelatedTo(source, target, reportErrors);
+                    result = propertiesRelatedTo(apparentSource, target, reportErrors);
                     if (result) {
-                        result &= signaturesRelatedTo(source, target, 0, reportErrors);
+                        result &= signaturesRelatedTo(apparentSource, target, 0, reportErrors);
                         if (result) {
-                            result &= signaturesRelatedTo(source, target, 1, reportErrors);
+                            result &= signaturesRelatedTo(apparentSource, target, 1, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, target, reportErrors);
+                                result &= stringIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, target, reportErrors);
+                                    result &= numberIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 }
                             }
                         }
@@ -14581,8 +15183,8 @@ var ts;
                 var result = -1;
                 var properties = getPropertiesOfObjectType(target);
                 var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 524288);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
+                    var targetProp = properties_1[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -14596,20 +15198,20 @@ var ts;
                         else if (!(targetProp.flags & 134217728)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 32 || targetPropFlags & 32) {
+                            if (sourcePropFlags & 16 || targetPropFlags & 16) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 32 && targetPropFlags & 32) {
+                                        if (sourcePropFlags & 16 && targetPropFlags & 16) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 32 ? source : target), typeToString(sourcePropFlags & 32 ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 ? source : target), typeToString(sourcePropFlags & 16 ? target : source));
                                         }
                                     }
                                     return 0;
                                 }
                             }
-                            else if (targetPropFlags & 64) {
+                            else if (targetPropFlags & 32) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32;
                                 var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
                                 var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
@@ -14620,7 +15222,7 @@ var ts;
                                     return 0;
                                 }
                             }
-                            else if (sourcePropFlags & 64) {
+                            else if (sourcePropFlags & 32) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -14655,8 +15257,8 @@ var ts;
                     return 0;
                 }
                 var result = -1;
-                for (var _i = 0; _i < sourceProperties.length; _i++) {
-                    var sourceProp = sourceProperties[_i];
+                for (var _i = 0, sourceProperties_1 = sourceProperties; _i < sourceProperties_1.length; _i++) {
+                    var sourceProp = sourceProperties_1[_i];
                     var targetProp = getPropertyOfObjectType(target, sourceProp.name);
                     if (!targetProp) {
                         return 0;
@@ -14688,13 +15290,13 @@ var ts;
                         return result;
                     }
                 }
-                outer: for (var _i = 0; _i < targetSignatures.length; _i++) {
-                    var t = targetSignatures[_i];
+                outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
+                    var t = targetSignatures_1[_i];
                     if (!t.hasStringLiterals || target.flags & 262144) {
                         var localErrors = reportErrors;
                         var checkedAbstractAssignability = false;
-                        for (var _a = 0; _a < sourceSignatures.length; _a++) {
-                            var s = sourceSignatures[_a];
+                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                            var s = sourceSignatures_1[_a];
                             if (!s.hasStringLiterals || source.flags & 262144) {
                                 var related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
@@ -14722,8 +15324,8 @@ var ts;
                         var targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
                         var sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol);
                         var targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol);
-                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 256;
-                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 256;
+                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 128;
+                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 128;
                         if (sourceIsAbstract && !(targetIsAbstract && targetDecl)) {
                             if (reportErrors) {
                                 reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
@@ -14829,12 +15431,15 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, target, reportErrors) {
+            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(0, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 0);
-                if (targetType && !(targetType.flags & 1)) {
+                if (targetType) {
+                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
+                        return -1;
+                    }
                     var sourceType = getIndexTypeOfType(source, 0);
                     if (!sourceType) {
                         if (reportErrors) {
@@ -14853,12 +15458,15 @@ var ts;
                 }
                 return -1;
             }
-            function numberIndexTypesRelatedTo(source, target, reportErrors) {
+            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(1, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 1);
-                if (targetType && !(targetType.flags & 1)) {
+                if (targetType) {
+                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
+                        return -1;
+                    }
                     var sourceStringType = getIndexTypeOfType(source, 0);
                     var sourceNumberType = getIndexTypeOfType(source, 1);
                     if (!(sourceStringType || sourceNumberType)) {
@@ -14918,8 +15526,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (32 | 64);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (32 | 64);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 | 32);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 | 32);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0;
             }
@@ -14935,18 +15543,24 @@ var ts;
             }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
+        function isMatchingSignature(source, target, partialMatch) {
+            if (source.parameters.length === target.parameters.length &&
+                source.minArgumentCount === target.minArgumentCount &&
+                source.hasRestParameter === target.hasRestParameter) {
+                return true;
+            }
+            if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter ||
+                source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) {
+                return true;
+            }
+            return false;
+        }
         function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
             if (source === target) {
                 return -1;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
-                if (!partialMatch ||
-                    source.parameters.length < target.parameters.length && !source.hasRestParameter ||
-                    source.minArgumentCount > target.minArgumentCount) {
-                    return 0;
-                }
+            if (!(isMatchingSignature(source, target, partialMatch))) {
+                return 0;
             }
             var result = -1;
             if (source.typeParameters && target.typeParameters) {
@@ -14966,11 +15580,10 @@ var ts;
             }
             source = getErasedSignature(source);
             target = getErasedSignature(target);
-            var sourceLen = source.parameters.length;
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = source.hasRestParameter && i === sourceLen - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = target.hasRestParameter && i === targetLen - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0;
@@ -14982,9 +15595,12 @@ var ts;
             }
             return result;
         }
+        function isRestParameterIndex(signature, parameterIndex) {
+            return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
+        }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var type = types_6[_i];
                 if (candidate !== type && !isTypeSubtypeOf(type, candidate))
                     return false;
             }
@@ -15029,6 +15645,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isStringLiteralType(type) {
+            return type.flags & 256;
+        }
         function isTupleType(type) {
             return !!(type.flags & 8192);
         }
@@ -15197,8 +15816,8 @@ var ts;
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
-            for (var _i = 0; _i < typeParameters.length; _i++) {
-                var unused = typeParameters[_i];
+            for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                var unused = typeParameters_1[_i];
                 inferences.push({
                     primary: undefined, secondary: undefined, isFixed: false
                 });
@@ -15264,8 +15883,8 @@ var ts;
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter;
-                    for (var _i = 0; _i < targetTypes.length; _i++) {
-                        var t = targetTypes[_i];
+                    for (var _i = 0, targetTypes_2 = targetTypes; _i < targetTypes_2.length; _i++) {
+                        var t = targetTypes_2[_i];
                         if (t.flags & 512 && ts.contains(context.typeParameters, t)) {
                             typeParameter = t;
                             typeParameterCount++;
@@ -15282,8 +15901,8 @@ var ts;
                 }
                 else if (source.flags & 49152) {
                     var sourceTypes = source.types;
-                    for (var _a = 0; _a < sourceTypes.length; _a++) {
-                        var sourceType = sourceTypes[_a];
+                    for (var _a = 0, sourceTypes_3 = sourceTypes; _a < sourceTypes_3.length; _a++) {
+                        var sourceType = sourceTypes_3[_a];
                         inferFromTypes(sourceType, target);
                     }
                 }
@@ -15316,8 +15935,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                    var targetProp = properties_2[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -15620,7 +16239,7 @@ var ts;
                 }
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
-                if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) {
                     return type;
                 }
                 var rightType = checkExpression(expr.right);
@@ -15648,6 +16267,12 @@ var ts;
                     }
                 }
                 if (targetType) {
+                    if (!assumeTrue) {
+                        if (type.flags & 16384) {
+                            return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); }));
+                        }
+                        return type;
+                    }
                     return getNarrowedType(type, targetType);
                 }
                 return type;
@@ -15746,24 +16371,30 @@ var ts;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
             if (languageVersion >= 2 ||
-                (symbol.flags & 2) === 0 ||
+                (symbol.flags & (2 | 32)) === 0 ||
                 symbol.valueDeclaration.parent.kind === 244) {
                 return;
             }
-            var container = symbol.valueDeclaration;
-            while (container.kind !== 212) {
-                container = container.parent;
+            var container;
+            if (symbol.flags & 32) {
+                container = getClassLikeDeclarationOfSymbol(symbol).parent;
             }
-            container = container.parent;
-            if (container.kind === 193) {
+            else {
+                container = symbol.valueDeclaration;
+                while (container.kind !== 212) {
+                    container = container.parent;
+                }
                 container = container.parent;
+                if (container.kind === 193) {
+                    container = container.parent;
+                }
             }
             var inFunction = isInsideFunction(node.parent, container);
             var current = container;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
-                if (isIterationStatement(current, false)) {
+                if (ts.isIterationStatement(current, false)) {
                     if (inFunction) {
-                        grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node));
+                        getNodeLinks(current).flags |= 65536;
                     }
                     getNodeLinks(symbol.valueDeclaration).flags |= 16384;
                     break;
@@ -15802,7 +16433,7 @@ var ts;
                     break;
                 case 141:
                 case 140:
-                    if (container.flags & 128) {
+                    if (container.flags & 64) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
@@ -15815,7 +16446,7 @@ var ts;
             }
             if (ts.isClassLike(container.parent)) {
                 var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 128 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return container.flags & 64 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
             }
             return anyType;
         }
@@ -15843,7 +16474,7 @@ var ts;
             var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
             var nodeCheckFlag = 0;
             if (canUseSuperExpression) {
-                if ((container.flags & 128) || isCallExpression) {
+                if ((container.flags & 64) || isCallExpression) {
                     nodeCheckFlag = 512;
                 }
                 else {
@@ -15888,7 +16519,7 @@ var ts;
                 }
                 else {
                     if (container && ts.isClassLike(container.parent)) {
-                        if (container.flags & 128) {
+                        if (container.flags & 64) {
                             return container.kind === 143 ||
                                 container.kind === 142 ||
                                 container.kind === 145 ||
@@ -15920,8 +16551,9 @@ var ts;
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (funcHasRestParameters &&
+                            indexOfParameter === (func.parameters.length - 1) &&
+                            isRestParameterIndex(contextualSignature, func.parameters.length - 1)) {
                             return getTypeOfSymbol(ts.lastOrUndefined(contextualSignature.parameters));
                         }
                     }
@@ -16026,8 +16658,8 @@ var ts;
             var types = type.types;
             var mappedType;
             var mappedTypes;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
+                var current = types_7[_i];
                 var t = mapper(current);
                 if (t) {
                     if (!mappedType) {
@@ -16052,6 +16684,9 @@ var ts;
         function getIndexTypeOfContextualType(type, kind) {
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
+        function contextualTypeIsStringLiteralType(type) {
+            return !!(type.flags & 16384 ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type));
+        }
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
@@ -16067,7 +16702,7 @@ var ts;
         }
         function getContextualTypeForObjectLiteralElement(element) {
             var objectLiteral = element.parent;
-            var type = getContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral);
             if (type) {
                 if (!ts.hasDynamicName(element)) {
                     var symbolName = getSymbolOfNode(element).name;
@@ -16083,7 +16718,7 @@ var ts;
         }
         function getContextualTypeForElementExpression(node) {
             var arrayLiteral = node.parent;
-            var type = getContextualType(arrayLiteral);
+            var type = getApparentTypeOfContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
                 return getTypeOfPropertyOfContextualType(type, "" + index)
@@ -16112,11 +16747,11 @@ var ts;
             }
             return undefined;
         }
-        function getContextualType(node) {
-            var type = getContextualTypeWorker(node);
+        function getApparentTypeOfContextualType(node) {
+            var type = getContextualType(node);
             return type && getApparentType(type);
         }
-        function getContextualTypeWorker(node) {
+        function getContextualType(node) {
             if (isInsideWithStatementBody(node)) {
                 return undefined;
             }
@@ -16182,7 +16817,7 @@ var ts;
             ts.Debug.assert(node.kind !== 143 || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+                : getApparentTypeOfContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -16191,8 +16826,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                var current = types_8[_i];
                 var signature = getNonGenericSignature(current);
                 if (signature) {
                     if (!signatureList) {
@@ -16243,8 +16878,8 @@ var ts;
             var hasSpreadElement = false;
             var elementTypes = [];
             var inDestructuringPattern = isAssignmentTarget(node);
-            for (var _i = 0; _i < elements.length; _i++) {
-                var e = elements[_i];
+            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                var e = elements_1[_i];
                 if (inDestructuringPattern && e.kind === 185) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
@@ -16265,7 +16900,7 @@ var ts;
                     type.pattern = node;
                     return type;
                 }
-                var contextualType = getContextualType(node);
+                var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
                     if (pattern && (pattern.kind === 162 || pattern.kind === 164)) {
@@ -16320,10 +16955,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = {};
             var propertiesArray = [];
-            var contextualType = getContextualType(node);
+            var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === 161 || contextualType.pattern.kind === 165);
             var typeFlags = 0;
+            var patternWithComputedProperties = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
@@ -16349,8 +16985,11 @@ var ts;
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
+                        if (ts.hasDynamicName(memberDecl)) {
+                            patternWithComputedProperties = true;
+                        }
                     }
-                    else if (contextualTypeHasPattern) {
+                    else if (contextualTypeHasPattern && !(contextualType.flags & 67108864)) {
                         var impliedProp = getPropertyOfType(contextualType, member.name);
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & 536870912;
@@ -16393,7 +17032,7 @@ var ts;
             var numberIndexType = getIndexType(1);
             var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
-            result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064);
+            result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064) | (patternWithComputedProperties ? 67108864 : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
@@ -16451,8 +17090,6 @@ var ts;
                     case 234:
                         checkJsxSelfClosingElement(child);
                         break;
-                    default:
-                        ts.Debug.assert(child.kind === 236);
                 }
             }
             return jsxElementType || anyType;
@@ -16505,8 +17142,8 @@ var ts;
         function checkJsxSpreadAttribute(node, elementAttributesType, nameTable) {
             var type = checkExpression(node.expression);
             var props = getPropertiesOfType(type);
-            for (var _i = 0; _i < props.length; _i++) {
-                var prop = props[_i];
+            for (var _i = 0, props_2 = props; _i < props_2.length; _i++) {
+                var prop = props_2[_i];
                 if (!nameTable[prop.name]) {
                     var targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
                     if (targetPropSym) {
@@ -16675,7 +17312,6 @@ var ts;
             var prop = getPropertyOfType(attributesType, attrib.name.text);
             return prop || unknownSymbol;
         }
-        var jsxElementClassType = undefined;
         function getJsxGlobalElementClassType() {
             if (!jsxElementClassType) {
                 jsxElementClassType = getExportedTypeFromNamespace(JsxNames.JSX, JsxNames.ElementClass);
@@ -16742,7 +17378,7 @@ var ts;
             return s.valueDeclaration ? s.valueDeclaration.kind : 141;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 16 | 128 : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 8 | 64 : 0;
         }
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationFlagsFromSymbol(prop);
@@ -16755,17 +17391,17 @@ var ts;
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
-                if (flags & 256) {
+                if (flags & 128) {
                     error(errorNode, ts.Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(declaringClass));
                     return false;
                 }
             }
-            if (!(flags & (32 | 64))) {
+            if (!(flags & (16 | 32))) {
                 return true;
             }
             var enclosingClassDeclaration = ts.getContainingClass(node);
             var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            if (flags & 32) {
+            if (flags & 16) {
                 if (declaringClass !== enclosingClass) {
                     error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
@@ -16779,7 +17415,7 @@ var ts;
                 error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 return false;
             }
-            if (flags & 128) {
+            if (flags & 64) {
                 return true;
             }
             if (type.flags & 33554432) {
@@ -16959,8 +17595,8 @@ var ts;
             var specializedIndex = -1;
             var spliceIndex;
             ts.Debug.assert(!result.length);
-            for (var _i = 0; _i < signatures.length; _i++) {
-                var signature = signatures[_i];
+            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
+                var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
                 var parent_5 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
@@ -17041,7 +17677,7 @@ var ts;
                 return false;
             }
             if (spreadArgIndex >= 0) {
-                return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
+                return isRestParameterIndex(signature, spreadArgIndex);
             }
             if (!signature.hasRestParameter && adjustedArgCount > signature.parameters.length) {
                 return false;
@@ -17187,83 +17823,83 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            switch (node.kind) {
-                case 214:
-                case 186:
+            if (node.kind === 214) {
+                var classSymbol = getSymbolOfNode(node);
+                return getTypeOfSymbol(classSymbol);
+            }
+            if (node.kind === 138) {
+                node = node.parent;
+                if (node.kind === 144) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
-                case 138:
-                    node = node.parent;
-                    if (node.kind === 144) {
-                        var classSymbol_1 = getSymbolOfNode(node);
-                        return getTypeOfSymbol(classSymbol_1);
-                    }
-                case 141:
-                case 143:
-                case 145:
-                case 146:
-                    return getParentTypeOfClassElement(node);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+                }
             }
+            if (node.kind === 141 ||
+                node.kind === 143 ||
+                node.kind === 145 ||
+                node.kind === 146) {
+                return getParentTypeOfClassElement(node);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            switch (node.kind) {
-                case 214:
-                    ts.Debug.fail("Class decorators should not have a second synthetic argument.");
-                    return unknownType;
-                case 138:
-                    node = node.parent;
-                    if (node.kind === 144) {
-                        return anyType;
-                    }
-                case 141:
-                case 143:
-                case 145:
-                case 146:
-                    var element = node;
-                    switch (element.name.kind) {
-                        case 69:
-                        case 8:
-                        case 9:
-                            return getStringLiteralType(element.name);
-                        case 136:
-                            var nameType = checkComputedPropertyName(element.name);
-                            if (allConstituentTypesHaveKind(nameType, 16777216)) {
-                                return nameType;
-                            }
-                            else {
-                                return stringType;
-                            }
-                        default:
-                            ts.Debug.fail("Unsupported property name.");
-                            return unknownType;
-                    }
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214) {
+                ts.Debug.fail("Class decorators should not have a second synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138) {
+                node = node.parent;
+                if (node.kind === 144) {
+                    return anyType;
+                }
+            }
+            if (node.kind === 141 ||
+                node.kind === 143 ||
+                node.kind === 145 ||
+                node.kind === 146) {
+                var element = node;
+                switch (element.name.kind) {
+                    case 69:
+                    case 8:
+                    case 9:
+                        return getStringLiteralType(element.name);
+                    case 136:
+                        var nameType = checkComputedPropertyName(element.name);
+                        if (allConstituentTypesHaveKind(nameType, 16777216)) {
+                            return nameType;
+                        }
+                        else {
+                            return stringType;
+                        }
+                    default:
+                        ts.Debug.fail("Unsupported property name.");
+                        return unknownType;
+                }
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            switch (node.kind) {
-                case 214:
-                    ts.Debug.fail("Class decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 138:
-                    return numberType;
-                case 141:
-                    ts.Debug.fail("Property decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 143:
-                case 145:
-                case 146:
-                    var propertyType = getTypeOfNode(node);
-                    return createTypedPropertyDescriptorType(propertyType);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214) {
+                ts.Debug.fail("Class decorators should not have a third synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138) {
+                return numberType;
+            }
+            if (node.kind === 141) {
+                ts.Debug.fail("Property decorators should not have a third synthetic argument.");
+                return unknownType;
+            }
+            if (node.kind === 143 ||
+                node.kind === 145 ||
+                node.kind === 146) {
+                var propertyType = getTypeOfNode(node);
+                return createTypedPropertyDescriptorType(propertyType);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         function getEffectiveDecoratorArgumentType(node, argIndex) {
             if (argIndex === 0) {
@@ -17371,8 +18007,8 @@ var ts;
                 reportError(ts.Diagnostics.Supplied_parameters_do_not_match_any_signature_of_call_target);
             }
             if (!produceDiagnostics) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var candidate = candidates[_i];
+                for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+                    var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
                             candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
@@ -17391,8 +18027,8 @@ var ts;
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
             }
             function chooseOverload(candidates, relation) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var originalCandidate = candidates[_i];
+                for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
+                    var originalCandidate = candidates_2[_i];
                     if (!hasCorrectArity(node, args, originalCandidate)) {
                         continue;
                     }
@@ -17495,7 +18131,7 @@ var ts;
                 return resolveErrorCall(node);
             }
             var valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
-            if (valueDecl && valueDecl.flags & 256) {
+            if (valueDecl && valueDecl.flags & 128) {
                 error(node, ts.Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, ts.declarationNameToString(valueDecl.name));
                 return resolveErrorCall(node);
             }
@@ -17611,6 +18247,9 @@ var ts;
                     return anyType;
                 }
             }
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+                return resolveExternalModuleTypeByLiteral(node.arguments[0]);
+            }
             return getReturnTypeOfSignature(signature);
         }
         function checkTaggedTemplateExpression(node) {
@@ -17621,7 +18260,9 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                if (!(isTypeAssignableTo(targetType, widenedType))) {
+                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258) &&
+                    someConstituentTypeHasKind(widenedType, 258);
+                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
                     checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
                 }
             }
@@ -17639,7 +18280,7 @@ var ts;
                 var contextualParameterType = getTypeAtPosition(context, i);
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
             }
-            if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
+            if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
                 var parameter = ts.lastOrUndefined(signature.parameters);
                 var contextualParameterType = getTypeOfSymbol(ts.lastOrUndefined(context.parameters));
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
@@ -17650,7 +18291,9 @@ var ts;
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
                     if (element.kind !== 187) {
-                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        if (element.name.kind === 69) {
+                            getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        }
                         assignBindingElementTypes(element);
                     }
                 }
@@ -17779,32 +18422,24 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function bodyContainsAReturnStatement(funcBody) {
-            return ts.forEachReturnStatement(funcBody, function (returnStatement) {
-                return true;
-            });
-        }
-        function bodyContainsSingleThrowStatement(body) {
-            return (body.statements.length === 1) && (body.statements[0].kind === 208);
-        }
-        function checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(func, returnType) {
+        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
             if (!produceDiagnostics) {
                 return;
             }
             if (returnType === voidType || isTypeAny(returnType)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192 || !(func.flags & 524288)) {
                 return;
             }
-            var bodyBlock = func.body;
-            if (bodyContainsAReturnStatement(bodyBlock)) {
-                return;
+            if (func.flags & 1048576) {
+                if (compilerOptions.noImplicitReturns) {
+                    error(func.type, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
-            if (bodyContainsSingleThrowStatement(bodyBlock)) {
-                return;
+            else {
+                error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement);
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
             ts.Debug.assert(node.kind !== 143 || ts.isObjectLiteralMethod(node));
@@ -17863,7 +18498,7 @@ var ts;
                 promisedType = checkAsyncFunctionReturnType(node);
             }
             if (returnType && !node.asteriskToken) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (node.body) {
                 if (!node.type) {
@@ -17922,7 +18557,7 @@ var ts;
                     case 69:
                     case 166: {
                         var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 32768) !== 0;
+                        return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384) !== 0;
                     }
                     case 167: {
                         var index = n.argumentExpression;
@@ -17930,7 +18565,7 @@ var ts;
                         if (symbol && index && index.kind === 9) {
                             var name_12 = index.text;
                             var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 32768) !== 0;
+                            return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384) !== 0;
                         }
                         return false;
                     }
@@ -18010,8 +18645,8 @@ var ts;
             }
             if (type.flags & 49152) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                    var current = types_9[_i];
                     if (current.flags & kind) {
                         return true;
                     }
@@ -18026,8 +18661,8 @@ var ts;
             }
             if (type.flags & 49152) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                    var current = types_10[_i];
                     if (!(current.flags & kind)) {
                         return false;
                     }
@@ -18062,21 +18697,28 @@ var ts;
         }
         function checkObjectLiteralAssignment(node, sourceType, contextualMapper) {
             var properties = node.properties;
-            for (var _i = 0; _i < properties.length; _i++) {
-                var p = properties[_i];
+            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                var p = properties_3[_i];
                 if (p.kind === 245 || p.kind === 246) {
                     var name_13 = p.name;
+                    if (name_13.kind === 136) {
+                        checkComputedPropertyName(name_13);
+                    }
+                    if (isComputedNonLiteralName(name_13)) {
+                        continue;
+                    }
+                    var text = getTextOfPropertyName(name_13);
                     var type = isTypeAny(sourceType)
                         ? sourceType
-                        : getTypeOfPropertyOfType(sourceType, name_13.text) ||
-                            isNumericLiteralName(name_13.text) && getIndexTypeOfType(sourceType, 1) ||
+                        : getTypeOfPropertyOfType(sourceType, text) ||
+                            isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1) ||
                             getIndexTypeOfType(sourceType, 0);
                     if (type) {
                         if (p.kind === 246) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
-                            checkDestructuringAssignment(p.initializer || name_13, type);
+                            checkDestructuringAssignment(p.initializer, type);
                         }
                     }
                     else {
@@ -18254,6 +18896,9 @@ var ts;
                 case 31:
                 case 32:
                 case 33:
+                    if (someConstituentTypeHasKind(leftType, 258) && someConstituentTypeHasKind(rightType, 258)) {
+                        return booleanType;
+                    }
                     if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -18361,6 +19006,13 @@ var ts;
             var type2 = checkExpression(node.whenFalse, contextualMapper);
             return getUnionType([type1, type2]);
         }
+        function checkStringLiteralExpression(node) {
+            var contextualType = getContextualType(node);
+            if (contextualType && contextualTypeIsStringLiteralType(contextualType)) {
+                return getStringLiteralType(node);
+            }
+            return stringType;
+        }
         function checkTemplateExpression(node) {
             ts.forEach(node.templateSpans, function (templateSpan) {
                 checkExpression(templateSpan.expression);
@@ -18399,7 +19051,7 @@ var ts;
             if (isInferentialContext(contextualMapper)) {
                 var signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
-                    var contextualType = getContextualType(node);
+                    var contextualType = getApparentTypeOfContextualType(node);
                     if (contextualType) {
                         var contextualSignature = getSingleCallSignature(contextualType);
                         if (contextualSignature && !contextualSignature.typeParameters) {
@@ -18451,6 +19103,7 @@ var ts;
                 case 183:
                     return checkTemplateExpression(node);
                 case 9:
+                    return checkStringLiteralExpression(node);
                 case 11:
                     return stringType;
                 case 10:
@@ -18525,7 +19178,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 112) {
+            if (node.flags & 56) {
                 func = ts.getContainingFunction(node);
                 if (!(func.kind === 144 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
@@ -18706,7 +19359,7 @@ var ts;
         function checkMethodDeclaration(node) {
             checkGrammarMethod(node) || checkGrammarComputedPropertyName(node.name);
             checkFunctionLikeDeclaration(node);
-            if (node.flags & 256 && node.body) {
+            if (node.flags & 128 && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -18753,7 +19406,7 @@ var ts;
             }
             function isInstancePropertyWithInitializer(n) {
                 return n.kind === 141 &&
-                    !(n.flags & 128) &&
+                    !(n.flags & 64) &&
                     !!n.initializer;
             }
             var containingClassDecl = node.parent;
@@ -18766,12 +19419,12 @@ var ts;
                         error(node, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (8 | 16 | 32); });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         var superCallStatement;
-                        for (var _i = 0; _i < statements.length; _i++) {
-                            var statement = statements[_i];
+                        for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
+                            var statement = statements_2[_i];
                             if (statement.kind === 195 && isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
@@ -18797,15 +19450,22 @@ var ts;
             if (produceDiagnostics) {
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 if (node.kind === 145) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && !(bodyContainsAReturnStatement(node.body) || bodyContainsSingleThrowStatement(node.body))) {
-                        error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement);
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288)) {
+                        if (node.flags & 1048576) {
+                            if (compilerOptions.noImplicitReturns) {
+                                error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                            }
+                        }
+                        else {
+                            error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
+                        }
                     }
                 }
                 if (!ts.hasDynamicName(node)) {
                     var otherKind = node.kind === 145 ? 146 : 145;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 112) !== (otherAccessor.flags & 112))) {
+                        if (((node.flags & 56) !== (otherAccessor.flags & 56))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
                         var currentAccessorType = getAnnotatedAccessorType(node);
@@ -18872,7 +19532,7 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 32) && ts.isInAmbientContext(node);
+            return (node.flags & 16) && ts.isInAmbientContext(node);
         }
         function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
             if (!produceDiagnostics) {
@@ -18897,8 +19557,8 @@ var ts;
             else {
                 signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
             }
-            for (var _i = 0; _i < signaturesToCheck.length; _i++) {
-                var otherSignature = signaturesToCheck[_i];
+            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
+                var otherSignature = signaturesToCheck_1[_i];
                 if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) {
                     return;
                 }
@@ -18907,11 +19567,14 @@ var ts;
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
-            if (n.parent.kind !== 215 && ts.isInAmbientContext(n)) {
-                if (!(flags & 2)) {
-                    flags |= 1;
+            if (n.parent.kind !== 215 &&
+                n.parent.kind !== 214 &&
+                n.parent.kind !== 186 &&
+                ts.isInAmbientContext(n)) {
+                if (!(flags & 4)) {
+                    flags |= 2;
                 }
-                flags |= 2;
+                flags |= 4;
             }
             return flags & flagsToCheck;
         }
@@ -18929,16 +19592,16 @@ var ts;
                     var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
                         var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 1) {
+                        if (deviation & 2) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
                         }
-                        else if (deviation & 2) {
+                        else if (deviation & 4) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (32 | 64)) {
+                        else if (deviation & (16 | 32)) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
-                        else if (deviation & 256) {
+                        else if (deviation & 128) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
                         }
                     });
@@ -18955,7 +19618,7 @@ var ts;
                     });
                 }
             }
-            var flagsToCheck = 1 | 2 | 32 | 64 | 256;
+            var flagsToCheck = 2 | 4 | 16 | 32 | 128;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -18984,8 +19647,8 @@ var ts;
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
                             ts.Debug.assert(node.kind === 143 || node.kind === 142);
-                            ts.Debug.assert((node.flags & 128) !== (subsequentNode.flags & 128));
-                            var diagnostic = node.flags & 128 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                            ts.Debug.assert((node.flags & 64) !== (subsequentNode.flags & 64));
+                            var diagnostic = node.flags & 64 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                             error(errorNode_1, diagnostic);
                             return;
                         }
@@ -19000,7 +19663,7 @@ var ts;
                     error(errorNode, ts.Diagnostics.Constructor_implementation_is_missing);
                 }
                 else {
-                    if (node.flags & 256) {
+                    if (node.flags & 128) {
                         error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
                     }
                     else {
@@ -19011,8 +19674,8 @@ var ts;
             var isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & 1536;
             var duplicateFunctionDeclaration = false;
             var multipleConstructorImplementation = false;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var current = declarations[_i];
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
                 var inAmbientContextOrInterface = node.parent.kind === 215 || node.parent.kind === 155 || inAmbientContext;
@@ -19061,7 +19724,7 @@ var ts;
                 });
             }
             if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & 256)) {
+                !(lastSeenNonAmbientDeclaration.flags & 128)) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
             if (hasOverloads) {
@@ -19071,8 +19734,8 @@ var ts;
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
                     if (!bodySignature.hasStringLiterals) {
-                        for (var _a = 0; _a < signatures.length; _a++) {
-                            var signature = signatures[_a];
+                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                            var signature = signatures_3[_a];
                             if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) {
                                 error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
                                 break;
@@ -19102,9 +19765,9 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 | 1024);
-                if (effectiveDeclarationFlags & 1) {
-                    if (effectiveDeclarationFlags & 1024) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 | 512);
+                if (effectiveDeclarationFlags & 2) {
+                    if (effectiveDeclarationFlags & 512) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
                     else {
@@ -19240,9 +19903,12 @@ var ts;
             if (promiseType === unknownType && compilerOptions.isolatedModules) {
                 return unknownType;
             }
-            var promiseConstructor = getMergedSymbol(promiseType.symbol);
+            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
             if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType));
+                var typeName = promiseConstructor
+                    ? symbolToString(promiseConstructor)
+                    : typeToString(promiseType);
+                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
                 return unknownType;
             }
             var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
@@ -19401,7 +20067,7 @@ var ts;
                 if (isAsync) {
                     promisedType = checkAsyncFunctionReturnType(node);
                 }
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (produceDiagnostics && !node.type) {
                 if (compilerOptions.noImplicitAny && ts.nodeIsMissing(node.body) && !isPrivateWithinAmbient(node)) {
@@ -19499,12 +20165,12 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 248 && ts.isExternalModule(parent)) {
+            if (parent.kind === 248 && ts.isExternalOrCommonJsModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
         function checkVarDeclaredNamesNotShadowed(node) {
-            if ((ts.getCombinedNodeFlags(node) & 49152) !== 0 || ts.isParameterDeclaration(node)) {
+            if ((ts.getCombinedNodeFlags(node) & 24576) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
             if (node.kind === 211 && !node.initializer) {
@@ -19516,7 +20182,7 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 49152) {
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576) {
                         var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 212);
                         var container = varDeclList.parent.kind === 193 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
@@ -19570,6 +20236,11 @@ var ts;
                     checkExpressionCached(node.initializer);
                 }
             }
+            if (node.kind === 163) {
+                if (node.propertyName && node.propertyName.kind === 136) {
+                    checkComputedPropertyName(node.propertyName);
+                }
+            }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
@@ -19643,6 +20314,9 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
+            if (node.thenStatement.kind === 194) {
+                error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
+            }
             checkSourceElement(node.elseStatement);
         }
         function checkDoStatement(node) {
@@ -19892,7 +20566,7 @@ var ts;
                         error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                     else if (func.kind === 144) {
-                        if (!isTypeAssignableTo(exprType, returnType)) {
+                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
@@ -19925,6 +20599,7 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 if (clause.kind === 242 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
@@ -19941,6 +20616,9 @@ var ts;
                 if (produceDiagnostics && clause.kind === 241) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
+                    if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258)) {
+                        return;
+                    }
                     if (!isTypeAssignableTo(expressionType, caseType)) {
                         checkTypeAssignableTo(caseType, expressionType, caseClause.expression, undefined);
                     }
@@ -20022,7 +20700,7 @@ var ts;
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (!(member.flags & 128) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 64) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1);
@@ -20098,13 +20776,10 @@ var ts;
             return getTypeOfSymbol(getSymbolOfNode(node));
         }
         function checkClassDeclaration(node) {
-            if (!node.name && !(node.flags & 1024)) {
+            if (!node.name && !(node.flags & 512)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
             checkClassLikeDeclaration(node);
-            if (getSymbolOfNode(node).flags & 64 && !ts.isInAmbientContext(node)) {
-                error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-            }
             ts.forEach(node.members, checkSourceElement);
         }
         function checkClassLikeDeclaration(node) {
@@ -20151,8 +20826,8 @@ var ts;
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
             if (implementedTypeNodes) {
-                for (var _b = 0; _b < implementedTypeNodes.length; _b++) {
-                    var typeRefNode = implementedTypeNodes[_b];
+                for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
+                    var typeRefNode = implementedTypeNodes_1[_b];
                     if (!ts.isSupportedExpressionWithTypeArguments(typeRefNode)) {
                         error(typeRefNode.expression, ts.Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
                     }
@@ -20184,8 +20859,8 @@ var ts;
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
             var baseProperties = getPropertiesOfObjectType(baseType);
-            for (var _i = 0; _i < baseProperties.length; _i++) {
-                var baseProperty = baseProperties[_i];
+            for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
+                var baseProperty = baseProperties_1[_i];
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 134217728) {
                     continue;
@@ -20196,7 +20871,7 @@ var ts;
                 if (derived) {
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
-                        if (baseDeclarationFlags & 256 && (!derivedClassDecl || !(derivedClassDecl.flags & 256))) {
+                        if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(derivedClassDecl.flags & 128))) {
                             if (derivedClassDecl.kind === 186) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
@@ -20207,10 +20882,10 @@ var ts;
                     }
                     else {
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 32) || (derivedDeclarationFlags & 32)) {
+                        if ((baseDeclarationFlags & 16) || (derivedDeclarationFlags & 16)) {
                             continue;
                         }
-                        if ((baseDeclarationFlags & 128) !== (derivedDeclarationFlags & 128)) {
+                        if ((baseDeclarationFlags & 64) !== (derivedDeclarationFlags & 64)) {
                             continue;
                         }
                         if ((base.flags & derived.flags & 8192) || ((base.flags & 98308) && (derived.flags & 98308))) {
@@ -20276,11 +20951,11 @@ var ts;
             var seen = {};
             ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
             var ok = true;
-            for (var _i = 0; _i < baseTypes.length; _i++) {
-                var base = baseTypes[_i];
+            for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
+                var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var prop = properties[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     if (!ts.hasProperty(seen, prop.name)) {
                         seen[prop.name] = { prop: prop, containingType: base };
                     }
@@ -20324,15 +20999,6 @@ var ts;
                         checkIndexConstraints(type);
                     }
                 }
-                if (symbol && symbol.declarations) {
-                    for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
-                        var declaration = _c[_b];
-                        if (declaration.kind === 214 && !ts.isInAmbientContext(declaration)) {
-                            error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-                            break;
-                        }
-                    }
-                }
             }
             ts.forEach(ts.getInterfaceBaseTypeNodes(node), function (heritageElement) {
                 if (!ts.isSupportedExpressionWithTypeArguments(heritageElement)) {
@@ -20360,11 +21026,14 @@ var ts;
                 var enumIsConst = ts.isConst(node);
                 for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                     var member = _a[_i];
-                    if (member.name.kind === 136) {
+                    if (isComputedNonLiteralName(member.name)) {
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
-                    else if (isNumericLiteralName(member.name.text)) {
-                        error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                    else {
+                        var text = getTextOfPropertyName(member.name);
+                        if (isNumericLiteralName(text)) {
+                            error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                        }
                     }
                     var previousEnumMemberIsNonConstant = autoValue === undefined;
                     var initializer = member.initializer;
@@ -20558,8 +21227,8 @@ var ts;
         }
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
             var declarations = symbol.declarations;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
+                var declaration = declarations_5[_i];
                 if ((declaration.kind === 214 ||
                     (declaration.kind === 213 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
@@ -20687,7 +21356,7 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -20714,7 +21383,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 1) {
+                if (node.flags & 2) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -20742,7 +21411,7 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -20781,7 +21450,7 @@ var ts;
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69) {
@@ -21062,8 +21731,10 @@ var ts;
         function checkSourceFileWorker(node) {
             var links = getNodeLinks(node);
             if (!(links.flags & 1)) {
-                if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) {
-                    return;
+                if (compilerOptions.skipDefaultLibCheck) {
+                    if (node.hasNoDefaultLib) {
+                        return;
+                    }
                 }
                 checkGrammarSourceFile(node);
                 emitExtends = false;
@@ -21072,7 +21743,7 @@ var ts;
                 potentialThisCollisions.length = 0;
                 ts.forEach(node.statements, checkSourceElement);
                 checkFunctionAndClassExpressionBodies(node);
-                if (ts.isExternalModule(node)) {
+                if (ts.isExternalOrCommonJsModule(node)) {
                     checkExternalModuleExports(node);
                 }
                 if (potentialThisCollisions.length) {
@@ -21150,7 +21821,7 @@ var ts;
                     }
                     switch (location.kind) {
                         case 248:
-                            if (!ts.isExternalModule(location)) {
+                            if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
                         case 218:
@@ -21166,7 +21837,7 @@ var ts;
                             }
                         case 214:
                         case 215:
-                            if (!(memberFlags & 128)) {
+                            if (!(memberFlags & 64)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056);
                             }
                             break;
@@ -21428,7 +22099,7 @@ var ts;
         }
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 128
+            return node.flags & 64
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -21464,6 +22135,9 @@ var ts;
             }
             return [symbol];
         }
+        function isArgumentsLocalBinding(node) {
+            return getReferencedValueSymbol(node) === argumentsSymbol;
+        }
         function getReferencedExportContainer(node) {
             var symbol = getReferencedValueSymbol(node);
             if (symbol) {
@@ -21705,15 +22379,25 @@ var ts;
                 collectLinkedAliases: collectLinkedAliases,
                 getReferencedValueDeclaration: getReferencedValueDeclaration,
                 getTypeReferenceSerializationKind: getTypeReferenceSerializationKind,
-                isOptionalParameter: isOptionalParameter
+                isOptionalParameter: isOptionalParameter,
+                isArgumentsLocalBinding: isArgumentsLocalBinding,
+                getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration
             };
         }
+        function getExternalModuleFileFromDeclaration(declaration) {
+            var specifier = ts.getExternalModuleName(declaration);
+            var moduleSymbol = getSymbolAtLocation(specifier);
+            if (!moduleSymbol) {
+                return undefined;
+            }
+            return ts.getDeclarationOfKind(moduleSymbol, 248);
+        }
         function initializeTypeChecker() {
             ts.forEach(host.getSourceFiles(), function (file) {
-                ts.bindSourceFile(file);
+                ts.bindSourceFile(file, compilerOptions);
             });
             ts.forEach(host.getSourceFiles(), function (file) {
-                if (!ts.isExternalModule(file)) {
+                if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
             });
@@ -21854,19 +22538,19 @@ var ts;
                             text = "private";
                             lastPrivate = modifier;
                         }
-                        if (flags & 112) {
+                        if (flags & 56) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 128) {
+                        else if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
                         else if (node.parent.kind === 219 || node.parent.kind === 248) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
-                        else if (flags & 256) {
+                        else if (flags & 128) {
                             if (modifier.kind === 110) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
@@ -21877,10 +22561,10 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113:
-                        if (flags & 128) {
+                        if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
                         else if (node.parent.kind === 219 || node.parent.kind === 248) {
@@ -21889,23 +22573,23 @@ var ts;
                         else if (node.kind === 138) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
-                        else if (flags & 256) {
+                        else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 128;
+                        flags |= 64;
                         lastStatic = modifier;
                         break;
                     case 82:
-                        if (flags & 1) {
+                        if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 2) {
+                        else if (flags & 4) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
-                        else if (flags & 256) {
+                        else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (node.parent.kind === 214) {
@@ -21914,13 +22598,13 @@ var ts;
                         else if (node.kind === 138) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 1;
+                        flags |= 2;
                         break;
                     case 122:
-                        if (flags & 2) {
+                        if (flags & 4) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.parent.kind === 214) {
@@ -21932,69 +22616,69 @@ var ts;
                         else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 219) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 2;
+                        flags |= 4;
                         lastDeclare = modifier;
                         break;
                     case 115:
-                        if (flags & 256) {
+                        if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
                         if (node.kind !== 214) {
                             if (node.kind !== 143) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
                             }
-                            if (!(node.parent.kind === 214 && node.parent.flags & 256)) {
+                            if (!(node.parent.kind === 214 && node.parent.flags & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 128) {
+                            if (flags & 64) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 32) {
+                            if (flags & 16) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
-                        flags |= 256;
+                        flags |= 128;
                         break;
                     case 118:
-                        if (flags & 512) {
+                        if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 4 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.kind === 138) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
-                        flags |= 512;
+                        flags |= 256;
                         lastAsync = modifier;
                         break;
                 }
             }
             if (node.kind === 144) {
-                if (flags & 128) {
+                if (flags & 64) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & 256) {
+                if (flags & 128) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 64) {
+                else if (flags & 32) {
                     return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
                 }
-                else if (flags & 32) {
+                else if (flags & 16) {
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
-                else if (flags & 512) {
+                else if (flags & 256) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
                 return;
             }
-            else if ((node.kind === 222 || node.kind === 221) && flags & 2) {
+            else if ((node.kind === 222 || node.kind === 221) && flags & 4) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 138 && (flags & 112) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 138 && (flags & 56) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
-            if (flags & 512) {
+            if (flags & 256) {
                 return checkGrammarAsyncModifier(node, lastAsync);
             }
         }
@@ -22094,7 +22778,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 2035) {
+            if (parameter.flags & 1022) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -22114,7 +22798,7 @@ var ts;
             }
         }
         function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 2035) {
+            if (node.flags & 1022) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
             }
         }
@@ -22136,8 +22820,8 @@ var ts;
         function checkGrammarForOmittedArgument(node, args) {
             if (args) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                for (var _i = 0; _i < args.length; _i++) {
-                    var arg = args[_i];
+                for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
+                    var arg = args_1[_i];
                     if (arg.kind === 187) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
@@ -22377,7 +23061,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 2035) {
+                    else if (parameter.flags & 1022) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -22390,7 +23074,7 @@ var ts;
             }
         }
         function checkGrammarForNonSymbolComputedProperty(node, message) {
-            if (node.kind === 136 && !ts.isWellKnownSymbolSyntactically(node.expression)) {
+            if (ts.isDynamicName(node)) {
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -22426,19 +23110,6 @@ var ts;
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
-        function isIterationStatement(node, lookInLabeledStatements) {
-            switch (node.kind) {
-                case 199:
-                case 200:
-                case 201:
-                case 197:
-                case 198:
-                    return true;
-                case 207:
-                    return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-            }
-            return false;
-        }
         function checkGrammarBreakOrContinueStatement(node) {
             var current = node;
             while (current) {
@@ -22449,7 +23120,7 @@ var ts;
                     case 207:
                         if (node.label && current.label.text === node.label.text) {
                             var isMisplacedContinueLabel = node.kind === 202
-                                && !isIterationStatement(current.statement, true);
+                                && !ts.isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -22462,7 +23133,7 @@ var ts;
                         }
                         break;
                     default:
-                        if (isIterationStatement(current, false) && !node.label) {
+                        if (ts.isIterationStatement(current, false) && !node.label) {
                             return false;
                         }
                         break;
@@ -22524,8 +23195,8 @@ var ts;
             }
             else {
                 var elements = name.elements;
-                for (var _i = 0; _i < elements.length; _i++) {
-                    var element = elements[_i];
+                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                    var element = elements_2[_i];
                     if (element.kind !== 187) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
@@ -22639,12 +23310,13 @@ var ts;
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
             if (node.kind === 215 ||
+                node.kind === 216 ||
                 node.kind === 222 ||
                 node.kind === 221 ||
                 node.kind === 228 ||
                 node.kind === 227 ||
-                (node.flags & 2) ||
-                (node.flags & (1 | 1024))) {
+                (node.flags & 4) ||
+                (node.flags & (2 | 512))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -22682,7 +23354,7 @@ var ts;
             }
         }
         function checkGrammarNumericLiteral(node) {
-            if (node.flags & 65536 && languageVersion >= 1) {
+            if (node.flags & 32768 && languageVersion >= 1) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -22716,11 +23388,15 @@ var ts;
         var writeTextOfNode;
         var writer = createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
-        var currentSourceFile;
+        var currentText;
+        var currentLineMap;
+        var currentIdentifiers;
+        var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
         var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        var noDeclare = !root;
         var moduleElementDeclarationEmitInfo = [];
         var asynchronousSubModuleDeclarationEmitInfo;
         var referencePathsOutput = "";
@@ -22729,7 +23405,7 @@ var ts;
                 var addedGlobalFileReference = false;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
-                    if (referencedFile && ((referencedFile.flags & 8192) ||
+                    if (referencedFile && ((referencedFile.flags & 4096) ||
                         ts.shouldEmitToOwnFile(referencedFile, compilerOptions) ||
                         !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
@@ -22756,21 +23432,53 @@ var ts;
         }
         else {
             var emittedReferencedFiles = [];
+            var prevModuleElementDeclarationEmitInfo = [];
             ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                if (!ts.isDeclarationFile(sourceFile)) {
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) &&
+                            if (referencedFile && (ts.isDeclarationFile(referencedFile) &&
                                 !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
                         });
                     }
+                }
+                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                    noDeclare = false;
                     emitSourceFile(sourceFile);
                 }
+                else if (ts.isExternalModule(sourceFile)) {
+                    noDeclare = true;
+                    write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {");
+                    writeLine();
+                    increaseIndent();
+                    emitSourceFile(sourceFile);
+                    decreaseIndent();
+                    write("}");
+                    writeLine();
+                    if (moduleElementDeclarationEmitInfo.length) {
+                        var oldWriter = writer;
+                        ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
+                            if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
+                                ts.Debug.assert(aliasEmitInfo.node.kind === 222);
+                                createAndSetNewTextWriterWithSymbolWriter();
+                                ts.Debug.assert(aliasEmitInfo.indent === 1);
+                                increaseIndent();
+                                writeImportDeclaration(aliasEmitInfo.node);
+                                aliasEmitInfo.asynchronousOutput = writer.getText();
+                                decreaseIndent();
+                            }
+                        });
+                        setWriter(oldWriter);
+                    }
+                    prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
+                    moduleElementDeclarationEmitInfo = [];
+                }
             });
+            moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo);
         }
         return {
             reportedDeclarationError: reportedDeclarationError,
@@ -22779,13 +23487,12 @@ var ts;
             referencePathsOutput: referencePathsOutput
         };
         function hasInternalAnnotation(range) {
-            var text = currentSourceFile.text;
-            var comment = text.substring(range.pos, range.end);
+            var comment = currentText.substring(range.pos, range.end);
             return comment.indexOf("@internal") >= 0;
         }
         function stripInternal(node) {
             if (node) {
-                var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos);
                 if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
                     return;
                 }
@@ -22866,7 +23573,7 @@ var ts;
                 var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
                     }
                     else {
                         diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
@@ -22907,15 +23614,15 @@ var ts;
             }
         }
         function emitLines(nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+                var node = nodes_2[_i];
                 emit(node);
             }
         }
         function emitSeparatedList(nodes, separator, eachNodeEmitFn, canEmitFn) {
             var currentWriterPos = writer.getTextPos();
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+                var node = nodes_3[_i];
                 if (!canEmitFn || canEmitFn(node)) {
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(separator);
@@ -22930,9 +23637,9 @@ var ts;
         }
         function writeJsDocComments(declaration) {
             if (declaration) {
-                var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile);
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments);
-                ts.emitComments(currentSourceFile, writer, jsDocComments, true, newLine, ts.writeCommentRange);
+                var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
+                ts.emitComments(currentText, currentLineMap, writer, jsDocComments, true, newLine, ts.writeCommentRange);
             }
         }
         function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) {
@@ -22949,7 +23656,7 @@ var ts;
                 case 103:
                 case 97:
                 case 9:
-                    return writeTextOfNode(currentSourceFile, type);
+                    return writeTextOfNode(currentText, type);
                 case 188:
                     return emitExpressionWithTypeArguments(type);
                 case 151:
@@ -22980,14 +23687,14 @@ var ts;
             }
             function writeEntityName(entityName) {
                 if (entityName.kind === 69) {
-                    writeTextOfNode(currentSourceFile, entityName);
+                    writeTextOfNode(currentText, entityName);
                 }
                 else {
                     var left = entityName.kind === 135 ? entityName.left : entityName.expression;
                     var right = entityName.kind === 135 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
-                    writeTextOfNode(currentSourceFile, right);
+                    writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
@@ -23015,7 +23722,7 @@ var ts;
                 }
             }
             function emitTypePredicate(type) {
-                writeTextOfNode(currentSourceFile, type.parameterName);
+                writeTextOfNode(currentText, type.parameterName);
                 write(" is ");
                 emitType(type.type);
             }
@@ -23055,19 +23762,23 @@ var ts;
             }
         }
         function emitSourceFile(node) {
-            currentSourceFile = node;
+            currentText = node.text;
+            currentLineMap = ts.getLineStarts(node);
+            currentIdentifiers = node.identifiers;
+            isCurrentFileExternalModule = ts.isExternalModule(node);
             enclosingDeclaration = node;
+            ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true);
             emitLines(node.statements);
         }
         function getExportDefaultTempVariableName() {
             var baseName = "_default";
-            if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) {
+            if (!ts.hasProperty(currentIdentifiers, baseName)) {
                 return baseName;
             }
             var count = 0;
             while (true) {
                 var name_18 = baseName + "_" + (++count);
-                if (!ts.hasProperty(currentSourceFile.identifiers, name_18)) {
+                if (!ts.hasProperty(currentIdentifiers, name_18)) {
                     return name_18;
                 }
             }
@@ -23075,7 +23786,7 @@ var ts;
         function emitExportAssignment(node) {
             if (node.expression.kind === 69) {
                 write(node.isExportEquals ? "export = " : "export default ");
-                writeTextOfNode(currentSourceFile, node.expression);
+                writeTextOfNode(currentText, node.expression);
             }
             else {
                 var tempVarName = getExportDefaultTempVariableName();
@@ -23110,7 +23821,7 @@ var ts;
                 writeModuleElement(node);
             }
             else if (node.kind === 221 ||
-                (node.parent.kind === 248 && ts.isExternalModule(currentSourceFile))) {
+                (node.parent.kind === 248 && isCurrentFileExternalModule)) {
                 var isVisible;
                 if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
@@ -23162,39 +23873,39 @@ var ts;
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent === currentSourceFile) {
-                if (node.flags & 1) {
+            if (node.parent.kind === 248) {
+                if (node.flags & 2) {
                     write("export ");
                 }
-                if (node.flags & 1024) {
+                if (node.flags & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 215) {
+                else if (node.kind !== 215 && !noDeclare) {
                     write("declare ");
                 }
             }
         }
         function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 32) {
+            if (node.flags & 16) {
                 write("private ");
             }
-            else if (node.flags & 64) {
+            else if (node.flags & 32) {
                 write("protected ");
             }
-            if (node.flags & 128) {
+            if (node.flags & 64) {
                 write("static ");
             }
-            if (node.flags & 256) {
+            if (node.flags & 128) {
                 write("abstract ");
             }
         }
         function writeImportEqualsDeclaration(node) {
             emitJsDocComments(node);
-            if (node.flags & 1) {
+            if (node.flags & 2) {
                 write("export ");
             }
             write("import ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" = ");
             if (ts.isInternalModuleImportEqualsDeclaration(node)) {
                 emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError);
@@ -23202,7 +23913,7 @@ var ts;
             }
             else {
                 write("require(");
-                writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node));
+                writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 write(");");
             }
             writer.writeLine();
@@ -23225,18 +23936,18 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 1)) {
+            if (!node.importClause && !(node.flags & 2)) {
                 return;
             }
             emitJsDocComments(node);
-            if (node.flags & 1) {
+            if (node.flags & 2) {
                 write("export ");
             }
             write("import ");
             if (node.importClause) {
                 var currentWriterPos = writer.getTextPos();
                 if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) {
-                    writeTextOfNode(currentSourceFile, node.importClause.name);
+                    writeTextOfNode(currentText, node.importClause.name);
                 }
                 if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) {
                     if (currentWriterPos !== writer.getTextPos()) {
@@ -23244,7 +23955,7 @@ var ts;
                     }
                     if (node.importClause.namedBindings.kind === 224) {
                         write("* as ");
-                        writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name);
+                        writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
                     else {
                         write("{ ");
@@ -23254,16 +23965,28 @@ var ts;
                 }
                 write(" from ");
             }
-            writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+            emitExternalModuleSpecifier(node.moduleSpecifier);
             write(";");
             writer.writeLine();
         }
+        function emitExternalModuleSpecifier(moduleSpecifier) {
+            if (moduleSpecifier.kind === 9 && (!root) && (compilerOptions.out || compilerOptions.outFile)) {
+                var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent);
+                if (moduleName) {
+                    write("\"");
+                    write(moduleName);
+                    write("\"");
+                    return;
+                }
+            }
+            writeTextOfNode(currentText, moduleSpecifier);
+        }
         function emitImportOrExportSpecifier(node) {
             if (node.propertyName) {
-                writeTextOfNode(currentSourceFile, node.propertyName);
+                writeTextOfNode(currentText, node.propertyName);
                 write(" as ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
         }
         function emitExportSpecifier(node) {
             emitImportOrExportSpecifier(node);
@@ -23283,7 +24006,7 @@ var ts;
             }
             if (node.moduleSpecifier) {
                 write(" from ");
-                writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+                emitExternalModuleSpecifier(node.moduleSpecifier);
             }
             write(";");
             writer.writeLine();
@@ -23291,17 +24014,17 @@ var ts;
         function writeModuleDeclaration(node) {
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 131072) {
+            if (node.flags & 65536) {
                 write("namespace ");
             }
             else {
                 write("module ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             while (node.body.kind !== 219) {
                 node = node.body;
                 write(".");
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
@@ -23320,7 +24043,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("type ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             emitTypeParameters(node.typeParameters);
             write(" = ");
             emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
@@ -23342,7 +24065,7 @@ var ts;
                 write("const ");
             }
             write("enum ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" {");
             writeLine();
             increaseIndent();
@@ -23353,7 +24076,7 @@ var ts;
         }
         function emitEnumMemberDeclaration(node) {
             emitJsDocComments(node);
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var enumMemberValue = resolver.getConstantValue(node);
             if (enumMemberValue !== undefined) {
                 write(" = ");
@@ -23363,14 +24086,14 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 143 && (node.parent.flags & 32);
+            return node.parent.kind === 143 && (node.parent.flags & 16);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
                 increaseIndent();
                 emitJsDocComments(node);
                 decreaseIndent();
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
                     if (node.parent.kind === 152 ||
@@ -23405,7 +24128,7 @@ var ts;
                             break;
                         case 143:
                         case 142:
-                            if (node.parent.flags & 128) {
+                            if (node.parent.flags & 64) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else if (node.parent.parent.kind === 214) {
@@ -23468,7 +24191,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 112) {
+                        if (param.flags & 56) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -23476,11 +24199,11 @@ var ts;
             }
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 256) {
+            if (node.flags & 128) {
                 write("abstract ");
             }
             write("class ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -23503,7 +24226,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("interface ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -23533,14 +24256,14 @@ var ts;
                     emitBindingPattern(node.name);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if ((node.kind === 141 || node.kind === 140) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
                     if ((node.kind === 141 || node.kind === 140) && node.parent.kind === 155) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 32)) {
+                    else if (!(node.flags & 16)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
@@ -23554,7 +24277,7 @@ var ts;
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
                 else if (node.kind === 141 || node.kind === 140) {
-                    if (node.flags & 128) {
+                    if (node.flags & 64) {
                         return symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -23607,7 +24330,7 @@ var ts;
                         emitBindingPattern(bindingElement.name);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, bindingElement.name);
+                        writeTextOfNode(currentText, bindingElement.name);
                         writeTypeOfDeclaration(bindingElement, undefined, getBindingElementTypeVisibilityError);
                     }
                 }
@@ -23648,8 +24371,8 @@ var ts;
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
                 emitClassMemberDeclarationFlags(node);
-                writeTextOfNode(currentSourceFile, node.name);
-                if (!(node.flags & 32)) {
+                writeTextOfNode(currentText, node.name);
+                if (!(node.flags & 16)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
@@ -23676,7 +24399,7 @@ var ts;
             function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 146) {
-                    if (accessorWithTypeAnnotation.parent.flags & 128) {
+                    if (accessorWithTypeAnnotation.parent.flags & 64) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
@@ -23693,7 +24416,7 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 128) {
+                    if (accessorWithTypeAnnotation.flags & 64) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -23729,13 +24452,13 @@ var ts;
                 }
                 if (node.kind === 213) {
                     write("function ");
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                 }
                 else if (node.kind === 144) {
                     write("constructor");
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if (ts.hasQuestionToken(node)) {
                         write("?");
                     }
@@ -23774,7 +24497,7 @@ var ts;
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 144 && !(node.flags & 32)) {
+            else if (node.kind !== 144 && !(node.flags & 16)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -23802,7 +24525,7 @@ var ts;
                         break;
                     case 143:
                     case 142:
-                        if (node.flags & 128) {
+                        if (node.flags & 64) {
                             diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -23848,7 +24571,7 @@ var ts;
                 emitBindingPattern(node.name);
             }
             else {
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             if (resolver.isOptionalParameter(node)) {
                 write("?");
@@ -23859,7 +24582,7 @@ var ts;
                 node.parent.parent.kind === 155) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 32)) {
+            else if (!(node.parent.flags & 16)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
             function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
@@ -23888,7 +24611,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     case 143:
                     case 142:
-                        if (node.parent.flags & 128) {
+                        if (node.parent.flags & 64) {
                             return symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -23947,7 +24670,7 @@ var ts;
                 }
                 else if (bindingElement.kind === 163) {
                     if (bindingElement.propertyName) {
-                        writeTextOfNode(currentSourceFile, bindingElement.propertyName);
+                        writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
                     }
                     if (bindingElement.name) {
@@ -23959,7 +24682,7 @@ var ts;
                             if (bindingElement.dotDotDotToken) {
                                 write("...");
                             }
-                            writeTextOfNode(currentSourceFile, bindingElement.name);
+                            writeTextOfNode(currentText, bindingElement.name);
                         }
                     }
                 }
@@ -24004,7 +24727,7 @@ var ts;
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 8192
+            var declFileName = referencedFile.flags & 4096
                 ? referencedFile.fileName
                 : ts.shouldEmitToOwnFile(referencedFile, compilerOptions)
                     ? ts.getOwnEmitOutputFilePath(referencedFile, host, ".d.ts")
@@ -24042,6 +24765,18 @@ var ts;
         return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile);
     }
     ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile;
+    function getResolvedExternalModuleName(host, file) {
+        return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || ts.isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
     var entities = {
         "quot": 0x0022,
         "amp": 0x0026,
@@ -24311,15 +25046,19 @@ var ts;
         var newLine = host.getNewLine();
         var jsxDesugaring = host.getCompilerOptions().jsx !== 1;
         var shouldEmitJsx = function (s) { return (s.languageVariant === 1 && !jsxDesugaring); };
+        var outFile = compilerOptions.outFile || compilerOptions.out;
+        var emitJavaScript = createFileEmitter();
         if (targetSourceFile === undefined) {
-            ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
-                    var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
-                    emitFile(jsFilePath, sourceFile);
-                }
-            });
-            if (compilerOptions.outFile || compilerOptions.out) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            if (outFile) {
+                emitFile(outFile);
+            }
+            else {
+                ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                    if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
+                        var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
+                        emitFile(jsFilePath, sourceFile);
+                    }
+                });
             }
         }
         else {
@@ -24327,8 +25066,8 @@ var ts;
                 var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
                 emitFile(jsFilePath, targetSourceFile);
             }
-            else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            else if (!ts.isDeclarationFile(targetSourceFile) && outFile) {
+                emitFile(outFile);
             }
         }
         diagnostics = ts.sortAndDeduplicateDiagnostics(diagnostics);
@@ -24337,16 +25076,8 @@ var ts;
             diagnostics: diagnostics,
             sourceMaps: sourceMapDataList
         };
-        function isNodeDescendentOf(node, ancestor) {
-            while (node) {
-                if (node === ancestor)
-                    return true;
-                node = node.parent;
-            }
-            return false;
-        }
         function isUniqueLocalName(name, container) {
-            for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
+            for (var node = container; ts.isNodeDescendentOf(node, container); node = node.nextContainer) {
                 if (node.locals && ts.hasProperty(node.locals, name)) {
                     if (node.locals[name].flags & (107455 | 1048576 | 8388608)) {
                         return false;
@@ -24355,19 +25086,57 @@ var ts;
             }
             return true;
         }
-        function emitJavaScript(jsFilePath, root) {
+        function setLabeledJump(state, isBreak, labelText, labelMarker) {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = {};
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = {};
+                }
+                state.labeledNonLocalContinues[labelText] = labelMarker;
+            }
+        }
+        function hoistVariableDeclarationFromLoop(state, declaration) {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+            visit(declaration.name);
+            function visit(node) {
+                if (node.kind === 69) {
+                    state.hoistedLocalVariables.push(node);
+                }
+                else {
+                    for (var _a = 0, _b = node.elements; _a < _b.length; _a++) {
+                        var element = _b[_a];
+                        visit(element.name);
+                    }
+                }
+            }
+        }
+        function createFileEmitter() {
             var writer = ts.createTextWriter(newLine);
             var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent;
             var currentSourceFile;
+            var currentText;
+            var currentLineMap;
+            var currentFileIdentifiers;
+            var renamedDependencies;
+            var isEs6Module;
+            var isCurrentFileExternalModule;
             var exportFunctionForFile;
-            var generatedNameSet = {};
-            var nodeToGeneratedName = [];
+            var generatedNameSet;
+            var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
-            var extendsEmitted = false;
-            var decorateEmitted = false;
-            var paramEmitted = false;
-            var awaiterEmitted = false;
-            var tempFlags = 0;
+            var convertedLoopState;
+            var extendsEmitted;
+            var decorateEmitted;
+            var paramEmitted;
+            var awaiterEmitted;
+            var tempFlags;
             var tempVariables;
             var tempParameters;
             var externalImports;
@@ -24384,6 +25153,7 @@ var ts;
             var scopeEmitStart = function (scopeDeclaration, scopeName) { };
             var scopeEmitEnd = function () { };
             var sourceMapData;
+            var root;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var moduleEmitDelegates = (_a = {},
                 _a[5] = emitES6Module,
@@ -24393,30 +25163,75 @@ var ts;
                 _a[1] = emitCommonJSModule,
                 _a
             );
-            if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
-                initializeEmitterWithSourceMaps();
-            }
-            if (root) {
-                emitSourceFile(root);
-            }
-            else {
-                ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emitSourceFile(sourceFile);
+            var bundleEmitDelegates = (_b = {},
+                _b[5] = function () { },
+                _b[2] = emitAMDModule,
+                _b[4] = emitSystemModule,
+                _b[3] = function () { },
+                _b[1] = function () { },
+                _b
+            );
+            return doEmit;
+            function doEmit(jsFilePath, rootFile) {
+                writer.reset();
+                currentSourceFile = undefined;
+                currentText = undefined;
+                currentLineMap = undefined;
+                exportFunctionForFile = undefined;
+                generatedNameSet = {};
+                nodeToGeneratedName = [];
+                computedPropertyNamesToGeneratedNames = undefined;
+                convertedLoopState = undefined;
+                extendsEmitted = false;
+                decorateEmitted = false;
+                paramEmitted = false;
+                awaiterEmitted = false;
+                tempFlags = 0;
+                tempVariables = undefined;
+                tempParameters = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStars = undefined;
+                detachedCommentsInfo = undefined;
+                sourceMapData = undefined;
+                isEs6Module = false;
+                renamedDependencies = undefined;
+                isCurrentFileExternalModule = false;
+                root = rootFile;
+                if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
+                    initializeEmitterWithSourceMaps(jsFilePath, root);
+                }
+                if (root) {
+                    emitSourceFile(root);
+                }
+                else {
+                    if (modulekind) {
+                        ts.forEach(host.getSourceFiles(), emitEmitHelpers);
                     }
-                });
+                    ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                        if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) {
+                            emitSourceFile(sourceFile);
+                        }
+                    });
+                }
+                writeLine();
+                writeEmittedFiles(writer.getText(), jsFilePath, compilerOptions.emitBOM);
             }
-            writeLine();
-            writeEmittedFiles(writer.getText(), compilerOptions.emitBOM);
-            return;
             function emitSourceFile(sourceFile) {
                 currentSourceFile = sourceFile;
+                currentText = sourceFile.text;
+                currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
+                renamedDependencies = sourceFile.renamedDependencies;
+                currentFileIdentifiers = sourceFile.identifiers;
+                isCurrentFileExternalModule = ts.isExternalModule(sourceFile);
                 emit(sourceFile);
             }
             function isUniqueName(name) {
                 return !resolver.hasGlobalName(name) &&
-                    !ts.hasProperty(currentSourceFile.identifiers, name) &&
+                    !ts.hasProperty(currentFileIdentifiers, name) &&
                     !ts.hasProperty(generatedNameSet, name);
             }
             function makeTempVariableName(flags) {
@@ -24489,7 +25304,7 @@ var ts;
                 var id = ts.getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
-            function initializeEmitterWithSourceMaps() {
+            function initializeEmitterWithSourceMaps(jsFilePath, root) {
                 var sourceMapDir;
                 var sourceMapSourceIndex = -1;
                 var sourceMapNameIndexMap = {};
@@ -24558,7 +25373,7 @@ var ts;
                     }
                 }
                 function recordSourceMapSpan(pos) {
-                    var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos);
+                    var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos);
                     sourceLinePos.line++;
                     sourceLinePos.character++;
                     var emittedLine = writer.getLine();
@@ -24586,13 +25401,13 @@ var ts;
                     }
                 }
                 function recordEmitNodeStartSpan(node) {
-                    recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos));
+                    recordSourceMapSpan(ts.skipTrivia(currentText, node.pos));
                 }
                 function recordEmitNodeEndSpan(node) {
                     recordSourceMapSpan(node.end);
                 }
                 function writeTextWithSpanRecord(tokenKind, startPos, emitFn) {
-                    var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
+                    var tokenStartPos = ts.skipTrivia(currentText, startPos);
                     recordSourceMapSpan(tokenStartPos);
                     var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
                     recordSourceMapSpan(tokenEndPos);
@@ -24662,9 +25477,9 @@ var ts;
                     sourceMapNameIndices.pop();
                 }
                 ;
-                function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) {
+                function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) {
                     recordSourceMapSpan(comment.pos);
-                    ts.writeCommentRange(currentSourceFile, writer, comment, newLine);
+                    ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine);
                     recordSourceMapSpan(comment.end);
                 }
                 function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) {
@@ -24694,7 +25509,7 @@ var ts;
                         return output;
                     }
                 }
-                function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) {
+                function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) {
                     encodeLastRecordedSourceMapSpan();
                     var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent);
                     sourceMapDataList.push(sourceMapData);
@@ -24707,7 +25522,7 @@ var ts;
                         ts.writeFile(host, diagnostics, sourceMapData.sourceMapFilePath, sourceMapText, false);
                         sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL;
                     }
-                    writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark);
+                    writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark);
                 }
                 var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath));
                 sourceMapData = {
@@ -24770,7 +25585,7 @@ var ts;
                 scopeEmitEnd = recordScopeNameEnd;
                 writeComment = writeCommentRangeWithMap;
             }
-            function writeJavaScriptFile(emitOutput, writeByteOrderMark) {
+            function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) {
                 ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
             function createTempVariable(flags) {
@@ -24940,7 +25755,7 @@ var ts;
                     return getQuotedEscapedLiteralText("\"", node.text, "\"");
                 }
                 if (node.parent) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                    return ts.getTextOfNodeFromSourceText(currentText, node);
                 }
                 switch (node.kind) {
                     case 9:
@@ -24962,7 +25777,7 @@ var ts;
                 return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote;
             }
             function emitDownlevelRawTemplateLiteral(node) {
-                var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                var text = ts.getTextOfNodeFromSourceText(currentText, node);
                 var isLast = node.kind === 11 || node.kind === 14;
                 text = text.substring(1, text.length - (isLast ? 1 : 2));
                 text = text.replace(/\r\n?/g, "\n");
@@ -25292,7 +26107,7 @@ var ts;
                         write(node.text);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, node);
+                        writeTextOfNode(currentText, node);
                     }
                     write("\"");
                 }
@@ -25376,39 +26191,43 @@ var ts;
                         write(".");
                     }
                 }
-                else if (modulekind !== 5) {
-                    var declaration = resolver.getReferencedImportDeclaration(node);
-                    if (declaration) {
-                        if (declaration.kind === 223) {
-                            write(getGeneratedNameForNode(declaration.parent));
-                            write(languageVersion === 0 ? "[\"default\"]" : ".default");
-                            return;
-                        }
-                        else if (declaration.kind === 226) {
-                            write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                            var name_23 = declaration.propertyName || declaration.name;
-                            var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_23);
-                            if (languageVersion === 0 && identifier === "default") {
-                                write("[\"default\"]");
+                else {
+                    if (modulekind !== 5) {
+                        var declaration = resolver.getReferencedImportDeclaration(node);
+                        if (declaration) {
+                            if (declaration.kind === 223) {
+                                write(getGeneratedNameForNode(declaration.parent));
+                                write(languageVersion === 0 ? "[\"default\"]" : ".default");
+                                return;
                             }
-                            else {
-                                write(".");
-                                write(identifier);
+                            else if (declaration.kind === 226) {
+                                write(getGeneratedNameForNode(declaration.parent.parent.parent));
+                                var name_23 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_23);
+                                if (languageVersion === 0 && identifier === "default") {
+                                    write("[\"default\"]");
+                                }
+                                else {
+                                    write(".");
+                                    write(identifier);
+                                }
+                                return;
                             }
-                            return;
                         }
                     }
-                    declaration = resolver.getReferencedNestedRedeclaration(node);
-                    if (declaration) {
-                        write(getGeneratedNameForNode(declaration.name));
-                        return;
+                    if (languageVersion !== 2) {
+                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                        if (declaration) {
+                            write(getGeneratedNameForNode(declaration.name));
+                            return;
+                        }
                     }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function isNameOfNestedRedeclaration(node) {
@@ -25425,6 +26244,13 @@ var ts;
                 return false;
             }
             function emitIdentifier(node) {
+                if (convertedLoopState) {
+                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
+                        var name_24 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_24);
+                        return;
+                    }
+                }
                 if (!node.parent) {
                     write(node.text);
                 }
@@ -25438,7 +26264,7 @@ var ts;
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function emitThis(node) {
@@ -25596,7 +26422,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, true, (node.flags & 2048) !== 0, elements.hasTrailingComma, true);
+                    emitListWithSpread(elements, true, (node.flags & 1024) !== 0, elements.hasTrailingComma, true);
                 }
             }
             function emitObjectLiteralBody(node, numElements) {
@@ -25611,7 +26437,7 @@ var ts;
                         emitLinePreservingList(node, properties, languageVersion >= 1, true);
                     }
                     else {
-                        var multiLine = (node.flags & 2048) !== 0;
+                        var multiLine = (node.flags & 1024) !== 0;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -25630,7 +26456,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 2048) !== 0;
+                var multiLine = (node.flags & 1024) !== 0;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -25805,8 +26631,8 @@ var ts;
                 return container && container.kind !== 248;
             }
             function emitShorthandPropertyAssignment(node) {
-                writeTextOfNode(currentSourceFile, node.name);
-                if (languageVersion < 2 || isNamespaceExportReference(node.name)) {
+                writeTextOfNode(currentText, node.name);
+                if (modulekind !== 5 || isNamespaceExportReference(node.name)) {
                     write(": ");
                     emit(node.name);
                 }
@@ -25856,10 +26682,10 @@ var ts;
                 }
                 emit(node.expression);
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
-                var shouldEmitSpace;
+                var shouldEmitSpace = false;
                 if (!indentedBeforeDot) {
                     if (node.expression.kind === 8) {
-                        var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression);
+                        var text = ts.getTextOfNodeFromSourceText(currentText, node.expression);
                         shouldEmitSpace = text.indexOf(ts.tokenToString(21)) < 0;
                     }
                     else {
@@ -26142,13 +26968,13 @@ var ts;
                 return isSourceFileLevelDeclarationInSystemJsModule(node, false);
             }
             function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
-                if (!node || languageVersion >= 2 || !isCurrentFileSystemExternalModule()) {
+                if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
                 var current = node;
                 while (current) {
                     if (current.kind === 248) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1) !== 0);
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2) !== 0);
                     }
                     else if (ts.isFunctionLike(current) || current.kind === 219) {
                         return false;
@@ -26328,8 +27154,16 @@ var ts;
                 }
             }
             function emitDoStatement(node) {
+                emitLoop(node, emitDoStatementWorker);
+            }
+            function emitDoStatementWorker(node, loop) {
                 write("do");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
                 if (node.statement.kind === 192) {
                     write(" ");
                 }
@@ -26341,15 +27175,30 @@ var ts;
                 write(");");
             }
             function emitWhileStatement(node) {
+                emitLoop(node, emitWhileStatementWorker);
+            }
+            function emitWhileStatementWorker(node, loop) {
                 write("while (");
                 emit(node.expression);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
             }
             function tryEmitStartOfVariableDeclarationList(decl, startPos) {
                 if (shouldHoistVariable(decl, true)) {
                     return false;
                 }
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576) === 0) {
+                    for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
+                        var varDecl = _b[_a];
+                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
+                    }
+                    return false;
+                }
                 var tokenKind = 102;
                 if (decl && languageVersion >= 2) {
                     if (ts.isLet(decl)) {
@@ -26395,7 +27244,221 @@ var ts;
                 }
                 return started;
             }
+            function shouldConvertLoopBody(node) {
+                return languageVersion < 2 &&
+                    (resolver.getNodeCheckFlags(node) & 65536) !== 0;
+            }
+            function emitLoop(node, loopEmitter) {
+                var shouldConvert = shouldConvertLoopBody(node);
+                if (!shouldConvert) {
+                    loopEmitter(node, undefined);
+                }
+                else {
+                    var loop = convertLoopBody(node);
+                    if (node.parent.kind === 207) {
+                        emitLabelAndColon(node.parent);
+                    }
+                    loopEmitter(node, loop);
+                }
+            }
+            function convertLoopBody(node) {
+                var functionName = makeUniqueName("_loop");
+                var loopInitializer;
+                switch (node.kind) {
+                    case 199:
+                    case 200:
+                    case 201:
+                        if (node.initializer.kind === 212) {
+                            loopInitializer = node.initializer;
+                        }
+                        break;
+                }
+                var loopParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576)) {
+                    loopParameters = [];
+                    for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
+                        var varDeclaration = _b[_a];
+                        collectNames(varDeclaration.name);
+                    }
+                }
+                var bodyIsBlock = node.statement.kind === 192;
+                var paramList = loopParameters ? loopParameters.join(", ") : "";
+                writeLine();
+                write("var " + functionName + " = function(" + paramList + ")");
+                if (!bodyIsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                var convertedOuterLoopState = convertedLoopState;
+                convertedLoopState = {};
+                if (convertedOuterLoopState) {
+                    if (convertedOuterLoopState.argumentsName) {
+                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
+                    }
+                    if (convertedOuterLoopState.hoistedLocalVariables) {
+                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
+                    }
+                }
+                emitEmbeddedStatement(node.statement);
+                if (!bodyIsBlock) {
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                write(";");
+                writeLine();
+                if (convertedLoopState.argumentsName) {
+                    if (convertedOuterLoopState) {
+                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
+                    }
+                    else {
+                        write("var " + convertedLoopState.argumentsName + " = arguments;");
+                        writeLine();
+                    }
+                }
+                if (convertedLoopState.hoistedLocalVariables) {
+                    if (convertedOuterLoopState) {
+                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
+                    }
+                    else {
+                        write("var ");
+                        var seen;
+                        for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
+                            var id = _d[_c];
+                            if (!seen) {
+                                seen = {};
+                            }
+                            else {
+                                write(", ");
+                            }
+                            if (!ts.hasProperty(seen, id.text)) {
+                                emit(id);
+                                seen[id.text] = id.text;
+                            }
+                        }
+                        write(";");
+                        writeLine();
+                    }
+                }
+                var currentLoopState = convertedLoopState;
+                convertedLoopState = convertedOuterLoopState;
+                return { functionName: functionName, paramList: paramList, state: currentLoopState };
+                function collectNames(name) {
+                    if (name.kind === 69) {
+                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        loopParameters.push(nameText);
+                    }
+                    else {
+                        for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
+                            var element = _b[_a];
+                            collectNames(element.name);
+                        }
+                    }
+                }
+            }
+            function emitNormalLoopBody(node, emitAsEmbeddedStatement) {
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = 2 | 4;
+                }
+                if (emitAsEmbeddedStatement) {
+                    emitEmbeddedStatement(node.statement);
+                }
+                else if (node.statement.kind === 192) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+            }
+            function emitConvertedLoopCall(loop, emitAsBlock) {
+                if (emitAsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                    !loop.state.labeledNonLocalBreaks &&
+                    !loop.state.labeledNonLocalContinues;
+                var loopResult = makeUniqueName("state");
+                if (!isSimpleLoop) {
+                    write("var " + loopResult + " = ");
+                }
+                write(loop.functionName + "(" + loop.paramList + ");");
+                if (!isSimpleLoop) {
+                    writeLine();
+                    if (loop.state.nonLocalJumps & 8) {
+                        write("if (typeof " + loopResult + " === \"object\") ");
+                        if (convertedLoopState) {
+                            write("return " + loopResult + ";");
+                            convertedLoopState.nonLocalJumps |= 8;
+                        }
+                        else {
+                            write("return " + loopResult + ".value");
+                        }
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 2) {
+                        write("if (" + loopResult + " === \"break\") break;");
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 4) {
+                        write("if (" + loopResult + " === \"continue\") continue;");
+                        writeLine();
+                    }
+                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
+                }
+                if (emitAsBlock) {
+                    writeLine();
+                    decreaseIndent();
+                    write("}");
+                }
+                function emitDispatchTableForLabeledJumps(loopResultVariable, currentLoop, outerLoop) {
+                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
+                        return;
+                    }
+                    write("switch(" + loopResultVariable + ") {");
+                    increaseIndent();
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, true, loopResultVariable, outerLoop);
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, false, loopResultVariable, outerLoop);
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                function emitDispatchEntriesForLabeledJumps(table, isBreak, loopResultVariable, outerLoop) {
+                    if (!table) {
+                        return;
+                    }
+                    for (var labelText in table) {
+                        var labelMarker = table[labelText];
+                        writeLine();
+                        write("case \"" + labelMarker + "\": ");
+                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
+                            if (isBreak) {
+                                write("break ");
+                            }
+                            else {
+                                write("continue ");
+                            }
+                            write(labelText + ";");
+                        }
+                        else {
+                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                            write("return " + loopResultVariable + ";");
+                        }
+                    }
+                }
+            }
             function emitForStatement(node) {
+                emitLoop(node, emitForStatementWorker);
+            }
+            function emitForStatementWorker(node, loop) {
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
@@ -26417,12 +27480,22 @@ var ts;
                 write(";");
                 emitOptional(" ", node.incrementor);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
             }
             function emitForInOrForOfStatement(node) {
                 if (languageVersion < 2 && node.kind === 201) {
-                    return emitDownLevelForOfStatement(node);
+                    emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
+                else {
+                    emitLoop(node, emitForInOrForOfStatementWorker);
+                }
+            }
+            function emitForInOrForOfStatementWorker(node, loop) {
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
@@ -26444,28 +27517,36 @@ var ts;
                 }
                 emit(node.expression);
                 emitToken(18, node.expression.end);
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
             }
             function emitDownLevelForOfStatement(node) {
+                emitLoop(node, emitDownLevelForOfStatementWorker);
+            }
+            function emitDownLevelForOfStatementWorker(node, loop) {
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
-                var rhsIsIdentifier = node.expression.kind === 69;
                 var counter = createTempVariable(268435456);
-                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(0);
+                var rhsReference = ts.createSynthesizedNode(69);
+                rhsReference.text = node.expression.kind === 69 ?
+                    makeUniqueName(node.expression.text) :
+                    makeTempVariableName(0);
                 emitStart(node.expression);
                 write("var ");
                 emitNodeWithoutSourceMap(counter);
                 write(" = 0");
                 emitEnd(node.expression);
-                if (!rhsIsIdentifier) {
-                    write(", ");
-                    emitStart(node.expression);
-                    emitNodeWithoutSourceMap(rhsReference);
-                    write(" = ");
-                    emitNodeWithoutSourceMap(node.expression);
-                    emitEnd(node.expression);
-                }
+                write(", ");
+                emitStart(node.expression);
+                emitNodeWithoutSourceMap(rhsReference);
+                write(" = ");
+                emitNodeWithoutSourceMap(node.expression);
+                emitEnd(node.expression);
                 write("; ");
                 emitStart(node.initializer);
                 emitNodeWithoutSourceMap(counter);
@@ -26515,23 +27596,65 @@ var ts;
                 }
                 emitEnd(node.initializer);
                 write(";");
-                if (node.statement.kind === 192) {
-                    emitLines(node.statement.statements);
+                if (loop) {
+                    writeLine();
+                    emitConvertedLoopCall(loop, false);
                 }
                 else {
-                    writeLine();
-                    emit(node.statement);
+                    emitNormalLoopBody(node, false);
                 }
                 writeLine();
                 decreaseIndent();
                 write("}");
             }
             function emitBreakOrContinueStatement(node) {
+                if (convertedLoopState) {
+                    var jump = node.kind === 203 ? 2 : 4;
+                    var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
+                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+                    if (!canUseBreakOrContinue) {
+                        if (!node.label) {
+                            if (node.kind === 203) {
+                                convertedLoopState.nonLocalJumps |= 2;
+                                write("return \"break\";");
+                            }
+                            else {
+                                convertedLoopState.nonLocalJumps |= 4;
+                                write("return \"continue\";");
+                            }
+                        }
+                        else {
+                            var labelMarker;
+                            if (node.kind === 203) {
+                                labelMarker = "break-" + node.label.text;
+                                setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
+                            }
+                            else {
+                                labelMarker = "continue-" + node.label.text;
+                                setLabeledJump(convertedLoopState, false, node.label.text, labelMarker);
+                            }
+                            write("return \"" + labelMarker + "\";");
+                        }
+                        return;
+                    }
+                }
                 emitToken(node.kind === 203 ? 70 : 75, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
             function emitReturnStatement(node) {
+                if (convertedLoopState) {
+                    convertedLoopState.nonLocalJumps |= 8;
+                    write("return { value: ");
+                    if (node.expression) {
+                        emit(node.expression);
+                    }
+                    else {
+                        write("void 0");
+                    }
+                    write(" };");
+                    return;
+                }
                 emitToken(94, node.pos);
                 emitOptional(" ", node.expression);
                 write(";");
@@ -26549,7 +27672,15 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(18, node.expression.end);
                 write(" ");
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps |= 2;
+                }
                 emitCaseBlock(node.caseBlock, endPos);
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
             }
             function emitCaseBlock(node, startPos) {
                 emitToken(15, startPos);
@@ -26560,16 +27691,16 @@ var ts;
                 emitToken(16, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, node2.end);
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
                 if (node.kind === 241) {
@@ -26619,10 +27750,24 @@ var ts;
                 emitToken(76, node.pos);
                 write(";");
             }
-            function emitLabelledStatement(node) {
+            function emitLabelAndColon(node) {
                 emit(node.label);
                 write(": ");
+            }
+            function emitLabeledStatement(node) {
+                if (!ts.isIterationStatement(node.statement, false) || !shouldConvertLoopBody(node.statement)) {
+                    emitLabelAndColon(node);
+                }
+                if (convertedLoopState) {
+                    if (!convertedLoopState.labels) {
+                        convertedLoopState.labels = {};
+                    }
+                    convertedLoopState.labels[node.label.text] = node.label.text;
+                }
                 emit(node.statement);
+                if (convertedLoopState) {
+                    convertedLoopState.labels[node.label.text] = undefined;
+                }
             }
             function getContainingModule(node) {
                 do {
@@ -26636,7 +27781,7 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 1) {
+                if (ts.getCombinedNodeFlags(node) & 2) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
@@ -26658,9 +27803,9 @@ var ts;
             }
             function emitEs6ExportDefaultCompat(node) {
                 if (node.parent.kind === 248) {
-                    ts.Debug.assert(!!(node.flags & 1024) || node.kind === 227);
+                    ts.Debug.assert(!!(node.flags & 512) || node.kind === 227);
                     if (modulekind === 1 || modulekind === 2 || modulekind === 3) {
-                        if (!currentSourceFile.symbol.exports["___esModule"]) {
+                        if (!isEs6Module) {
                             if (languageVersion === 1) {
                                 write("Object.defineProperty(exports, \"__esModule\", { value: true });");
                                 writeLine();
@@ -26674,12 +27819,12 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 1) {
+                if (node.flags & 2) {
                     writeLine();
                     emitStart(node);
                     if (modulekind === 4 && node.parent === currentSourceFile) {
                         write(exportFunctionForFile + "(\"");
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             write("default");
                         }
                         else {
@@ -26690,7 +27835,7 @@ var ts;
                         write(")");
                     }
                     else {
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0) {
                                 write("exports[\"default\"]");
@@ -26778,7 +27923,7 @@ var ts;
                 var emitCount = 0;
                 var canDefineTempVariablesInPlace = false;
                 if (root.kind === 211) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 1;
+                    var isExported = ts.getCombinedNodeFlags(root) & 2;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
@@ -26823,12 +27968,18 @@ var ts;
                     return node;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
-                    var syntheticName = ts.createSynthesizedNode(propName.kind);
-                    syntheticName.text = propName.text;
-                    if (syntheticName.kind !== 69) {
-                        return createElementAccessExpression(object, syntheticName);
+                    var index;
+                    var nameIsComputed = propName.kind === 136;
+                    if (nameIsComputed) {
+                        index = ensureIdentifier(propName.expression, false);
                     }
-                    return createPropertyAccessExpression(object, syntheticName);
+                    else {
+                        index = ts.createSynthesizedNode(propName.kind);
+                        index.text = propName.text;
+                    }
+                    return !nameIsComputed && index.kind === 69
+                        ? createPropertyAccessExpression(object, index)
+                        : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
                     var call = ts.createSynthesizedNode(168);
@@ -26844,8 +27995,8 @@ var ts;
                     if (properties.length !== 1) {
                         value = ensureIdentifier(value, true);
                     }
-                    for (var _a = 0; _a < properties.length; _a++) {
-                        var p = properties[_a];
+                    for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
+                        var p = properties_5[_a];
                         if (p.kind === 245 || p.kind === 246) {
                             var propName = p.name;
                             var target_1 = p.kind === 246 ? p : p.initializer || propName;
@@ -26963,9 +28114,9 @@ var ts;
                 else {
                     var initializer = node.initializer;
                     if (!initializer && languageVersion < 2) {
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 16384) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 16384);
-                        if (isUninitializedLet &&
+                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384) &&
+                            (getCombinedFlagsForIdentifier(node.name) & 8192);
+                        if (isLetDefinedInLoop &&
                             node.parent.parent.kind !== 200 &&
                             node.parent.parent.kind !== 201) {
                             initializer = createVoidZero();
@@ -27003,13 +28154,13 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 1) &&
+                return !!(node.flags & 2) &&
                     modulekind === 5 &&
                     node.parent.kind === 248;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 1) {
+                if (node.flags & 2) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
                         startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
@@ -27033,7 +28184,7 @@ var ts;
                 }
             }
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
-                if (!(node.flags & 1)) {
+                if (!(node.flags & 2)) {
                     return true;
                 }
                 if (isES6ExportedDeclaration(node)) {
@@ -27050,12 +28201,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_24 = createTempVariable(0);
+                        var name_25 = createTempVariable(0);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_24);
-                        emit(name_24);
+                        tempParameters.push(name_25);
+                        emit(name_25);
                     }
                     else {
                         emit(node.name);
@@ -27190,7 +28341,7 @@ var ts;
                 if (!shouldEmitAsArrowFunction(node)) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             write("default ");
                         }
                     }
@@ -27242,7 +28393,6 @@ var ts;
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
                 var isArrowFunction = node.kind === 174;
                 var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096) !== 0;
-                var args;
                 if (!isArrowFunction) {
                     write(" {");
                     increaseIndent();
@@ -27292,9 +28442,11 @@ var ts;
                 }
             }
             function emitSignatureAndBody(node) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -27315,6 +28467,8 @@ var ts;
                 if (!isES6ExportedDeclaration(node)) {
                     emitExportMemberAssignment(node);
                 }
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -27325,7 +28479,7 @@ var ts;
                 emitRestParameter(node);
             }
             function emitExpressionFunctionBody(node, body) {
-                if (languageVersion < 2 || node.flags & 512) {
+                if (languageVersion < 2 || node.flags & 256) {
                     emitDownLevelExpressionFunctionBody(node, body);
                     return;
                 }
@@ -27341,7 +28495,7 @@ var ts;
                 scopeEmitStart(node);
                 increaseIndent();
                 var outPos = writer.getTextPos();
-                emitDetachedComments(node.body);
+                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
@@ -27377,7 +28531,7 @@ var ts;
                 scopeEmitStart(node);
                 var initialTextPos = writer.getTextPos();
                 increaseIndent();
-                emitDetachedComments(body.statements);
+                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
                 var startIndex = emitDirectivePrologues(body.statements, true);
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
@@ -27419,7 +28573,7 @@ var ts;
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 112) {
+                    if (param.flags & 56) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -27451,15 +28605,15 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 141 && isStatic === ((member.flags & 128) !== 0) && member.initializer) {
+                    if (member.kind === 141 && isStatic === ((member.flags & 64) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
                 return properties;
             }
             function emitPropertyDeclarations(node, properties) {
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var property = properties[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var property = properties_6[_a];
                     emitPropertyDeclaration(node, property);
                 }
             }
@@ -27472,7 +28626,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 128) {
+                    if (property.flags & 64) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -27571,7 +28725,7 @@ var ts;
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 128) {
+                        if (member.flags & 64) {
                             write("static ");
                         }
                         if (member.kind === 145) {
@@ -27595,13 +28749,17 @@ var ts;
                 }
             }
             function emitConstructor(node, baseTypeElement) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
                 emitConstructorWorker(node, baseTypeElement);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -27612,7 +28770,7 @@ var ts;
                     if (member.kind === 144 && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    if (member.kind === 141 && member.initializer && (member.flags & 128) === 0) {
+                    if (member.kind === 141 && member.initializer && (member.flags & 64) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -27649,7 +28807,7 @@ var ts;
                 increaseIndent();
                 if (ctor) {
                     startIndex = emitDirectivePrologues(ctor.body.statements, true);
-                    emitDetachedComments(ctor.body.statements);
+                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
                 }
                 emitCaptureThisForNodeIfNecessary(node);
                 var superCall;
@@ -27720,7 +28878,7 @@ var ts;
                 var thisNodeIsDecorated = ts.nodeIsDecorated(node);
                 if (node.kind === 214) {
                     if (thisNodeIsDecorated) {
-                        if (isES6ExportedDeclaration(node) && !(node.flags & 1024)) {
+                        if (isES6ExportedDeclaration(node) && !(node.flags & 512)) {
                             write("export ");
                         }
                         write("let ");
@@ -27729,7 +28887,7 @@ var ts;
                     }
                     else if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             write("default ");
                         }
                     }
@@ -27745,7 +28903,7 @@ var ts;
                     write(" = ");
                 }
                 write("class");
-                if ((node.name || (node.flags & 1024 && staticProperties.length > 0)) && !thisNodeIsDecorated) {
+                if ((node.name || (node.flags & 512 && staticProperties.length > 0)) && !thisNodeIsDecorated) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -27768,8 +28926,8 @@ var ts;
                     write(";");
                 }
                 if (isClassExpressionWithStaticProperties) {
-                    for (var _a = 0; _a < staticProperties.length; _a++) {
-                        var property = staticProperties[_a];
+                    for (var _a = 0, staticProperties_1 = staticProperties; _a < staticProperties_1.length; _a++) {
+                        var property = staticProperties_1[_a];
                         write(",");
                         writeLine();
                         emitPropertyDeclaration(node, property, tempVariable, true);
@@ -27785,7 +28943,7 @@ var ts;
                     emitPropertyDeclarations(node, staticProperties);
                     emitDecoratorsOfClass(node);
                 }
-                if (!isES6ExportedDeclaration(node) && (node.flags & 1)) {
+                if (!isES6ExportedDeclaration(node) && (node.flags & 2)) {
                     writeLine();
                     emitStart(node);
                     emitModuleMemberName(node);
@@ -27794,7 +28952,7 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                else if (isES6ExportedDeclaration(node) && (node.flags & 1024) && thisNodeIsDecorated) {
+                else if (isES6ExportedDeclaration(node) && (node.flags & 512) && thisNodeIsDecorated) {
                     writeLine();
                     write("export default ");
                     emitDeclarationName(node);
@@ -27819,6 +28977,8 @@ var ts;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
                 var saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                var saveConvertedLoopState = convertedLoopState;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -27846,6 +29006,8 @@ var ts;
                 });
                 write(";");
                 emitTempDeclarations(true);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -27870,13 +29032,13 @@ var ts;
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 128)) {
+                if (!(member.flags & 64)) {
                     write(".prototype");
                 }
             }
             function emitDecoratorsOfClass(node) {
                 emitDecoratorsOfMembers(node, 0);
-                emitDecoratorsOfMembers(node, 128);
+                emitDecoratorsOfMembers(node, 64);
                 emitDecoratorsOfConstructor(node);
             }
             function emitDecoratorsOfConstructor(node) {
@@ -27911,7 +29073,7 @@ var ts;
             function emitDecoratorsOfMembers(node, staticFlag) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.flags & 128) !== staticFlag) {
+                    if ((member.flags & 64) !== staticFlag) {
                         continue;
                     }
                     if (!ts.nodeCanBeDecorated(member)) {
@@ -28238,7 +29400,7 @@ var ts;
                     return;
                 }
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
-                    if (!(node.flags & 1) || isES6ExportedDeclaration(node)) {
+                    if (!(node.flags & 2) || isES6ExportedDeclaration(node)) {
                         emitStart(node);
                         if (isES6ExportedDeclaration(node)) {
                             write("export ");
@@ -28269,7 +29431,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 1 && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 2 && !shouldHoistDeclarationInSystemJsModule(node)) {
                     writeLine();
                     emitStart(node);
                     write("var ");
@@ -28280,7 +29442,7 @@ var ts;
                     write(";");
                 }
                 if (modulekind !== 5 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 1)) {
+                    if (modulekind === 4 && (node.flags & 2)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -28356,11 +29518,15 @@ var ts;
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === 219) {
+                    var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
+                    convertedLoopState = undefined;
                     tempFlags = 0;
                     tempVariables = undefined;
                     emit(node.body);
+                    ts.Debug.assert(convertedLoopState === undefined);
+                    convertedLoopState = saveConvertedLoopState;
                     tempFlags = saveTempFlags;
                     tempVariables = saveTempVariables;
                 }
@@ -28378,7 +29544,7 @@ var ts;
                     scopeEmitEnd();
                 }
                 write(")(");
-                if ((node.flags & 1) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 2) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -28388,7 +29554,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 1)) {
+                    if (modulekind === 4 && (node.flags & 2)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -28400,8 +29566,8 @@ var ts;
                 }
             }
             function tryRenameExternalModule(moduleName) {
-                if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                    return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\"";
+                if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) {
+                    return "\"" + renamedDependencies[moduleName.text] + "\"";
                 }
                 return undefined;
             }
@@ -28486,7 +29652,7 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 221 && (node.flags & 1) !== 0;
+                    var isExportedImport = node.kind === 221 && (node.flags & 2) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
                     if (modulekind !== 2) {
                         emitLeadingComments(node);
@@ -28541,7 +29707,7 @@ var ts;
                     return;
                 }
                 if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     var variableDeclarationIsHoisted = shouldHoistVariable(node, true);
@@ -28552,7 +29718,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 1)) {
+                        else if (!(node.flags & 2)) {
                             write("var ");
                         }
                     }
@@ -28640,8 +29806,8 @@ var ts;
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
                 ts.Debug.assert(modulekind === 5);
                 var needsComma = false;
-                for (var _a = 0; _a < specifiers.length; _a++) {
-                    var specifier = specifiers[_a];
+                for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
+                    var specifier = specifiers_1[_a];
                     if (shouldEmit(specifier)) {
                         if (needsComma) {
                             write(", ");
@@ -28725,8 +29891,8 @@ var ts;
                             else {
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_25 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_25] || (exportSpecifiers[name_25] = [])).push(specifier);
+                                    var name_26 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_26] || (exportSpecifiers[name_26] = [])).push(specifier);
                                 }
                             }
                             break;
@@ -28753,7 +29919,7 @@ var ts;
             function getLocalNameForExternalImport(node) {
                 var namespaceDeclaration = getNamespaceDeclarationNode(node);
                 if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
+                    return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
                 if (node.kind === 222 && node.importClause) {
                     return getGeneratedNameForNode(node);
@@ -28775,8 +29941,8 @@ var ts;
                 }
                 writeLine();
                 var started = false;
-                for (var _a = 0; _a < externalImports.length; _a++) {
-                    var importNode = externalImports[_a];
+                for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
+                    var importNode = externalImports_1[_a];
                     var skipNode = importNode.kind === 228 ||
                         (importNode.kind === 222 && !importNode.importClause);
                     if (skipNode) {
@@ -28801,8 +29967,8 @@ var ts;
                 }
                 if (!exportedDeclarations && ts.isEmpty(exportSpecifiers)) {
                     var hasExportDeclarationWithExportClause = false;
-                    for (var _a = 0; _a < externalImports.length; _a++) {
-                        var externalImport = externalImports[_a];
+                    for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
+                        var externalImport = externalImports_2[_a];
                         if (externalImport.kind === 228 && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
@@ -28830,8 +29996,8 @@ var ts;
                         }
                     }
                 }
-                for (var _d = 0; _d < externalImports.length; _d++) {
-                    var externalImport = externalImports[_d];
+                for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
+                    var externalImport = externalImports_3[_d];
                     if (externalImport.kind !== 228) {
                         continue;
                     }
@@ -28875,7 +30041,7 @@ var ts;
                     return exportStarFunction;
                 }
                 function writeExportedName(node) {
-                    if (node.kind !== 69 && node.flags & 1024) {
+                    if (node.kind !== 69 && node.flags & 512) {
                         return;
                     }
                     if (started) {
@@ -28906,11 +30072,11 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; ++i) {
                         var local = hoistedVars[i];
-                        var name_26 = local.kind === 69
+                        var name_27 = local.kind === 69
                             ? local
                             : local.name;
-                        if (name_26) {
-                            var text = ts.unescapeIdentifier(name_26.text);
+                        if (name_27) {
+                            var text = ts.unescapeIdentifier(name_27.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -28928,7 +30094,7 @@ var ts;
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 ? local.parent : local);
-                        if (flags & 1) {
+                        if (flags & 2) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -28938,11 +30104,11 @@ var ts;
                     write(";");
                 }
                 if (hoistedFunctionDeclarations) {
-                    for (var _a = 0; _a < hoistedFunctionDeclarations.length; _a++) {
-                        var f = hoistedFunctionDeclarations[_a];
+                    for (var _a = 0, hoistedFunctionDeclarations_1 = hoistedFunctionDeclarations; _a < hoistedFunctionDeclarations_1.length; _a++) {
+                        var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 1) {
+                        if (f.flags & 2) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -28952,7 +30118,7 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 2) {
+                    if (node.flags & 4) {
                         return;
                     }
                     if (node.kind === 213) {
@@ -28989,15 +30155,15 @@ var ts;
                     }
                     if (node.kind === 211 || node.kind === 163) {
                         if (shouldHoistVariable(node, false)) {
-                            var name_27 = node.name;
-                            if (name_27.kind === 69) {
+                            var name_28 = node.name;
+                            if (name_28.kind === 69) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_27);
+                                hoistedVars.push(name_28);
                             }
                             else {
-                                ts.forEachChild(name_27, visit);
+                                ts.forEachChild(name_28, visit);
                             }
                         }
                         return;
@@ -29022,11 +30188,11 @@ var ts;
                 if (checkIfSourceFileLevelDecl && !shouldHoistDeclarationInSystemJsModule(node)) {
                     return false;
                 }
-                return (ts.getCombinedNodeFlags(node) & 49152) === 0 ||
+                return (ts.getCombinedNodeFlags(node) & 24576) === 0 ||
                     ts.getEnclosingBlockScopeContainer(node).kind === 248;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 && ts.isExternalModule(currentSourceFile);
+                return modulekind === 4 && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 emitVariableDeclarationsForImports();
@@ -29057,8 +30223,8 @@ var ts;
                     var parameterName = makeUniqueName(ts.forEach(group, getLocalNameForExternalImport) || "");
                     write("function (" + parameterName + ") {");
                     increaseIndent();
-                    for (var _a = 0; _a < group.length; _a++) {
-                        var entry = group[_a];
+                    for (var _a = 0, group_1 = group; _a < group_1.length; _a++) {
+                        var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
                             case 222:
@@ -29139,15 +30305,19 @@ var ts;
                 writeLine();
                 write("}");
             }
-            function emitSystemModule(node) {
+            function writeModuleName(node, emitRelativePathAsModuleName) {
+                var moduleName = node.moduleName;
+                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
+                    write("\"" + moduleName + "\", ");
+                }
+            }
+            function emitSystemModule(node, emitRelativePathAsModuleName) {
                 collectExternalModuleInfo(node);
                 ts.Debug.assert(!exportFunctionForFile);
                 exportFunctionForFile = makeUniqueName("exports");
                 writeLine();
                 write("System.register(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
+                writeModuleName(node, emitRelativePathAsModuleName);
                 write("[");
                 var groupIndices = {};
                 var dependencyGroups = [];
@@ -29165,6 +30335,12 @@ var ts;
                     if (i !== 0) {
                         write(", ");
                     }
+                    if (emitRelativePathAsModuleName) {
+                        var name_29 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]);
+                        if (name_29) {
+                            text = "\"" + name_29 + "\"";
+                        }
+                    }
                     write(text);
                 }
                 write("], function(" + exportFunctionForFile + ") {");
@@ -29178,7 +30354,7 @@ var ts;
                 writeLine();
                 write("});");
             }
-            function getAMDDependencyNames(node, includeNonAmdDependencies) {
+            function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
                 var aliasedModuleNames = [];
                 var unaliasedModuleNames = [];
                 var importAliasNames = [];
@@ -29192,9 +30368,15 @@ var ts;
                         unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
                     }
                 }
-                for (var _c = 0; _c < externalImports.length; _c++) {
-                    var importNode = externalImports[_c];
+                for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
+                    var importNode = externalImports_4[_c];
                     var externalModuleName = getExternalModuleNameText(importNode);
+                    if (emitRelativePathAsModuleName) {
+                        var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                        if (name_30) {
+                            externalModuleName = "\"" + name_30 + "\"";
+                        }
+                    }
                     var importAliasName = getLocalNameForExternalImport(importNode);
                     if (includeNonAmdDependencies && importAliasName) {
                         aliasedModuleNames.push(externalModuleName);
@@ -29206,8 +30388,8 @@ var ts;
                 }
                 return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
             }
-            function emitAMDDependencies(node, includeNonAmdDependencies) {
-                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies);
+            function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
+                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
                 emitAMDDependencyList(dependencyNames);
                 write(", ");
                 emitAMDFactoryHeader(dependencyNames);
@@ -29234,15 +30416,13 @@ var ts;
                 }
                 write(") {");
             }
-            function emitAMDModule(node) {
+            function emitAMDModule(node, emitRelativePathAsModuleName) {
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 writeLine();
                 write("define(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
-                emitAMDDependencies(node, true);
+                writeModuleName(node, emitRelativePathAsModuleName);
+                emitAMDDependencies(node, true, emitRelativePathAsModuleName);
                 increaseIndent();
                 var startIndex = emitDirectivePrologues(node.statements, true);
                 emitExportStarHelper();
@@ -29446,10 +30626,15 @@ var ts;
             function emitSourceFileNode(node) {
                 writeLine();
                 emitShebang();
-                emitDetachedComments(node);
+                emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                    var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1];
-                    emitModule(node);
+                    if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1];
+                        emitModule(node);
+                    }
+                    else {
+                        bundleEmitDelegates[modulekind](node, true);
+                    }
                 }
                 else {
                     var startIndex = emitDirectivePrologues(node.statements, false);
@@ -29469,7 +30654,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 2) {
+                    if (node.flags & 4) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -29654,7 +30839,7 @@ var ts;
                     case 242:
                         return emitCaseOrDefaultClause(node);
                     case 207:
-                        return emitLabelledStatement(node);
+                        return emitLabeledStatement(node);
                     case 208:
                         return emitThrowStatement(node);
                     case 209:
@@ -29693,7 +30878,7 @@ var ts;
                 return detachedCommentsInfo !== undefined && ts.lastOrUndefined(detachedCommentsInfo).nodePos === pos;
             }
             function getLeadingCommentsWithoutDetachedComments() {
-                var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
+                var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
                 if (detachedCommentsInfo.length - 1) {
                     detachedCommentsInfo.pop();
                 }
@@ -29702,15 +30887,11 @@ var ts;
                 }
                 return leadingComments;
             }
-            function isPinnedComments(comment) {
-                return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 33;
-            }
             function isTripleSlashComment(comment) {
-                if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 &&
+                if (currentText.charCodeAt(comment.pos + 1) === 47 &&
                     comment.pos + 2 < comment.end &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 47) {
-                    var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end);
+                    currentText.charCodeAt(comment.pos + 2) === 47) {
+                    var textSubStr = currentText.substring(comment.pos, comment.end);
                     return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) ||
                         textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ?
                         true : false;
@@ -29724,7 +30905,7 @@ var ts;
                             return getLeadingCommentsWithoutDetachedComments();
                         }
                         else {
-                            return ts.getLeadingCommentRangesOfNode(node, currentSourceFile);
+                            return ts.getLeadingCommentRangesOfNodeFromText(node, currentText);
                         }
                     }
                 }
@@ -29732,7 +30913,7 @@ var ts;
             function getTrailingCommentsToEmit(node) {
                 if (node.parent) {
                     if (node.parent.kind === 248 || node.end !== node.parent.end) {
-                        return ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
+                        return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
             }
@@ -29755,22 +30936,22 @@ var ts;
                         leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment);
             }
             function emitTrailingComments(node) {
                 if (compilerOptions.removeComments) {
                     return;
                 }
                 var trailingComments = getTrailingCommentsToEmit(node);
-                ts.emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, false, newLine, writeComment);
             }
             function emitTrailingCommentsOfPosition(pos) {
                 if (compilerOptions.removeComments) {
                     return;
                 }
-                var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos);
-                ts.emitComments(currentSourceFile, writer, trailingComments, true, newLine, writeComment);
+                var trailingComments = ts.getTrailingCommentRanges(currentText, pos);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, true, newLine, writeComment);
             }
             function emitLeadingCommentsOfPositionWorker(pos) {
                 if (compilerOptions.removeComments) {
@@ -29781,59 +30962,29 @@ var ts;
                     leadingComments = getLeadingCommentsWithoutDetachedComments();
                 }
                 else {
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
+                    leadingComments = ts.getLeadingCommentRanges(currentText, pos);
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
-                ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment);
             }
-            function emitDetachedComments(node) {
-                var leadingComments;
-                if (compilerOptions.removeComments) {
-                    if (node.pos === 0) {
-                        leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComments);
+            function emitDetachedCommentsAndUpdateCommentsInfo(node) {
+                var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
+                if (currentDetachedCommentInfo) {
+                    if (detachedCommentsInfo) {
+                        detachedCommentsInfo.push(currentDetachedCommentInfo);
                     }
-                }
-                else {
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
-                }
-                if (leadingComments) {
-                    var detachedComments = [];
-                    var lastComment;
-                    ts.forEach(leadingComments, function (comment) {
-                        if (lastComment) {
-                            var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, lastComment.end);
-                            var commentLine = ts.getLineOfLocalPosition(currentSourceFile, comment.pos);
-                            if (commentLine >= lastCommentLine + 2) {
-                                return detachedComments;
-                            }
-                        }
-                        detachedComments.push(comment);
-                        lastComment = comment;
-                    });
-                    if (detachedComments.length) {
-                        var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end);
-                        var nodeLine = ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos));
-                        if (nodeLine >= lastCommentLine + 2) {
-                            ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                            ts.emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                            if (detachedCommentsInfo) {
-                                detachedCommentsInfo.push(currentDetachedCommentInfo);
-                            }
-                            else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
-                            }
-                        }
+                    else {
+                        detachedCommentsInfo = [currentDetachedCommentInfo];
                     }
                 }
             }
             function emitShebang() {
-                var shebang = ts.getShebang(currentSourceFile.text);
+                var shebang = ts.getShebang(currentText);
                 if (shebang) {
                     write(shebang);
                 }
             }
-            var _a;
+            var _a, _b;
         }
         function emitFile(jsFilePath, sourceFile) {
             emitJavaScript(jsFilePath, sourceFile);
@@ -29889,11 +31040,11 @@ var ts;
         if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
             var failedLookupLocations = [];
             var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+            var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             if (resolvedFileName) {
                 return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
             }
-            resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+            resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             return resolvedFileName
                 ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
                 : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
@@ -29903,8 +31054,8 @@ var ts;
         }
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function loadNodeModuleFromFile(candidate, failedLookupLocation, host) {
-        return ts.forEach(ts.moduleFileExtensions, tryLoad);
+    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) {
+        return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
             if (host.fileExists(fileName)) {
@@ -29916,7 +31067,7 @@ var ts;
             }
         }
     }
-    function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
         if (host.fileExists(packageJsonPath)) {
             var jsonContent;
@@ -29928,7 +31079,7 @@ var ts;
                 jsonContent = { typings: undefined };
             }
             if (jsonContent.typings) {
-                var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
+                var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
                 if (result) {
                     return result;
                 }
@@ -29937,7 +31088,7 @@ var ts;
         else {
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host);
+        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host);
     }
     function loadModuleFromNodeModules(moduleName, directory, host) {
         var failedLookupLocations = [];
@@ -29947,11 +31098,11 @@ var ts;
             if (baseName !== "node_modules") {
                 var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
                 var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+                var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
-                result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+                result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
@@ -29976,9 +31127,10 @@ var ts;
         var searchName;
         var failedLookupLocations = [];
         var referencedSourceFile;
+        var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions;
         while (true) {
             searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) {
+            referencedSourceFile = ts.forEach(extensions, function (extension) {
                 if (extension === ".tsx" && !compilerOptions.jsx) {
                     return undefined;
                 }
@@ -30006,14 +31158,11 @@ var ts;
     ts.classicNameResolver = classicNameResolver;
     ts.defaultInitCompilerOptions = {
         module: 1,
-        target: 0,
+        target: 1,
         noImplicitAny: false,
-        outDir: "built",
-        rootDir: ".",
         sourceMap: false
     };
     function createCompilerHost(options, setParentNodes) {
-        var currentDirectory;
         var existingDirectories = {};
         function getCanonicalFileName(fileName) {
             return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
@@ -30071,7 +31220,7 @@ var ts;
             getSourceFile: getSourceFile,
             getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
+            getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
             getCanonicalFileName: getCanonicalFileName,
             getNewLine: function () { return newLine; },
@@ -30123,10 +31272,12 @@ var ts;
         var skipDefaultLib = options.noLib;
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
+        var currentDirectory = host.getCurrentDirectory();
         var resolveModuleNamesWorker = host.resolveModuleNames
             ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
             : (function (moduleNames, containingFile) { return ts.map(moduleNames, function (moduleName) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; }); });
-        var filesByName = ts.createFileMap(function (fileName) { return host.getCanonicalFileName(fileName); });
+        var filesByName = ts.createFileMap();
+        var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
         if (oldProgram) {
             var oldOptions = oldProgram.getCompilerOptions();
             if ((oldOptions.module !== options.module) ||
@@ -30161,7 +31312,7 @@ var ts;
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
             getCommonSourceDirectory: function () { return commonSourceDirectory; },
             emit: emit,
-            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            getCurrentDirectory: function () { return currentDirectory; },
             getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
@@ -30173,8 +31324,8 @@ var ts;
             if (!classifiableNames) {
                 getTypeChecker();
                 classifiableNames = {};
-                for (var _i = 0; _i < files.length; _i++) {
-                    var sourceFile = files[_i];
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var sourceFile = files_3[_i];
                     ts.copyMap(sourceFile.classifiableNames, classifiableNames);
                 }
             }
@@ -30190,6 +31341,7 @@ var ts;
                 return false;
             }
             var newSourceFiles = [];
+            var filePaths = [];
             var modifiedSourceFiles = [];
             for (var _i = 0, _a = oldProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var oldSourceFile = _a[_i];
@@ -30197,6 +31349,8 @@ var ts;
                 if (!newSourceFile) {
                     return false;
                 }
+                newSourceFile.path = oldSourceFile.path;
+                filePaths.push(newSourceFile.path);
                 if (oldSourceFile !== newSourceFile) {
                     if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
                         return false;
@@ -30210,7 +31364,7 @@ var ts;
                     }
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(newSourceFile.imports, function (name) { return name.text; });
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFile.fileName);
+                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
                         for (var i = 0; i < moduleNames.length; ++i) {
                             var newResolution = resolutions[i];
                             var oldResolution = ts.getResolvedModule(oldSourceFile, moduleNames[i]);
@@ -30232,14 +31386,13 @@ var ts;
                 }
                 newSourceFiles.push(newSourceFile);
             }
-            for (var _b = 0; _b < newSourceFiles.length; _b++) {
-                var file = newSourceFiles[_b];
-                filesByName.set(file.fileName, file);
+            for (var i = 0, len = newSourceFiles.length; i < len; ++i) {
+                filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _c = 0; _c < modifiedSourceFiles.length; _c++) {
-                var modifiedFile = modifiedSourceFiles[_c];
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
             oldProgram.structureIsReused = true;
@@ -30247,10 +31400,10 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return {
-                getCanonicalFileName: function (fileName) { return host.getCanonicalFileName(fileName); },
+                getCanonicalFileName: getCanonicalFileName,
                 getCommonSourceDirectory: program.getCommonSourceDirectory,
                 getCompilerOptions: program.getCompilerOptions,
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
@@ -30278,7 +31431,7 @@ var ts;
             return emitResult;
         }
         function getSourceFile(fileName) {
-            return filesByName.get(fileName) || filesByName.get(ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory()));
+            return filesByName.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
         }
         function getDiagnosticsHelper(sourceFile, getDiagnostics, cancellationToken) {
             if (sourceFile) {
@@ -30364,35 +31517,47 @@ var ts;
             if (file.imports) {
                 return;
             }
+            var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var imports;
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var node = _a[_i];
-                collect(node, true);
+                collect(node, true, false);
             }
             file.imports = imports || emptyArray;
-            function collect(node, allowRelativeModuleNames) {
-                switch (node.kind) {
-                    case 222:
-                    case 221:
-                    case 228:
-                        var moduleNameExpr = ts.getExternalModuleName(node);
-                        if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
+            return;
+            function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) {
+                if (!collectOnlyRequireCalls) {
+                    switch (node.kind) {
+                        case 222:
+                        case 221:
+                        case 228:
+                            var moduleNameExpr = ts.getExternalModuleName(node);
+                            if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
+                                break;
+                            }
+                            if (!moduleNameExpr.text) {
+                                break;
+                            }
+                            if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
+                                (imports || (imports = [])).push(moduleNameExpr);
+                            }
                             break;
-                        }
-                        if (!moduleNameExpr.text) {
+                        case 218:
+                            if (node.name.kind === 9 && (node.flags & 4 || ts.isDeclarationFile(file))) {
+                                ts.forEachChild(node.body, function (node) {
+                                    collect(node, false, collectOnlyRequireCalls);
+                                });
+                            }
                             break;
-                        }
-                        if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
-                            (imports || (imports = [])).push(moduleNameExpr);
-                        }
-                        break;
-                    case 218:
-                        if (node.name.kind === 9 && (node.flags & 2 || ts.isDeclarationFile(file))) {
-                            ts.forEachChild(node.body, function (node) {
-                                collect(node, false);
-                            });
-                        }
-                        break;
+                    }
+                }
+                if (isJavaScriptFile) {
+                    if (ts.isRequireCall(node)) {
+                        (imports || (imports = [])).push(node.arguments[0]);
+                    }
+                    else {
+                        ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, true); });
+                    }
                 }
             }
         }
@@ -30404,7 +31569,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + ts.supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -30414,13 +31579,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -30436,14 +31601,20 @@ var ts;
                 }
             }
         }
-        function findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
-            if (filesByName.contains(fileName)) {
-                return getSourceFileFromCache(fileName, false);
+        function reportFileNamesDifferOnlyInCasingError(fileName, existingFileName, refFile, refPos, refEnd) {
+            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
-            var normalizedAbsolutePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+            else {
+                fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+        }
+        function findSourceFile(fileName, normalizedAbsolutePath, isDefaultLib, refFile, refPos, refEnd) {
             if (filesByName.contains(normalizedAbsolutePath)) {
-                var file_1 = getSourceFileFromCache(normalizedAbsolutePath, true);
-                filesByName.set(fileName, file_1);
+                var file_1 = filesByName.get(normalizedAbsolutePath);
+                if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== normalizedAbsolutePath) {
+                    reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
+                }
                 return file_1;
             }
             var file = host.getSourceFile(fileName, options.target, function (hostErrorMessage) {
@@ -30454,17 +31625,25 @@ var ts;
                     fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
                 }
             });
-            filesByName.set(fileName, file);
+            filesByName.set(normalizedAbsolutePath, file);
             if (file) {
+                file.path = normalizedAbsolutePath;
+                if (host.useCaseSensitiveFileNames()) {
+                    var existingFile = filesByNameIgnoreCase.get(normalizedAbsolutePath);
+                    if (existingFile) {
+                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
+                    }
+                    else {
+                        filesByNameIgnoreCase.set(normalizedAbsolutePath, file);
+                    }
+                }
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
-                filesByName.set(normalizedAbsolutePath, file);
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
                     processReferencedFiles(file, basePath);
                 }
                 processImportedModules(file, basePath);
                 if (isDefaultLib) {
-                    file.isDefaultLib = true;
                     files.unshift(file);
                 }
                 else {
@@ -30472,21 +31651,6 @@ var ts;
                 }
             }
             return file;
-            function getSourceFileFromCache(fileName, useAbsolutePath) {
-                var file = filesByName.get(fileName);
-                if (file && host.useCaseSensitiveFileNames()) {
-                    var sourceFileName = useAbsolutePath ? ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()) : file.fileName;
-                    if (ts.normalizeSlashes(fileName) !== ts.normalizeSlashes(sourceFileName)) {
-                        if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                            fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                        else {
-                            fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                    }
-                }
-                return file;
-            }
         }
         function processReferencedFiles(file, basePath) {
             ts.forEach(file.referencedFiles, function (ref) {
@@ -30494,26 +31658,25 @@ var ts;
                 processSourceFile(referencedFileName, false, file, ref.pos, ref.end);
             });
         }
+        function getCanonicalFileName(fileName) {
+            return host.getCanonicalFileName(fileName);
+        }
         function processImportedModules(file, basePath) {
             collectExternalModuleReferences(file);
             if (file.imports.length) {
                 file.resolvedModules = {};
                 var moduleNames = ts.map(file.imports, function (name) { return name.text; });
-                var resolutions = resolveModuleNamesWorker(moduleNames, file.fileName);
+                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
                 for (var i = 0; i < file.imports.length; ++i) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
                     if (resolution && !options.noResolve) {
-                        var importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             if (!ts.isExternalModule(importedFile)) {
                                 var start_2 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_2, file.imports[i].end - start_2, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
-                            else if (!ts.fileExtensionIs(importedFile.fileName, ".d.ts")) {
-                                var start_3 = ts.getTokenPosOfNode(file.imports[i], file);
-                                fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_3, file.imports[i].end - start_3, ts.Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
-                            }
                             else if (importedFile.referencedFiles.length) {
                                 var firstRef = importedFile.referencedFiles[0];
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, ts.Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
@@ -30526,13 +31689,9 @@ var ts;
                 file.resolvedModules = undefined;
             }
             return;
-            function findModuleSourceFile(fileName, nameLiteral) {
-                return findSourceFile(fileName, false, file, ts.skipTrivia(file.text, nameLiteral.pos), nameLiteral.end);
-            }
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var commonPathComponents;
-            var currentDirectory = host.getCurrentDirectory();
             ts.forEach(files, function (sourceFile) {
                 if (ts.isDeclarationFile(sourceFile)) {
                     return;
@@ -30557,15 +31716,17 @@ var ts;
                     commonPathComponents.length = sourcePathComponents.length;
                 }
             });
+            if (!commonPathComponents) {
+                return currentDirectory;
+            }
             return ts.getNormalizedPathFromPathComponents(commonPathComponents);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
-                var currentDirectory = host.getCurrentDirectory();
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+                    var sourceFile = sourceFiles_1[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -30625,7 +31786,7 @@ var ts;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
                 if (!options.module && languageVersion < 2) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher));
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
                 if (firstNonExternalModuleSourceFile) {
@@ -30638,14 +31799,16 @@ var ts;
                 programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided));
             }
             if (options.module === 5 && languageVersion < 2) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
+            }
+            if (outFile && options.module && !(options.module === 2 || options.module === 4)) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             if (options.outDir ||
                 options.sourceRoot ||
-                (options.mapRoot &&
-                    (!outFile || firstExternalModuleSourceFile !== undefined))) {
+                options.mapRoot) {
                 if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
-                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, host.getCurrentDirectory());
+                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
                     commonSourceDirectory = computeCommonSourceDirectory(files);
@@ -30752,9 +31915,9 @@ var ts;
                 "es6": 5,
                 "es2015": 5
             },
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6,
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
             paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6
+            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
         },
         {
             name: "newLine",
@@ -30822,6 +31985,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
+        {
+            name: "pretty",
+            paramType: ts.Diagnostics.KIND,
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
         {
             name: "project",
             shortName: "p",
@@ -30884,9 +32053,9 @@ var ts;
                 "es6": 2,
                 "es2015": 2
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
             paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES6
+            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
         },
         {
             name: "version",
@@ -30919,6 +32088,31 @@ var ts;
             },
             description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
             error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         }
     ];
     var optionNameMapCache;
@@ -31045,64 +32239,38 @@ var ts;
     ts.readConfigFile = readConfigFile;
     function parseConfigFileTextToJson(fileName, jsonText) {
         try {
-            return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} };
+            var jsonTextWithoutComments = removeComments(jsonText);
+            return { config: /\S/.test(jsonTextWithoutComments) ? JSON.parse(jsonTextWithoutComments) : {} };
         }
         catch (e) {
             return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
         }
     }
     ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    function removeComments(jsonText) {
+        var output = "";
+        var scanner = ts.createScanner(1, false, 0, jsonText);
+        var token;
+        while ((token = scanner.scan()) !== 1) {
+            switch (token) {
+                case 2:
+                case 3:
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
     function parseJsonConfigFileContent(json, host, basePath) {
-        var errors = [];
+        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), options = _a.options, errors = _a.errors;
         return {
-            options: getCompilerOptions(),
+            options: options,
             fileNames: getFileNames(),
             errors: errors
         };
-        function getCompilerOptions() {
-            var options = {};
-            var optionNameMap = {};
-            ts.forEach(ts.optionDeclarations, function (option) {
-                optionNameMap[option.name] = option;
-            });
-            var jsonOptions = json["compilerOptions"];
-            if (jsonOptions) {
-                for (var id in jsonOptions) {
-                    if (ts.hasProperty(optionNameMap, id)) {
-                        var opt = optionNameMap[id];
-                        var optType = opt.type;
-                        var value = jsonOptions[id];
-                        var expectedType = typeof optType === "string" ? optType : "string";
-                        if (typeof value === expectedType) {
-                            if (typeof optType !== "string") {
-                                var key = value.toLowerCase();
-                                if (ts.hasProperty(optType, key)) {
-                                    value = optType[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                    value = 0;
-                                }
-                            }
-                            if (opt.isFilePath) {
-                                value = ts.normalizePath(ts.combinePaths(basePath, value));
-                                if (value === "") {
-                                    value = ".";
-                                }
-                            }
-                            options[opt.name] = value;
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-                    }
-                }
-            }
-            return options;
-        }
         function getFileNames() {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
@@ -31117,20 +32285,20 @@ var ts;
                 var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
                 var sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
                 for (var i = 0; i < sysFiles.length; i++) {
-                    var name_28 = sysFiles[i];
-                    if (ts.fileExtensionIs(name_28, ".d.ts")) {
-                        var baseName = name_28.substr(0, name_28.length - ".d.ts".length);
+                    var name_31 = sysFiles[i];
+                    if (ts.fileExtensionIs(name_31, ".d.ts")) {
+                        var baseName = name_31.substr(0, name_31.length - ".d.ts".length);
                         if (!ts.contains(sysFiles, baseName + ".tsx") && !ts.contains(sysFiles, baseName + ".ts")) {
-                            fileNames.push(name_28);
+                            fileNames.push(name_31);
                         }
                     }
-                    else if (ts.fileExtensionIs(name_28, ".ts")) {
-                        if (!ts.contains(sysFiles, name_28 + "x")) {
-                            fileNames.push(name_28);
+                    else if (ts.fileExtensionIs(name_31, ".ts")) {
+                        if (!ts.contains(sysFiles, name_31 + "x")) {
+                            fileNames.push(name_31);
                         }
                     }
                     else {
-                        fileNames.push(name_28);
+                        fileNames.push(name_31);
                     }
                 }
             }
@@ -31138,9 +32306,59 @@ var ts;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
+        var options = {};
+        var errors = [];
+        if (!jsonOptions) {
+            return { options: options, errors: errors };
+        }
+        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                var optType = opt.type;
+                var value = jsonOptions[id];
+                var expectedType = typeof optType === "string" ? optType : "string";
+                if (typeof value === expectedType) {
+                    if (typeof optType !== "string") {
+                        var key = value.toLowerCase();
+                        if (ts.hasProperty(optType, key)) {
+                            value = optType[key];
+                        }
+                        else {
+                            errors.push(ts.createCompilerDiagnostic(opt.error));
+                            value = 0;
+                        }
+                    }
+                    if (opt.isFilePath) {
+                        value = ts.normalizePath(ts.combinePaths(basePath, value));
+                        if (value === "") {
+                            value = ".";
+                        }
+                    }
+                    options[opt.name] = value;
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
+                }
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
+            }
+        }
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var reportDiagnostic = reportDiagnosticSimply;
+    function reportDiagnostics(diagnostics, host) {
+        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
+            var diagnostic = diagnostics_1[_i];
+            reportDiagnostic(diagnostic, host);
+        }
+    }
     function validateLocaleAndSetLanguage(locale, errors) {
         var matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
         if (!matchResult) {
@@ -31199,20 +32417,86 @@ var ts;
         var diagnostic = ts.createCompilerDiagnostic.apply(undefined, arguments);
         return diagnostic.messageText;
     }
-    function reportDiagnostic(diagnostic) {
+    function getRelativeFileName(fileName, host) {
+        return host ? ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); }) : fileName;
+    }
+    function reportDiagnosticSimply(diagnostic, host) {
         var output = "";
         if (diagnostic.file) {
-            var loc = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
-            output += diagnostic.file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + "): ";
+            var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
+            var relativeFileName = getRelativeFileName(diagnostic.file.fileName, host);
+            output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
         }
         var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
         output += category + " TS" + diagnostic.code + ": " + ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine) + ts.sys.newLine;
         ts.sys.write(output);
     }
-    function reportDiagnostics(diagnostics) {
-        for (var i = 0; i < diagnostics.length; i++) {
-            reportDiagnostic(diagnostics[i]);
+    var redForegroundEscapeSequence = "\u001b[91m";
+    var yellowForegroundEscapeSequence = "\u001b[93m";
+    var blueForegroundEscapeSequence = "\u001b[93m";
+    var gutterStyleSequence = "\u001b[100;30m";
+    var gutterSeparator = " ";
+    var resetEscapeSequence = "\u001b[0m";
+    var elipsis = "...";
+    var categoryFormatMap = (_a = {},
+        _a[ts.DiagnosticCategory.Warning] = yellowForegroundEscapeSequence,
+        _a[ts.DiagnosticCategory.Error] = redForegroundEscapeSequence,
+        _a[ts.DiagnosticCategory.Message] = blueForegroundEscapeSequence,
+        _a
+    );
+    function formatAndReset(text, formatStyle) {
+        return formatStyle + text + resetEscapeSequence;
+    }
+    function reportDiagnosticWithColorAndContext(diagnostic, host) {
+        var output = "";
+        if (diagnostic.file) {
+            var start = diagnostic.start, length_3 = diagnostic.length, file = diagnostic.file;
+            var _a = ts.getLineAndCharacterOfPosition(file, start), firstLine = _a.line, firstLineChar = _a.character;
+            var _b = ts.getLineAndCharacterOfPosition(file, start + length_3), lastLine = _b.line, lastLineChar = _b.character;
+            var lastLineInFile = ts.getLineAndCharacterOfPosition(file, file.text.length).line;
+            var relativeFileName = getRelativeFileName(file.fileName, host);
+            var hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
+            var gutterWidth = (lastLine + 1 + "").length;
+            if (hasMoreThanFiveLines) {
+                gutterWidth = Math.max(elipsis.length, gutterWidth);
+            }
+            output += ts.sys.newLine;
+            for (var i = firstLine; i <= lastLine; i++) {
+                if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
+                    output += formatAndReset(padLeft(elipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + ts.sys.newLine;
+                    i = lastLine - 1;
+                }
+                var lineStart = ts.getPositionOfLineAndCharacter(file, i, 0);
+                var lineEnd = i < lastLineInFile ? ts.getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
+                var lineContent = file.text.slice(lineStart, lineEnd);
+                lineContent = lineContent.replace(/\s+$/g, "");
+                lineContent = lineContent.replace("\t", " ");
+                output += formatAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
+                output += lineContent + ts.sys.newLine;
+                output += formatAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
+                output += redForegroundEscapeSequence;
+                if (i === firstLine) {
+                    var lastCharForLine = i === lastLine ? lastLineChar : undefined;
+                    output += lineContent.slice(0, firstLineChar).replace(/\S/g, " ");
+                    output += lineContent.slice(firstLineChar, lastCharForLine).replace(/./g, "~");
+                }
+                else if (i === lastLine) {
+                    output += lineContent.slice(0, lastLineChar).replace(/./g, "~");
+                }
+                else {
+                    output += lineContent.replace(/./g, "~");
+                }
+                output += resetEscapeSequence;
+                output += ts.sys.newLine;
+            }
+            output += ts.sys.newLine;
+            output += relativeFileName + "(" + (firstLine + 1) + "," + (firstLineChar + 1) + "): ";
         }
+        var categoryColor = categoryFormatMap[diagnostic.category];
+        var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
+        output += formatAndReset(category, categoryColor) + " TS" + diagnostic.code + ": " + ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine);
+        output += ts.sys.newLine + ts.sys.newLine;
+        ts.sys.write(output);
     }
     function reportWatchDiagnostic(diagnostic) {
         var output = new Date().toLocaleTimeString() + " - ";
@@ -31260,15 +32544,17 @@ var ts;
         var hostGetSourceFile;
         var timerHandleForRecompilation;
         var timerHandleForDirectoryChanges;
+        var cachedExistingFiles;
+        var hostFileExists;
         if (commandLine.options.locale) {
             if (!isJSONSupported()) {
-                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"));
+                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"), undefined);
                 return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             validateLocaleAndSetLanguage(commandLine.options.locale, commandLine.errors);
         }
         if (commandLine.errors.length > 0) {
-            reportDiagnostics(commandLine.errors);
+            reportDiagnostics(commandLine.errors, compilerHost);
             return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
         }
         if (commandLine.options.init) {
@@ -31276,7 +32562,7 @@ var ts;
             return ts.sys.exit(ts.ExitStatus.Success);
         }
         if (commandLine.options.version) {
-            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Version_0, ts.version));
+            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Version_0, ts.version), undefined);
             return ts.sys.exit(ts.ExitStatus.Success);
         }
         if (commandLine.options.help) {
@@ -31286,12 +32572,12 @@ var ts;
         }
         if (commandLine.options.project) {
             if (!isJSONSupported()) {
-                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--project"));
+                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--project"), undefined);
                 return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             configFileName = ts.normalizePath(ts.combinePaths(commandLine.options.project, "tsconfig.json"));
             if (commandLine.fileNames.length !== 0) {
-                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line));
+                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line), undefined);
                 return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
         }
@@ -31306,7 +32592,7 @@ var ts;
         }
         if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {
             if (!ts.sys.watchFile) {
-                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"));
+                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), undefined);
                 return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             if (configFileName) {
@@ -31330,11 +32616,22 @@ var ts;
                     return;
                 }
             }
+            if (!cachedConfigFileText) {
+                var error = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
+                reportDiagnostics([error], undefined);
+                ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
+                return;
+            }
             var result = ts.parseConfigFileTextToJson(configFileName, cachedConfigFileText);
             var configObject = result.config;
+            if (!configObject) {
+                reportDiagnostics([result.error], undefined);
+                ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
+                return;
+            }
             var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, ts.getDirectoryPath(configFileName));
             if (configParseResult.errors.length > 0) {
-                reportDiagnostics(configParseResult.errors);
+                reportDiagnostics(configParseResult.errors, undefined);
                 ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
@@ -31354,7 +32651,13 @@ var ts;
                 compilerHost = ts.createCompilerHost(compilerOptions);
                 hostGetSourceFile = compilerHost.getSourceFile;
                 compilerHost.getSourceFile = getSourceFile;
+                hostFileExists = compilerHost.fileExists;
+                compilerHost.fileExists = cachedFileExists;
             }
+            if (compilerOptions.pretty) {
+                reportDiagnostic = reportDiagnosticWithColorAndContext;
+            }
+            cachedExistingFiles = {};
             var compileResult = compile(rootFileNames, compilerOptions, compilerHost);
             if (!compilerOptions.watch) {
                 return ts.sys.exit(compileResult.exitStatus);
@@ -31362,6 +32665,12 @@ var ts;
             setCachedProgram(compileResult.program);
             reportWatchDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Compilation_complete_Watching_for_file_changes));
         }
+        function cachedFileExists(fileName) {
+            if (ts.hasProperty(cachedExistingFiles, fileName)) {
+                return cachedExistingFiles[fileName];
+            }
+            return cachedExistingFiles[fileName] = hostFileExists(fileName);
+        }
         function getSourceFile(fileName, languageVersion, onError) {
             if (cachedProgram) {
                 var sourceFile_1 = cachedProgram.getSourceFile(fileName);
@@ -31421,7 +32730,7 @@ var ts;
             var parsedCommandLine = parseConfigFile();
             var newFileNames = ts.map(parsedCommandLine.fileNames, compilerHost.getCanonicalFileName);
             var canonicalRootFileNames = ts.map(rootFileNames, compilerHost.getCanonicalFileName);
-            if (!ts.arrayStructurallyIsEqualTo(newFileNames, canonicalRootFileNames)) {
+            if (!ts.arrayIsEqualTo(newFileNames && newFileNames.sort(), canonicalRootFileNames && canonicalRootFileNames.sort())) {
                 setCachedProgram(undefined);
                 startTimerForRecompilation();
             }
@@ -31482,14 +32791,14 @@ var ts;
                     diagnostics = program.getSemanticDiagnostics();
                 }
             }
-            reportDiagnostics(diagnostics);
+            reportDiagnostics(diagnostics, compilerHost);
             if (compilerOptions.noEmit) {
                 return diagnostics.length
                     ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped
                     : ts.ExitStatus.Success;
             }
             var emitOutput = program.emit();
-            reportDiagnostics(emitOutput.diagnostics);
+            reportDiagnostics(emitOutput.diagnostics, compilerHost);
             if (emitOutput.emitSkipped) {
                 return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
             }
@@ -31562,9 +32871,9 @@ var ts;
     }
     function writeConfigFile(options, fileNames) {
         var currentDirectory = ts.sys.getCurrentDirectory();
-        var file = ts.combinePaths(currentDirectory, "tsconfig.json");
+        var file = ts.normalizePath(ts.combinePaths(currentDirectory, "tsconfig.json"));
         if (ts.sys.fileExists(file)) {
-            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file));
+            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file), undefined);
         }
         else {
             var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
@@ -31576,16 +32885,16 @@ var ts;
                 configurations.files = fileNames;
             }
             ts.sys.writeFile(file, JSON.stringify(configurations, undefined, 4));
-            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Successfully_created_a_tsconfig_json_file));
+            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Successfully_created_a_tsconfig_json_file), undefined);
         }
         return;
         function serializeCompilerOptions(options) {
             var result = {};
             var optionsNameMap = ts.getOptionNameMap().optionNameMap;
-            for (var name_29 in options) {
-                if (ts.hasProperty(options, name_29)) {
-                    var value = options[name_29];
-                    switch (name_29) {
+            for (var name_32 in options) {
+                if (ts.hasProperty(options, name_32)) {
+                    var value = options[name_32];
+                    switch (name_32) {
                         case "init":
                         case "watch":
                         case "version":
@@ -31593,17 +32902,17 @@ var ts;
                         case "project":
                             break;
                         default:
-                            var optionDefinition = optionsNameMap[name_29.toLowerCase()];
+                            var optionDefinition = optionsNameMap[name_32.toLowerCase()];
                             if (optionDefinition) {
                                 if (typeof optionDefinition.type === "string") {
-                                    result[name_29] = value;
+                                    result[name_32] = value;
                                 }
                                 else {
                                     var typeMap = optionDefinition.type;
                                     for (var key in typeMap) {
                                         if (ts.hasProperty(typeMap, key)) {
                                             if (typeMap[key] === value)
-                                                result[name_29] = key;
+                                                result[name_32] = key;
                                         }
                                     }
                                 }
@@ -31615,5 +32924,6 @@ var ts;
             return result;
         }
     }
+    var _a;
 })(ts || (ts = {}));
 ts.executeCommandLine(ts.sys.args);
diff --git a/lib/tsserver.js b/lib/tsserver.js
index 2832b8b535a..9f0c1674080 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -49,40 +49,49 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function createFileMap(getCanonicalFileName) {
+    function createFileMap(keyMapper) {
         var files = {};
         return {
             get: get,
             set: set,
             contains: contains,
             remove: remove,
-            clear: clear,
-            forEachValue: forEachValueInMap
+            forEachValue: forEachValueInMap,
+            clear: clear
         };
-        function set(fileName, value) {
-            files[normalizeKey(fileName)] = value;
-        }
-        function get(fileName) {
-            return files[normalizeKey(fileName)];
-        }
-        function contains(fileName) {
-            return hasProperty(files, normalizeKey(fileName));
-        }
-        function remove(fileName) {
-            var key = normalizeKey(fileName);
-            delete files[key];
-        }
         function forEachValueInMap(f) {
-            forEachValue(files, f);
+            for (var key in files) {
+                f(key, files[key]);
+            }
         }
-        function normalizeKey(key) {
-            return getCanonicalFileName(normalizeSlashes(key));
+        function get(path) {
+            return files[toKey(path)];
+        }
+        function set(path, value) {
+            files[toKey(path)] = value;
+        }
+        function contains(path) {
+            return hasProperty(files, toKey(path));
+        }
+        function remove(path) {
+            var key = toKey(path);
+            delete files[key];
         }
         function clear() {
             files = {};
         }
+        function toKey(path) {
+            return keyMapper ? keyMapper(path) : path;
+        }
     }
     ts.createFileMap = createFileMap;
+    function toPath(fileName, basePath, getCanonicalFileName) {
+        var nonCanonicalizedPath = isRootedDiskPath(fileName)
+            ? normalizePath(fileName)
+            : getNormalizedAbsolutePath(fileName, basePath);
+        return getCanonicalFileName(nonCanonicalizedPath);
+    }
+    ts.toPath = toPath;
     function forEach(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -97,8 +106,8 @@ var ts;
     ts.forEach = forEach;
     function contains(array, value) {
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
+                var v = array_1[_i];
                 if (v === value) {
                     return true;
                 }
@@ -121,8 +130,8 @@ var ts;
     function countWhere(array, predicate) {
         var count = 0;
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+                var v = array_2[_i];
                 if (predicate(v)) {
                     count++;
                 }
@@ -135,8 +144,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_3 = array; _i < array_3.length; _i++) {
+                var item = array_3[_i];
                 if (f(item)) {
                     result.push(item);
                 }
@@ -149,8 +158,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_4 = array; _i < array_4.length; _i++) {
+                var v = array_4[_i];
                 result.push(f(v));
             }
         }
@@ -169,8 +178,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                var item = array_5[_i];
                 if (!contains(result, item)) {
                     result.push(item);
                 }
@@ -181,8 +190,8 @@ var ts;
     ts.deduplicate = deduplicate;
     function sum(array, prop) {
         var result = 0;
-        for (var _i = 0; _i < array.length; _i++) {
-            var v = array[_i];
+        for (var _i = 0, array_6 = array; _i < array_6.length; _i++) {
+            var v = array_6[_i];
             result += v[prop];
         }
         return result;
@@ -190,8 +199,8 @@ var ts;
     ts.sum = sum;
     function addRange(to, from) {
         if (to && from) {
-            for (var _i = 0; _i < from.length; _i++) {
-                var v = from[_i];
+            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+                var v = from_1[_i];
                 to.push(v);
             }
         }
@@ -354,9 +363,9 @@ var ts;
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key]
+            ? ts.localizedDiagnosticMessages[message.key]
+            : message.message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
@@ -367,7 +376,7 @@ var ts;
             Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
             Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         }
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
         }
@@ -382,7 +391,7 @@ var ts;
     }
     ts.createFileDiagnostic = createFileDiagnostic;
     function createCompilerDiagnostic(message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
             text = formatStringFromArgs(text, arguments, 1);
         }
@@ -397,7 +406,7 @@ var ts;
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
     function chainDiagnosticMessages(details, message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
             text = formatStringFromArgs(text, arguments, 2);
         }
@@ -512,8 +521,8 @@ var ts;
     function getNormalizedParts(normalizedSlashedPath, rootLength) {
         var parts = normalizedSlashedPath.substr(rootLength).split(ts.directorySeparator);
         var normalized = [];
-        for (var _i = 0; _i < parts.length; _i++) {
-            var part = parts[_i];
+        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+            var part = parts_1[_i];
             if (part !== ".") {
                 if (part === ".." && normalized.length > 0 && lastOrUndefined(normalized) !== "..") {
                     normalized.pop();
@@ -656,13 +665,13 @@ var ts;
     }
     ts.fileExtensionIs = fileExtensionIs;
     ts.supportedExtensions = [".ts", ".tsx", ".d.ts"];
-    ts.moduleFileExtensions = ts.supportedExtensions;
+    ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx");
     function isSupportedSourceFileName(fileName) {
         if (!fileName) {
             return false;
         }
-        for (var _i = 0; _i < ts.supportedExtensions.length; _i++) {
-            var extension = ts.supportedExtensions[_i];
+        for (var _i = 0, supportedExtensions_1 = ts.supportedExtensions; _i < supportedExtensions_1.length; _i++) {
+            var extension = supportedExtensions_1[_i];
             if (fileExtensionIs(fileName, extension)) {
                 return true;
             }
@@ -672,8 +681,8 @@ var ts;
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
     var extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
     function removeFileExtension(path) {
-        for (var _i = 0; _i < extensionsToRemove.length; _i++) {
-            var ext = extensionsToRemove[_i];
+        for (var _i = 0, extensionsToRemove_1 = extensionsToRemove; _i < extensionsToRemove_1.length; _i++) {
+            var ext = extensionsToRemove_1[_i];
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
             }
@@ -707,19 +716,16 @@ var ts;
     }
     function Signature(checker) {
     }
+    function Node(kind, pos, end) {
+        this.kind = kind;
+        this.pos = pos;
+        this.end = end;
+        this.flags = 0;
+        this.parent = undefined;
+    }
     ts.objectAllocator = {
-        getNodeConstructor: function (kind) {
-            function Node() {
-            }
-            Node.prototype = {
-                kind: kind,
-                pos: -1,
-                end: -1,
-                flags: 0,
-                parent: undefined
-            };
-            return Node;
-        },
+        getNodeConstructor: function () { return Node; },
+        getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
@@ -737,6 +743,7 @@ var ts;
                 if (verboseDebugInfo) {
                     verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
                 }
+                debugger;
                 throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
             }
         }
@@ -748,9 +755,10 @@ var ts;
     })(Debug = ts.Debug || (ts.Debug = {}));
     function copyListRemovingItem(item, list) {
         var copiedList = [];
-        for (var i = 0, len = list.length; i < len; i++) {
-            if (list[i] !== item) {
-                copiedList.push(list[i]);
+        for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
+            var e = list_1[_i];
+            if (e !== item) {
+                copiedList.push(e);
             }
         }
         return copiedList;
@@ -834,16 +842,16 @@ var ts;
                 function visitDirectory(path) {
                     var folder = fso.GetFolder(path || ".");
                     var files = getNames(folder.files);
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+                        var current = files_1[_i];
                         var name_1 = ts.combinePaths(path, current);
                         if ((!extension || ts.fileExtensionIs(name_1, extension)) && !ts.contains(exclude, getCanonicalPath(name_1))) {
                             result.push(name_1);
                         }
                     }
                     var subfolders = getNames(folder.subfolders);
-                    for (var _a = 0; _a < subfolders.length; _a++) {
-                        var current = subfolders[_a];
+                    for (var _a = 0, subfolders_1 = subfolders; _a < subfolders_1.length; _a++) {
+                        var current = subfolders_1[_a];
                         var name_2 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_2))) {
                             visitDirectory(name_2);
@@ -894,6 +902,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _tty = require("tty");
             function createWatchedFileSet(interval, chunkSize) {
                 if (interval === void 0) { interval = 2500; }
                 if (chunkSize === void 0) { chunkSize = 30; }
@@ -993,7 +1002,16 @@ var ts;
                 if (writeByteOrderMark) {
                     data = "\uFEFF" + data;
                 }
-                _fs.writeFileSync(fileName, data, "utf8");
+                var fd;
+                try {
+                    fd = _fs.openSync(fileName, "w");
+                    _fs.writeSync(fd, data, undefined, "utf8");
+                }
+                finally {
+                    if (fd !== undefined) {
+                        _fs.closeSync(fd);
+                    }
+                }
             }
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path.toLowerCase() : path;
@@ -1006,8 +1024,8 @@ var ts;
                 function visitDirectory(path) {
                     var files = _fs.readdirSync(path || ".").sort();
                     var directories = [];
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
+                        var current = files_2[_i];
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -1021,8 +1039,8 @@ var ts;
                             }
                         }
                     }
-                    for (var _a = 0; _a < directories.length; _a++) {
-                        var current = directories[_a];
+                    for (var _a = 0, directories_1 = directories; _a < directories_1.length; _a++) {
+                        var current = directories_1[_a];
                         visitDirectory(current);
                     }
                 }
@@ -1032,14 +1050,7 @@ var ts;
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 write: function (s) {
-                    var buffer = new Buffer(s, "utf8");
-                    var offset = 0;
-                    var toWrite = buffer.length;
-                    var written = 0;
-                    while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
-                        offset += written;
-                        toWrite -= written;
-                    }
+                    process.stdout.write(s);
                 },
                 readFile: readFile,
                 writeFile: writeFile,
@@ -1053,7 +1064,7 @@ var ts;
                     };
                 },
                 watchDirectory: function (path, callback, recursive) {
-                    return _fs.watch(path, { persisten: true, recursive: !!recursive }, function (eventName, relativeFileName) {
+                    return _fs.watch(path, { persistent: true, recursive: !!recursive }, function (eventName, relativeFileName) {
                         if (eventName === "rename") {
                             callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(path, relativeFileName)));
                         }
@@ -1106,624 +1117,634 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An index signature parameter type must be 'string' or 'number'." },
-        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a class element." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used in an ambient context." },
-        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with a class declaration." },
-        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used here." },
-        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a module element." },
-        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a valid async function return type." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An async function or method must have a valid awaitable return type." },
-        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand for 'await' does not have a valid callable 'then' member." },
-        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return expression in async function does not have a valid callable 'then' member." },
-        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression body for async arrow function does not have a valid callable 'then' member." },
-        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum member must have initializer." },
-        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
-        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a namespace." },
-        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In ambient enum declarations member initializer must be constant expression." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression expected." },
-        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum member expected." },
-        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration expected." },
-        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An object member cannot be declared optional." },
-        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A 'yield' expression is only allowed in a generator body." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A destructuring declaration must have an initializer." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An import declaration cannot have modifiers." },
-        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no default export." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
-        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line terminator not permitted before arrow." },
-        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
-        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
-        Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules into 'es6' when targeting 'ES5' or lower." },
-        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators are not valid here." },
-        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
-        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
-        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
-        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A class declaration without the 'default' modifier must have a name" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
-        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Modules are automatically in strict mode." },
-        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
-        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators are only available when targeting ECMAScript 6 or higher." },
-        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators are not allowed in an ambient context." },
-        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An overload signature cannot be declared as a generator." },
-        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "'{0}' tag already specified." },
-        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature '{0}' must have a type predicate." },
-        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot find parameter '{0}'." },
-        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type predicate '{0}' is not assignable to '{1}'." },
-        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' is not in the same position as parameter '{1}'." },
-        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A type predicate is only allowed in return type position for functions and methods." },
-        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference a rest parameter." },
-        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference element '{0}' in a binding pattern." },
-        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An export assignment can only be used in a module." },
-        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An import declaration can only be used in a namespace or module." },
-        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An export declaration can only be used in a module." },
-        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An ambient module declaration is only allowed at the top level in a file." },
-        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A namespace declaration is only allowed in a namespace or module." },
-        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The return type of a property decorator function must be either 'void' or 'any'." },
-        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The return type of a parameter decorator function must be either 'void' or 'any'." },
-        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of class decorator when called as an expression." },
-        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of parameter decorator when called as an expression." },
-        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of property decorator when called as an expression." },
-        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "'abstract' modifier can only appear on a class or method declaration." },
-        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with '{1}' modifier." },
-        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract methods can only appear within an abstract class." },
-        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method '{0}' cannot have an implementation because it is marked abstract." },
-        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in an async function block." },
-        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "'await' expression is only allowed within an async function." },
-        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async functions are only available when targeting ECMAScript 6 and higher." },
-        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "'=' can only be used in an object literal property inside a destructuring assignment." },
-        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
-        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not a module." },
-        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot find module '{0}'." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a module or namespace body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
-        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient modules cannot be nested in other modules or namespaces." },
-        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...of' statement." },
-        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
-        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An iterator must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
-        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
-        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type or a string type." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
-        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
-        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
-        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An interface can only extend an identifier/qualified-name with optional type arguments." },
-        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A class can only implement an identifier/qualified-name with optional type arguments." },
-        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A rest element cannot contain a binding pattern." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own type annotation." },
-        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot find namespace '{0}'." },
-        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No best common type exists among yield expressions." },
-        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A generator cannot have a 'void' type annotation." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own base expression." },
-        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a constructor function type." },
-        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No base constructor has the specified number of type arguments." },
-        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base constructor return type '{0}' is not a class or interface type." },
-        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base constructors must all have the same return type." },
-        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be abstract or not abstract." },
-        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
-        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes containing abstract methods must be marked abstract." },
-        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
-        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All declarations of an abstract method must be consecutive." },
-        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
-        Only_an_ambient_class_can_be_merged_with_an_interface: { code: 2518, category: ts.DiagnosticCategory.Error, key: "Only an ambient class can be merged with an interface." },
-        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
-        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
-        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
-        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "'yield' expressions cannot be used in a parameter initializer." },
-        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "'await' expressions cannot be used in a parameter initializer." },
-        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer provides no value for this binding element and the binding element has no default value." },
-        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A 'this' type is available only in a non-static member of a class or interface." },
-        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
-        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A module cannot have multiple default exports." },
-        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX element attributes type '{0}' must be an object type." },
-        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The return type of a JSX element constructor must return an object type." },
-        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
-        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
-        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' does not have any construct or call signatures." },
-        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' is not a constructor function for JSX elements." },
-        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of JSX spread attribute is not assignable to target property." },
-        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX element class does not support attributes because it does not have a '{0}' property" },
-        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The global type 'JSX.{0}' may not have more than one property" },
-        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot emit namespaced JSX elements in React" },
-        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
-        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
-        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
-        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition: { code: 2655, category: ts.DiagnosticCategory.Error, key: "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: ts.DiagnosticCategory.Error, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported file encoding." },
-        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed to parse file '{0}': {1}." },
-        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could not write file '{0}': {1}" },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher." },
-        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
-        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified without specifying option '{1}'." },
-        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified with option '{1}'." },
-        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A 'tsconfig.json' file is already defined at: '{0}'." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs if any errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es6'" },
-        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax: {0}" },
-        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options" },
-        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file" },
-        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options:" },
-        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND" },
-        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE" },
-        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION" },
-        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es6'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES6: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File '{0}' not found." },
-        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
-        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
-        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
-        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument for '--jsx' must be 'preserve' or 'react'." },
-        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 decorators." },
-        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for emitting type metadata for decorators." },
-        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
-        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes a TypeScript project and creates a tsconfig.json file." },
-        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully created a tsconfig.json file." },
-        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress excess property checks for object literals." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
-        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
-        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "'import ... =' can only be used in a .ts file." },
-        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "'export=' can only be used in a .ts file." },
-        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "'type parameter declarations' can only be used in a .ts file." },
-        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "'implements clauses' can only be used in a .ts file." },
-        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "'interface declarations' can only be used in a .ts file." },
-        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "'module declarations' can only be used in a .ts file." },
-        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "'type aliases' can only be used in a .ts file." },
-        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "'{0}' can only be used in a .ts file." },
-        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "'types' can only be used in a .ts file." },
-        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "'type arguments' can only be used in a .ts file." },
-        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "'parameter modifiers' can only be used in a .ts file." },
-        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "'property declarations' can only be used in a .ts file." },
-        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "'enum declarations' can only be used in a .ts file." },
-        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "'decorators' can only be used in a .ts file." },
-        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
-        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "'class' expressions are not currently supported." },
-        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX attributes must only be assigned a non-empty 'expression'." },
-        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX elements cannot have multiple attributes with the same name." },
-        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." },
-        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX attribute expected." },
-        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." },
-        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A constructor cannot contain a 'super' call when its class extends 'null'" },
-        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
+        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated_string_literal_1002", message: "Unterminated string literal." },
+        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_1003", message: "Identifier expected." },
+        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "_0_expected_1005", message: "'{0}' expected." },
+        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A_file_cannot_have_a_reference_to_itself_1006", message: "A file cannot have a reference to itself." },
+        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing_comma_not_allowed_1009", message: "Trailing comma not allowed." },
+        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "Asterisk_Slash_expected_1010", message: "'*/' expected." },
+        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_1012", message: "Unexpected token." },
+        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_last_in_a_parameter_list_1014", message: "A rest parameter must be last in a parameter list." },
+        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter_cannot_have_question_mark_and_initializer_1015", message: "Parameter cannot have question mark and initializer." },
+        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A_required_parameter_cannot_follow_an_optional_parameter_1016", message: "A required parameter cannot follow an optional parameter." },
+        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An_index_signature_cannot_have_a_rest_parameter_1017", message: "An index signature cannot have a rest parameter." },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018", message: "An index signature parameter cannot have an accessibility modifier." },
+        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_a_question_mark_1019", message: "An index signature parameter cannot have a question mark." },
+        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_initializer_1020", message: "An index signature parameter cannot have an initializer." },
+        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
+        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
+        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
+        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
+        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
+        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_class_element_1031", message: "'{0}' modifier cannot appear on a class element." },
+        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "super_must_be_followed_by_an_argument_list_or_member_access_1034", message: "'super' must be followed by an argument list or member access." },
+        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only_ambient_modules_can_use_quoted_names_1035", message: "Only ambient modules can use quoted names." },
+        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements_are_not_allowed_in_ambient_contexts_1036", message: "Statements are not allowed in ambient contexts." },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038", message: "A 'declare' modifier cannot be used in an already ambient context." },
+        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers_are_not_allowed_in_ambient_contexts_1039", message: "Initializers are not allowed in ambient contexts." },
+        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_in_an_ambient_context_1040", message: "'{0}' modifier cannot be used in an ambient context." },
+        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
+        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
+        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
+        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
+        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
+        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_have_an_initializer_1048", message: "A rest parameter cannot have an initializer." },
+        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_must_have_exactly_one_parameter_1049", message: "A 'set' accessor must have exactly one parameter." },
+        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_an_optional_parameter_1051", message: "A 'set' accessor cannot have an optional parameter." },
+        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
+        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
+        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
+        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
+        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
+        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
+        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return_expression_in_async_function_does_not_have_a_valid_callable_then_member_1059", message: "Return expression in async function does not have a valid callable 'then' member." },
+        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member_1060", message: "Expression body for async arrow function does not have a valid callable 'then' member." },
+        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
+        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
+        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
+        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
+        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_be_declared_in_an_ambient_context_1086", message: "An accessor cannot be declared in an ambient context." },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_constructor_declaration_1089", message: "'{0}' modifier cannot appear on a constructor declaration." },
+        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_parameter_1090", message: "'{0}' modifier cannot appear on a parameter." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091", message: "Only a single variable declaration is allowed in a 'for...in' statement." },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type_parameters_cannot_appear_on_a_constructor_declaration_1092", message: "Type parameters cannot appear on a constructor declaration." },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type_annotation_cannot_appear_on_a_constructor_declaration_1093", message: "Type annotation cannot appear on a constructor declaration." },
+        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_have_type_parameters_1094", message: "An accessor cannot have type parameters." },
+        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_a_return_type_annotation_1095", message: "A 'set' accessor cannot have a return type annotation." },
+        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_exactly_one_parameter_1096", message: "An index signature must have exactly one parameter." },
+        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "_0_list_cannot_be_empty_1097", message: "'{0}' list cannot be empty." },
+        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type_parameter_list_cannot_be_empty_1098", message: "Type parameter list cannot be empty." },
+        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type_argument_list_cannot_be_empty_1099", message: "Type argument list cannot be empty." },
+        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_in_strict_mode_1100", message: "Invalid use of '{0}' in strict mode." },
+        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_strict_mode_1101", message: "'with' statements are not allowed in strict mode." },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "delete_cannot_be_called_on_an_identifier_in_strict_mode_1102", message: "'delete' cannot be called on an identifier in strict mode." },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104", message: "A 'continue' statement can only be used within an enclosing iteration statement." },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105", message: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
+        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump_target_cannot_cross_function_boundary_1107", message: "Jump target cannot cross function boundary." },
+        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A_return_statement_can_only_be_used_within_a_function_body_1108", message: "A 'return' statement can only be used within a function body." },
+        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression_expected_1109", message: "Expression expected." },
+        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type_expected_1110", message: "Type expected." },
+        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A_class_member_cannot_be_declared_optional_1112", message: "A class member cannot be declared optional." },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", message: "A 'default' clause cannot appear more than once in a 'switch' statement." },
+        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate_label_0_1114", message: "Duplicate label '{0}'" },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", message: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116", message: "A 'break' statement can only jump to a label of an enclosing statement." },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117", message: "An object literal cannot have multiple properties with the same name in strict mode." },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118", message: "An object literal cannot have multiple get/set accessors with the same name." },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119", message: "An object literal cannot have property and accessor with the same name." },
+        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_have_modifiers_1120", message: "An export assignment cannot have modifiers." },
+        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_allowed_in_strict_mode_1121", message: "Octal literals are not allowed in strict mode." },
+        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A_tuple_type_element_list_cannot_be_empty_1122", message: "A tuple type element list cannot be empty." },
+        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_list_cannot_be_empty_1123", message: "Variable declaration list cannot be empty." },
+        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit_expected_1124", message: "Digit expected." },
+        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal_digit_expected_1125", message: "Hexadecimal digit expected." },
+        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected_end_of_text_1126", message: "Unexpected end of text." },
+        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid_character_1127", message: "Invalid character." },
+        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration_or_statement_expected_1128", message: "Declaration or statement expected." },
+        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement_expected_1129", message: "Statement expected." },
+        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "case_or_default_expected_1130", message: "'case' or 'default' expected." },
+        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property_or_signature_expected_1131", message: "Property or signature expected." },
+        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum_member_expected_1132", message: "Enum member expected." },
+        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_expected_1134", message: "Variable declaration expected." },
+        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument_expression_expected_1135", message: "Argument expression expected." },
+        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property_assignment_expected_1136", message: "Property assignment expected." },
+        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression_or_comma_expected_1137", message: "Expression or comma expected." },
+        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter_declaration_expected_1138", message: "Parameter declaration expected." },
+        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type_parameter_declaration_expected_1139", message: "Type parameter declaration expected." },
+        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type_argument_expected_1140", message: "Type argument expected." },
+        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
+        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
+        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
+        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
+        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
+        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_1148", message: "Cannot compile modules unless the '--module' flag is provided." },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
+        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
+        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "const_declarations_can_only_be_declared_inside_a_block_1156", message: "'const' declarations can only be declared inside a block." },
+        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "let_declarations_can_only_be_declared_inside_a_block_1157", message: "'let' declarations can only be declared inside a block." },
+        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated_template_literal_1160", message: "Unterminated template literal." },
+        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated_regular_expression_literal_1161", message: "Unterminated regular expression literal." },
+        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An_object_member_cannot_be_declared_optional_1162", message: "An object member cannot be declared optional." },
+        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A_yield_expression_is_only_allowed_in_a_generator_body_1163", message: "A 'yield' expression is only allowed in a generator body." },
+        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed_property_names_are_not_allowed_in_enums_1164", message: "Computed property names are not allowed in enums." },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol_1165", message: "A computed property name in an ambient context must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol_1166", message: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol_1168", message: "A computed property name in a method overload must directly refer to a built-in symbol." },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol_1169", message: "A computed property name in an interface must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol_1170", message: "A computed property name in a type literal must directly refer to a built-in symbol." },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A_comma_expression_is_not_allowed_in_a_computed_property_name_1171", message: "A comma expression is not allowed in a computed property name." },
+        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "extends_clause_already_seen_1172", message: "'extends' clause already seen." },
+        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "extends_clause_must_precede_implements_clause_1173", message: "'extends' clause must precede 'implements' clause." },
+        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes_can_only_extend_a_single_class_1174", message: "Classes can only extend a single class." },
+        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "implements_clause_already_seen_1175", message: "'implements' clause already seen." },
+        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface_declaration_cannot_have_implements_clause_1176", message: "Interface declaration cannot have 'implements' clause." },
+        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary_digit_expected_1177", message: "Binary digit expected." },
+        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal_digit_expected_1178", message: "Octal digit expected." },
+        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_expected_1179", message: "Unexpected token. '{' expected." },
+        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property_destructuring_pattern_expected_1180", message: "Property destructuring pattern expected." },
+        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array_element_destructuring_pattern_expected_1181", message: "Array element destructuring pattern expected." },
+        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A_destructuring_declaration_must_have_an_initializer_1182", message: "A destructuring declaration must have an initializer." },
+        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An_implementation_cannot_be_declared_in_ambient_contexts_1183", message: "An implementation cannot be declared in ambient contexts." },
+        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers_cannot_appear_here_1184", message: "Modifiers cannot appear here." },
+        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge_conflict_marker_encountered_1185", message: "Merge conflict marker encountered." },
+        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_have_an_initializer_1186", message: "A rest element cannot have an initializer." },
+        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_may_not_be_a_binding_pattern_1187", message: "A parameter property may not be a binding pattern." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188", message: "Only a single variable declaration is allowed in a 'for...of' statement." },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189", message: "The variable declaration of a 'for...in' statement cannot have an initializer." },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190", message: "The variable declaration of a 'for...of' statement cannot have an initializer." },
+        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_cannot_have_modifiers_1191", message: "An import declaration cannot have modifiers." },
+        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
+        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
+        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
+        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
+        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
+        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
+        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated_Unicode_escape_sequence_1199", message: "Unterminated Unicode escape sequence." },
+        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line_terminator_not_permitted_before_arrow_1200", message: "Line terminator not permitted before arrow." },
+        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk__1202", message: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
+        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_o_1203", message: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
+        Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower_1204", message: "Cannot compile modules into 'es2015' when targeting 'ES5' or lower." },
+        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators_are_not_valid_here_1206", message: "Decorators are not valid here." },
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", message: "Decorators cannot be applied to multiple get/set accessors of the same name." },
+        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", message: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
+        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", message: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
+        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", message: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
+        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", message: "A class declaration without the 'default' modifier must have a name" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", message: "Identifier expected. '{0}' is a reserved word in strict mode" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213", message: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
+        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
+        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
+        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
+        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
+        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "_0_tag_already_specified_1223", message: "'{0}' tag already specified." },
+        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature_0_must_have_a_type_predicate_1224", message: "Signature '{0}' must have a type predicate." },
+        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
+        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
+        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
+        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
+        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
+        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
+        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", message: "An import declaration can only be used in a namespace or module." },
+        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_can_only_be_used_in_a_module_1233", message: "An export declaration can only be used in a module." },
+        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", message: "An ambient module declaration is only allowed at the top level in a file." },
+        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235", message: "A namespace declaration is only allowed in a namespace or module." },
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236", message: "The return type of a property decorator function must be either 'void' or 'any'." },
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237", message: "The return type of a parameter decorator function must be either 'void' or 'any'." },
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238", message: "Unable to resolve signature of class decorator when called as an expression." },
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
+        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
+        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
+        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
+        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_an_async_function_block_1300", message: "'with' statements are not allowed in an async function block." },
+        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "await_expression_is_only_allowed_within_an_async_function_1308", message: "'await' expression is only allowed within an async function." },
+        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
+        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
+        The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
+        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
+        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular_definition_of_import_alias_0_2303", message: "Circular definition of import alias '{0}'." },
+        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_2304", message: "Cannot find name '{0}'." },
+        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_exported_member_1_2305", message: "Module '{0}' has no exported member '{1}'." },
+        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_a_module_2306", message: "File '{0}' is not a module." },
+        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot_find_module_0_2307", message: "Cannot find module '{0}'." },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", message: "An export assignment cannot be used in a module with other exported elements." },
+        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type_0_recursively_references_itself_as_a_base_type_2310", message: "Type '{0}' recursively references itself as a base type." },
+        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_extend_another_class_2311", message: "A class may only extend another class." },
+        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An_interface_may_only_extend_a_class_or_another_interface_2312", message: "An interface may only extend a class or another interface." },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list_2313", message: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
+        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic_type_0_requires_1_type_argument_s_2314", message: "Generic type '{0}' requires {1} type argument(s)." },
+        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_generic_2315", message: "Type '{0}' is not generic." },
+        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_be_a_class_or_interface_type_2316", message: "Global type '{0}' must be a class or interface type." },
+        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_have_1_type_parameter_s_2317", message: "Global type '{0}' must have {1} type parameter(s)." },
+        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_type_0_2318", message: "Cannot find global type '{0}'." },
+        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named_property_0_of_types_1_and_2_are_not_identical_2319", message: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface_0_cannot_simultaneously_extend_types_1_and_2_2320", message: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
+        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive_stack_depth_comparing_types_0_and_1_2321", message: "Excessive stack depth comparing types '{0}' and '{1}'." },
+        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_2322", message: "Type '{0}' is not assignable to type '{1}'." },
+        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property_0_is_missing_in_type_1_2324", message: "Property '{0}' is missing in type '{1}'." },
+        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_in_type_1_but_not_in_type_2_2325", message: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
+        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types_of_property_0_are_incompatible_2326", message: "Types of property '{0}' are incompatible." },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property_0_is_optional_in_type_1_but_required_in_type_2_2327", message: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
+        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types_of_parameters_0_and_1_are_incompatible_2328", message: "Types of parameters '{0}' and '{1}' are incompatible." },
+        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index_signature_is_missing_in_type_0_2329", message: "Index signature is missing in type '{0}'." },
+        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index_signatures_are_incompatible_2330", message: "Index signatures are incompatible." },
+        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_module_or_namespace_body_2331", message: "'this' cannot be referenced in a module or namespace body." },
+        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_current_location_2332", message: "'this' cannot be referenced in current location." },
+        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_constructor_arguments_2333", message: "'this' cannot be referenced in constructor arguments." },
+        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_static_property_initializer_2334", message: "'this' cannot be referenced in a static property initializer." },
+        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "super_can_only_be_referenced_in_a_derived_class_2335", message: "'super' can only be referenced in a derived class." },
+        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_constructor_arguments_2336", message: "'super' cannot be referenced in constructor arguments." },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337", message: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338", message: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
+        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_type_1_2339", message: "Property '{0}' does not exist on type '{1}'." },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340", message: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
+        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_and_only_accessible_within_class_1_2341", message: "Property '{0}' is private and only accessible within class '{1}'." },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342", message: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
+        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type_0_does_not_satisfy_the_constraint_1_2344", message: "Type '{0}' does not satisfy the constraint '{1}'." },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", message: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied_parameters_do_not_match_any_signature_of_call_target_2346", message: "Supplied parameters do not match any signature of call target." },
+        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped_function_calls_may_not_accept_type_arguments_2347", message: "Untyped function calls may not accept type arguments." },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", message: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
+        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
+        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
+        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371", message: "A parameter initializer is only allowed in a function or constructor implementation." },
+        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter_0_cannot_be_referenced_in_its_initializer_2372", message: "Parameter '{0}' cannot be referenced in its initializer." },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373", message: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
+        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate_string_index_signature_2374", message: "Duplicate string index signature." },
+        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate_number_index_signature_2375", message: "Duplicate number index signature." },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", message: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
+        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors_for_derived_classes_must_contain_a_super_call_2377", message: "Constructors for derived classes must contain a 'super' call." },
+        A_get_accessor_must_return_a_value: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_must_return_a_value_2378", message: "A 'get' accessor must return a value." },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", message: "Getter and setter accessors do not agree in visibility." },
+        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
+        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
+        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
+        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
+        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_be_static_2387", message: "Function overload must be static." },
+        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_not_be_static_2388", message: "Function overload must not be static." },
+        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function_implementation_name_must_be_0_2389", message: "Function implementation name must be '{0}'." },
+        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor_implementation_is_missing_2390", message: "Constructor implementation is missing." },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", message: "Function implementation is missing or not immediately following the declaration." },
+        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple_constructor_implementations_are_not_allowed_2392", message: "Multiple constructor implementations are not allowed." },
+        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate_function_implementation_2393", message: "Duplicate function implementation." },
+        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload_signature_is_not_compatible_with_function_implementation_2394", message: "Overload signature is not compatible with function implementation." },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", message: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", message: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", message: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", message: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", message: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402", message: "Expression resolves to '_super' that compiler uses to capture base class reference." },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
+        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
+        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All_symbols_within_a_with_block_will_be_resolved_to_any_2410", message: "All symbols within a 'with' block will be resolved to 'any'." },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411", message: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412", message: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413", message: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
+        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
+        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
+        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
+        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
+        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
+        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
+        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433", message: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
+        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434", message: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
+        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435", message: "Ambient modules cannot be nested in other modules or namespaces." },
+        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient_module_declaration_cannot_specify_relative_module_name_2436", message: "Ambient module declaration cannot specify relative module name." },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437", message: "Module '{0}' is hidden by a local declaration with the same name" },
+        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import_name_cannot_be_0_2438", message: "Import name cannot be '{0}'" },
+        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439", message: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
+        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import_declaration_conflicts_with_local_declaration_of_0_2440", message: "Import declaration conflicts with local declaration of '{0}'" },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
+        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types_have_separate_declarations_of_a_private_property_0_2442", message: "Types have separate declarations of a private property '{0}'." },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", message: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", message: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", message: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
+        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
+        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
+        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
+        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
+        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An_AMD_module_cannot_have_multiple_name_assignments_2458", message: "An AMD module cannot have multiple name assignments." },
+        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
+        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
+        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
+        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
+        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_a_computed_property_name_2466", message: "'super' cannot be referenced in a computed property name." },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467", message: "A computed property name cannot reference a type parameter from its containing type." },
+        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_value_0_2468", message: "Cannot find global value '{0}'." },
+        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The_0_operator_cannot_be_applied_to_type_symbol_2469", message: "The '{0}' operator cannot be applied to type 'symbol'." },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470", message: "'Symbol' reference does not refer to the global Symbol constructor object." },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471", message: "A computed property name of the form '{0}' must be of type 'symbol'." },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472", message: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
+        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum_declarations_must_all_be_const_or_non_const_2473", message: "Enum declarations must all be const or non-const." },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In_const_enum_declarations_member_initializer_must_be_constant_expression_2474", message: "In 'const' enum declarations member initializer must be constant expression." },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475", message: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476", message: "A const enum member can only be accessed using a string literal." },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477", message: "'const' enum member initializer was evaluated to a non-finite value." },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478", message: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
+        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_const_enum_1_2479", message: "Property '{0}' does not exist on 'const' enum '{1}'." },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480", message: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
+        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
+        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", message: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
+        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_identifier_0_in_catch_clause_2492", message: "Cannot redeclare identifier '{0}' in catch clause" },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2_2493", message: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494", message: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
+        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_or_a_string_type_2495", message: "Type '{0}' is not an array type or a string type." },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496", message: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
+        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct_2497", message: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
+        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498", message: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499", message: "An interface can only extend an identifier/qualified-name with optional type arguments." },
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500", message: "A class can only implement an identifier/qualified-name with optional type arguments." },
+        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_contain_a_binding_pattern_2501", message: "A rest element cannot contain a binding pattern." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502", message: "'{0}' is referenced directly or indirectly in its own type annotation." },
+        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot_find_namespace_0_2503", message: "Cannot find namespace '{0}'." },
+        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_yield_expressions_2504", message: "No best common type exists among yield expressions." },
+        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A_generator_cannot_have_a_void_type_annotation_2505", message: "A generator cannot have a 'void' type annotation." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506", message: "'{0}' is referenced directly or indirectly in its own base expression." },
+        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_constructor_function_type_2507", message: "Type '{0}' is not a constructor function type." },
+        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No_base_constructor_has_the_specified_number_of_type_arguments_2508", message: "No base constructor has the specified number of type arguments." },
+        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
+        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
+        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
+        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
+        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
+        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
+        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_abstract_method_must_be_consecutive_2516", message: "All declarations of an abstract method must be consecutive." },
+        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", message: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
+        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520", message: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
+        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521", message: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
+        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_2522", message: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
+        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523", message: "'yield' expressions cannot be used in a parameter initializer." },
+        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "await_expressions_cannot_be_used_in_a_parameter_initializer_2524", message: "'await' expressions cannot be used in a parameter initializer." },
+        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525", message: "Initializer provides no value for this binding element and the binding element has no default value." },
+        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
+        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
+        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_must_be_an_object_type_2600", message: "JSX element attributes type '{0}' must be an object type." },
+        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
+        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
+        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property_0_in_type_1_is_not_assignable_to_type_2_2603", message: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
+        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604", message: "JSX element type '{0}' does not have any construct or call signatures." },
+        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605", message: "JSX element type '{0}' is not a constructor function for JSX elements." },
+        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606", message: "Property '{0}' of JSX spread attribute is not assignable to target property." },
+        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607", message: "JSX element class does not support attributes because it does not have a '{0}' property" },
+        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The_global_type_JSX_0_may_not_have_more_than_one_property_2608", message: "The global type 'JSX.{0}' may not have more than one property" },
+        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot_emit_namespaced_JSX_elements_in_React_2650", message: "Cannot emit namespaced JSX elements in React" },
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", message: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
+        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", message: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
+        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653", message: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
+        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654", message: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
+        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656", message: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
+        JSX_expressions_must_have_one_parent_element: { code: 2657, category: ts.DiagnosticCategory.Error, key: "JSX_expressions_must_have_one_parent_element_2657", message: "JSX expressions must have one parent element" },
+        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006", message: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008", message: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010", message: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012", message: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014", message: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", message: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", message: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", message: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", message: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", message: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", message: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
+        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_private_name_1_4025", message: "Exported variable '{0}' has or is using private name '{1}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026", message: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027", message: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028", message: "Public static property '{0}' of exported class has or is using private name '{1}'." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029", message: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030", message: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031", message: "Public property '{0}' of exported class has or is using private name '{1}'." },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032", message: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033", message: "Property '{0}' of exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_4034", message: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1_4035", message: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_4036", message: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1_4037", message: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_externa_4038", message: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_4039", message: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0_4040", message: "Return type of public static property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_modul_4041", message: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_4042", message: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0_4043", message: "Return type of public property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044", message: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045", message: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046", message: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047", message: "Return type of call signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048", message: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049", message: "Return type of index signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050", message: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051", message: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052", message: "Return type of public static method from exported class has or is using private name '{0}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053", message: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054", message: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055", message: "Return type of public method from exported class has or is using private name '{0}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056", message: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057", message: "Return type of method from exported interface has or is using private name '{0}'." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058", message: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059", message: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_private_name_0_4060", message: "Return type of exported function has or is using private name '{0}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063", message: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064", message: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065", message: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066", message: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067", message: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070", message: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073", message: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074", message: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075", message: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076", message: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077", message: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
+        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
+        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
+        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
+        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported_file_encoding_5013", message: "Unsupported file encoding." },
+        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed_to_parse_file_0_Colon_1_5014", message: "Failed to parse file '{0}': {1}." },
+        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown_compiler_option_0_5023", message: "Unknown compiler option '{0}'." },
+        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_requires_a_value_of_type_1_5024", message: "Compiler option '{0}' requires a value of type {1}." },
+        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could_not_write_file_0_Colon_1_5033", message: "Could not write file '{0}': {1}" },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042", message: "Option 'project' cannot be mixed with source files on a command line." },
+        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047", message: "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher." },
+        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_prov_5051", message: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
+        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_without_specifying_option_1_5052", message: "Option '{0}' cannot be specified without specifying option '{1}'." },
+        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_with_option_1_5053", message: "Option '{0}' cannot be specified with option '{1}'." },
+        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054", message: "A 'tsconfig.json' file is already defined at: '{0}'." },
+        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
+        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
+        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
+        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
+        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_if_any_errors_were_reported_6008", message: "Do not emit outputs if any errors were reported." },
+        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
+        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
+        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
+        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
+        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile_the_project_in_the_given_directory_6020", message: "Compile the project in the given directory." },
+        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax_Colon_0_6023", message: "Syntax: {0}" },
+        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options_6024", message: "options" },
+        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file_6025", message: "file" },
+        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples_Colon_0_6026", message: "Examples: {0}" },
+        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options_Colon_6027", message: "Options:" },
+        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version_0_6029", message: "Version {0}" },
+        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert_command_line_options_and_files_from_a_file_6030", message: "Insert command line options and files from a file." },
+        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File_change_detected_Starting_incremental_compilation_6032", message: "File change detected. Starting incremental compilation..." },
+        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND_6034", message: "KIND" },
+        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE_6035", message: "FILE" },
+        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION_6036", message: "VERSION" },
+        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION_6037", message: "LOCATION" },
+        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY_6038", message: "DIRECTORY" },
+        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation_complete_Watching_for_file_changes_6042", message: "Compilation complete. Watching for file changes." },
+        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
+        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
+        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
+        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
+        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
+        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
+        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
+        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted_locale_file_0_6051", message: "Corrupted locale file {0}." },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052", message: "Raise error on expressions and declarations with an implied 'any' type." },
+        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File_0_not_found_6053", message: "File '{0}' not found." },
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
+        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
+        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
+        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
+        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
+        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
+        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
+        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
+        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
+        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
+        Stylize_errors_and_messages_using_color_and_context_experimental: { code: 6073, category: ts.DiagnosticCategory.Message, key: "Stylize_errors_and_messages_using_color_and_context_experimental_6073", message: "Stylize errors and messages using color and context. (experimental)" },
+        Do_not_report_errors_on_unused_labels: { code: 6074, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unused_labels_6074", message: "Do not report errors on unused labels." },
+        Report_error_when_not_all_code_paths_in_function_return_a_value: { code: 6075, category: ts.DiagnosticCategory.Message, key: "Report_error_when_not_all_code_paths_in_function_return_a_value_6075", message: "Report error when not all code paths in function return a value." },
+        Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
+        Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
+        Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
+        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
+        Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
+        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
+        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
+        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009", message: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010", message: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation_7016", message: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
+        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
+        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", message: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", message: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", message: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", message: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
+        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", message: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
+        Unreachable_code_detected: { code: 7027, category: ts.DiagnosticCategory.Error, key: "Unreachable_code_detected_7027", message: "Unreachable code detected." },
+        Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
+        Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
+        Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
+        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
+        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "export_can_only_be_used_in_a_ts_file_8003", message: "'export=' can only be used in a .ts file." },
+        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "type_parameter_declarations_can_only_be_used_in_a_ts_file_8004", message: "'type parameter declarations' can only be used in a .ts file." },
+        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "implements_clauses_can_only_be_used_in_a_ts_file_8005", message: "'implements clauses' can only be used in a .ts file." },
+        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "interface_declarations_can_only_be_used_in_a_ts_file_8006", message: "'interface declarations' can only be used in a .ts file." },
+        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "module_declarations_can_only_be_used_in_a_ts_file_8007", message: "'module declarations' can only be used in a .ts file." },
+        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "type_aliases_can_only_be_used_in_a_ts_file_8008", message: "'type aliases' can only be used in a .ts file." },
+        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "_0_can_only_be_used_in_a_ts_file_8009", message: "'{0}' can only be used in a .ts file." },
+        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "types_can_only_be_used_in_a_ts_file_8010", message: "'types' can only be used in a .ts file." },
+        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "type_arguments_can_only_be_used_in_a_ts_file_8011", message: "'type arguments' can only be used in a .ts file." },
+        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "parameter_modifiers_can_only_be_used_in_a_ts_file_8012", message: "'parameter modifiers' can only be used in a .ts file." },
+        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
+        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
+        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
+        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
+        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
+        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
+        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", message: "JSX elements cannot have multiple attributes with the same name." },
+        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected_corresponding_JSX_closing_tag_for_0_17002", message: "Expected corresponding JSX closing tag for '{0}'." },
+        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX_attribute_expected_17003", message: "JSX attribute expected." },
+        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004", message: "Cannot use JSX unless the '--jsx' flag is provided." },
+        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
+        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
+        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
     };
 })(ts || (ts = {}));
 var ts;
@@ -2136,7 +2157,7 @@ var ts;
     function getCommentRanges(text, pos, trailing) {
         var result;
         var collecting = trailing || pos === 0;
-        while (true) {
+        while (pos < text.length) {
             var ch = text.charCodeAt(pos);
             switch (ch) {
                 case 13:
@@ -2205,6 +2226,7 @@ var ts;
             }
             return result;
         }
+        return result;
     }
     function getLeadingCommentRanges(text, pos) {
         return getCommentRanges(text, pos, false);
@@ -2300,7 +2322,7 @@ var ts;
                     error(ts.Diagnostics.Digit_expected);
                 }
             }
-            return +(text.substring(start, end));
+            return "" + +(text.substring(start, end));
         }
         function scanOctalDigits() {
             var start = pos;
@@ -2692,7 +2714,7 @@ var ts;
                         return pos++, token = 36;
                     case 46:
                         if (isDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = "" + scanNumber();
+                            tokenValue = scanNumber();
                             return token = 8;
                         }
                         if (text.charCodeAt(pos + 1) === 46 && text.charCodeAt(pos + 2) === 46) {
@@ -2789,7 +2811,7 @@ var ts;
                     case 55:
                     case 56:
                     case 57:
-                        tokenValue = "" + scanNumber();
+                        tokenValue = scanNumber();
                         return token = 8;
                     case 58:
                         return pos++, token = 54;
@@ -3156,9 +3178,9 @@ var ts;
                 "es6": 5,
                 "es2015": 5
             },
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6,
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
             paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6
+            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
         },
         {
             name: "newLine",
@@ -3226,6 +3248,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
+        {
+            name: "pretty",
+            paramType: ts.Diagnostics.KIND,
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
         {
             name: "project",
             shortName: "p",
@@ -3288,9 +3316,9 @@ var ts;
                 "es6": 2,
                 "es2015": 2
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
             paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES6
+            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
         },
         {
             name: "version",
@@ -3323,6 +3351,31 @@ var ts;
             },
             description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
             error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         }
     ];
     var optionNameMapCache;
@@ -3449,64 +3502,38 @@ var ts;
     ts.readConfigFile = readConfigFile;
     function parseConfigFileTextToJson(fileName, jsonText) {
         try {
-            return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} };
+            var jsonTextWithoutComments = removeComments(jsonText);
+            return { config: /\S/.test(jsonTextWithoutComments) ? JSON.parse(jsonTextWithoutComments) : {} };
         }
         catch (e) {
             return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
         }
     }
     ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    function removeComments(jsonText) {
+        var output = "";
+        var scanner = ts.createScanner(1, false, 0, jsonText);
+        var token;
+        while ((token = scanner.scan()) !== 1) {
+            switch (token) {
+                case 2:
+                case 3:
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
     function parseJsonConfigFileContent(json, host, basePath) {
-        var errors = [];
+        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), options = _a.options, errors = _a.errors;
         return {
-            options: getCompilerOptions(),
+            options: options,
             fileNames: getFileNames(),
             errors: errors
         };
-        function getCompilerOptions() {
-            var options = {};
-            var optionNameMap = {};
-            ts.forEach(ts.optionDeclarations, function (option) {
-                optionNameMap[option.name] = option;
-            });
-            var jsonOptions = json["compilerOptions"];
-            if (jsonOptions) {
-                for (var id in jsonOptions) {
-                    if (ts.hasProperty(optionNameMap, id)) {
-                        var opt = optionNameMap[id];
-                        var optType = opt.type;
-                        var value = jsonOptions[id];
-                        var expectedType = typeof optType === "string" ? optType : "string";
-                        if (typeof value === expectedType) {
-                            if (typeof optType !== "string") {
-                                var key = value.toLowerCase();
-                                if (ts.hasProperty(optType, key)) {
-                                    value = optType[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                    value = 0;
-                                }
-                            }
-                            if (opt.isFilePath) {
-                                value = ts.normalizePath(ts.combinePaths(basePath, value));
-                                if (value === "") {
-                                    value = ".";
-                                }
-                            }
-                            options[opt.name] = value;
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-                    }
-                }
-            }
-            return options;
-        }
         function getFileNames() {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
@@ -3542,14 +3569,57 @@ var ts;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
+        var options = {};
+        var errors = [];
+        if (!jsonOptions) {
+            return { options: options, errors: errors };
+        }
+        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                var optType = opt.type;
+                var value = jsonOptions[id];
+                var expectedType = typeof optType === "string" ? optType : "string";
+                if (typeof value === expectedType) {
+                    if (typeof optType !== "string") {
+                        var key = value.toLowerCase();
+                        if (ts.hasProperty(optType, key)) {
+                            value = optType[key];
+                        }
+                        else {
+                            errors.push(ts.createCompilerDiagnostic(opt.error));
+                            value = 0;
+                        }
+                    }
+                    if (opt.isFilePath) {
+                        value = ts.normalizePath(ts.combinePaths(basePath, value));
+                        if (value === "") {
+                            value = ".";
+                        }
+                    }
+                    options[opt.name] = value;
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
+                }
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
+            }
+        }
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
                 if (declaration.kind === kind) {
                     return declaration;
                 }
@@ -3592,15 +3662,15 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(arr1, arr2, comparer) {
-        if (!arr1 || !arr2) {
-            return arr1 === arr2;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
         }
-        if (arr1.length !== arr2.length) {
+        if (array1.length !== array2.length) {
             return false;
         }
-        for (var i = 0; i < arr1.length; ++i) {
-            var equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];
+        for (var i = 0; i < array1.length; ++i) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
             if (!equals) {
                 return false;
             }
@@ -3719,7 +3789,7 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 49152) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 24576) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
@@ -3819,8 +3889,12 @@ var ts;
         return file.externalModuleIndicator !== undefined;
     }
     ts.isExternalModule = isExternalModule;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 8192) !== 0;
+        return (file.flags & 4096) !== 0;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
@@ -3850,11 +3924,11 @@ var ts;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 32768);
+        return !!(getCombinedNodeFlags(node) & 16384);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 16384);
+        return !!(getCombinedNodeFlags(node) & 8192);
     }
     ts.isLet = isLet;
     function isPrologueDirective(node) {
@@ -3865,18 +3939,26 @@ var ts;
         return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getLeadingCommentRangesOfNodeFromText(node, text) {
+        return ts.getLeadingCommentRanges(text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
     function getJsDocComments(node, sourceFileOfNode) {
-        var commentRanges = (node.kind === 138 || node.kind === 137) ?
-            ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) :
-            getLeadingCommentRangesOfNode(node, sourceFileOfNode);
-        return ts.filter(commentRanges, isJsDocComment);
-        function isJsDocComment(comment) {
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
-        }
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
     }
     ts.getJsDocComments = getJsDocComments;
+    function getJsDocCommentsFromText(node, text) {
+        var commentRanges = (node.kind === 138 || node.kind === 137) ?
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
+        return ts.filter(commentRanges, isJsDocComment);
+        function isJsDocComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 42 &&
+                text.charCodeAt(comment.pos + 3) !== 47;
+        }
+    }
+    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
@@ -4033,27 +4115,28 @@ var ts;
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 144:
-                case 173:
-                case 213:
-                case 174:
-                case 143:
-                case 142:
-                case 145:
-                case 146:
-                case 147:
-                case 148:
-                case 149:
-                case 152:
-                case 153:
-                    return true;
-            }
-        }
-        return false;
+        return node && isFunctionLikeKind(node.kind);
     }
     ts.isFunctionLike = isFunctionLike;
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 144:
+            case 173:
+            case 213:
+            case 174:
+            case 143:
+            case 142:
+            case 145:
+            case 146:
+            case 147:
+            case 148:
+            case 149:
+            case 152:
+            case 153:
+                return true;
+        }
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
             case 143:
@@ -4068,6 +4151,20 @@ var ts;
         return false;
     }
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 199:
+            case 200:
+            case 201:
+            case 197:
+            case 198:
+                return true;
+            case 207:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
         return node && node.kind === 192 && isFunctionLike(node.parent);
     }
@@ -4390,6 +4487,41 @@ var ts;
         return node.kind === 221 && node.moduleReference.kind !== 232;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJavaScript(file) {
+        return isInJavaScriptFile(file);
+    }
+    ts.isSourceFileJavaScript = isSourceFileJavaScript;
+    function isInJavaScriptFile(node) {
+        return node && !!(node.parserContextFlags & 32);
+    }
+    ts.isInJavaScriptFile = isInJavaScriptFile;
+    function isRequireCall(expression) {
+        return expression.kind === 168 &&
+            expression.expression.kind === 69 &&
+            expression.expression.text === "require" &&
+            expression.arguments.length === 1 &&
+            expression.arguments[0].kind === 9;
+    }
+    ts.isRequireCall = isRequireCall;
+    function isExportsPropertyAssignment(expression) {
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181) &&
+            (expression.operatorToken.kind === 56) &&
+            (expression.left.kind === 166) &&
+            (expression.left.expression.kind === 69) &&
+            ((expression.left.expression).text === "exports");
+    }
+    ts.isExportsPropertyAssignment = isExportsPropertyAssignment;
+    function isModuleExportsAssignment(expression) {
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181) &&
+            (expression.operatorToken.kind === 56) &&
+            (expression.left.kind === 166) &&
+            (expression.left.expression.kind === 69) &&
+            ((expression.left.expression).text === "module") &&
+            (expression.left.name.text === "exports");
+    }
+    ts.isModuleExportsAssignment = isModuleExportsAssignment;
     function getExternalModuleName(node) {
         if (node.kind === 222) {
             return node.moduleSpecifier;
@@ -4503,9 +4635,18 @@ var ts;
         return !!node && (node.kind === 162 || node.kind === 161);
     }
     ts.isBindingPattern = isBindingPattern;
+    function isNodeDescendentOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (2 | 8192)) {
+            if (node.flags & (4 | 4096)) {
                 return true;
             }
             node = node.parent;
@@ -4563,7 +4704,7 @@ var ts;
             case 207:
             case 204:
             case 206:
-            case 98:
+            case 208:
             case 209:
             case 193:
             case 198:
@@ -4662,8 +4803,8 @@ var ts;
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
     function getHeritageClause(clauses, kind) {
         if (clauses) {
-            for (var _i = 0; _i < clauses.length; _i++) {
-                var clause = clauses[_i];
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
                 if (clause.token === kind) {
                     return clause;
                 }
@@ -4675,7 +4816,6 @@ var ts;
     function tryResolveScriptReference(host, sourceFile, reference) {
         if (!host.getCompilerOptions().noResolve) {
             var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            referenceFileName = ts.getNormalizedAbsolutePath(referenceFileName, host.getCurrentDirectory());
             return host.getSourceFile(referenceFileName);
         }
     }
@@ -4693,8 +4833,8 @@ var ts;
     function getFileReferenceFromReferencePath(comment, commentRange) {
         var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
         var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.exec(comment)) {
-            if (isNoDefaultLibRegEx.exec(comment)) {
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
                 return {
                     isNoDefaultLib: true
                 };
@@ -4733,15 +4873,23 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && (node.flags & 512) !== 0 && !isAccessor(node);
+        return isFunctionLike(node) && (node.flags & 256) !== 0 && !isAccessor(node);
     }
     ts.isAsyncFunctionLike = isAsyncFunctionLike;
+    function isStringOrNumericLiteral(kind) {
+        return kind === 9 || kind === 8;
+    }
+    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 136 &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && isDynamicName(declaration.name);
     }
     ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 136 &&
+            !isStringOrNumericLiteral(name.expression.kind) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
     function isWellKnownSymbolSyntactically(node) {
         return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
     }
@@ -4822,7 +4970,7 @@ var ts;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
-        var node = ts.createNode(kind);
+        var node = ts.createNode(kind, -1, -1);
         node.startsOnNewLine = startsOnNewLine;
         return node;
     }
@@ -4962,11 +5110,11 @@ var ts;
     }
     ts.getIndentSize = getIndentSize;
     function createTextWriter(newLine) {
-        var output = "";
-        var indent = 0;
-        var lineStart = true;
-        var lineCount = 0;
-        var linePos = 0;
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
         function write(s) {
             if (s && s.length) {
                 if (lineStart) {
@@ -4976,6 +5124,13 @@ var ts;
                 output += s;
             }
         }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
         function rawWrite(s) {
             if (s !== undefined) {
                 if (lineStart) {
@@ -5002,9 +5157,10 @@ var ts;
                 lineStart = true;
             }
         }
-        function writeTextOfNode(sourceFile, node) {
-            write(getSourceTextOfNodeFromSourceFile(sourceFile, node));
+        function writeTextOfNode(text, node) {
+            write(getTextOfNodeFromSourceText(text, node));
         }
+        reset();
         return {
             write: write,
             rawWrite: rawWrite,
@@ -5017,10 +5173,17 @@ var ts;
             getTextPos: function () { return output.length; },
             getLine: function () { return lineCount + 1; },
             getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            getText: function () { return output; },
+            reset: reset
         };
     }
     ts.createTextWriter = createTextWriter;
+    function getExternalModuleNameFromPath(host, fileName) {
+        var dir = host.getCurrentDirectory();
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, false);
+        return ts.removeFileExtension(relativePath);
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
     function getOwnEmitOutputFilePath(sourceFile, host, extension) {
         var compilerOptions = host.getCompilerOptions();
         var emitOutputFilePathWithoutExtension;
@@ -5049,6 +5212,10 @@ var ts;
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
             if (member.kind === 144 && nodeIsPresent(member.body)) {
@@ -5091,7 +5258,7 @@ var ts;
         else {
             ts.forEach(declarations, function (member) {
                 if ((member.kind === 145 || member.kind === 146)
-                    && (member.flags & 128) === (accessor.flags & 128)) {
+                    && (member.flags & 64) === (accessor.flags & 64)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -5119,21 +5286,21 @@ var ts;
         };
     }
     ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
         if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
     ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) {
+    function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) {
         var emitLeadingSpace = !trailingSeparator;
         ts.forEach(comments, function (comment) {
             if (emitLeadingSpace) {
                 writer.write(" ");
                 emitLeadingSpace = false;
             }
-            writeComment(currentSourceFile, writer, comment, newLine);
+            writeComment(text, lineMap, writer, comment, newLine);
             if (comment.hasTrailingNewLine) {
                 writer.writeLine();
             }
@@ -5146,21 +5313,64 @@ var ts;
         });
     }
     ts.emitComments = emitComments;
-    function writeCommentRange(currentSourceFile, writer, comment, newLine) {
-        if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) {
-            var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
-            var lineCount = ts.getLineStarts(currentSourceFile).length;
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 33;
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, comment, newLine) {
+        if (text.charCodeAt(comment.pos + 1) === 42) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
+            var lineCount = lineMap.length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
                 if (pos !== comment.pos) {
                     if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
                     }
                     var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
                     if (spacesToEmit > 0) {
                         var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
                         var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
@@ -5174,52 +5384,52 @@ var ts;
                         writer.rawWrite("");
                     }
                 }
-                writeTrimmedCurrentLine(pos, nextLineStart);
+                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
                 pos = nextLineStart;
             }
         }
         else {
-            writer.write(currentSourceFile.text.substring(comment.pos, comment.end));
-        }
-        function writeTrimmedCurrentLine(pos, nextLineStart) {
-            var end = Math.min(comment.end, nextLineStart - 1);
-            var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-            if (currentLineText) {
-                writer.write(currentLineText);
-                if (end !== comment.end) {
-                    writer.writeLine();
-                }
-            }
-            else {
-                writer.writeLiteral(newLine);
-            }
-        }
-        function calculateIndent(pos, end) {
-            var currentLineIndent = 0;
-            for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) {
-                if (currentSourceFile.text.charCodeAt(pos) === 9) {
-                    currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-                }
-                else {
-                    currentLineIndent++;
-                }
-            }
-            return currentLineIndent;
+            writer.write(text.substring(comment.pos, comment.end));
         }
     }
     ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(comment.end, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            writer.write(currentLineText);
+            if (end !== comment.end) {
+                writer.writeLine();
+            }
+        }
+        else {
+            writer.writeLiteral(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9) {
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
     function modifierToFlag(token) {
         switch (token) {
-            case 113: return 128;
-            case 112: return 16;
-            case 111: return 64;
-            case 110: return 32;
-            case 115: return 256;
-            case 82: return 1;
-            case 122: return 2;
-            case 74: return 32768;
-            case 77: return 1024;
-            case 118: return 512;
+            case 113: return 64;
+            case 112: return 8;
+            case 111: return 32;
+            case 110: return 16;
+            case 115: return 128;
+            case 82: return 2;
+            case 122: return 4;
+            case 74: return 16384;
+            case 77: return 512;
+            case 118: return 256;
         }
         return 0;
     }
@@ -5298,17 +5508,17 @@ var ts;
     }
     ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
     function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 1024) ? symbol.valueDeclaration.localSymbol : undefined;
+        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512) ? symbol.valueDeclaration.localSymbol : undefined;
     }
     ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function isJavaScript(fileName) {
-        return ts.fileExtensionIs(fileName, ".js");
+    function hasJavaScriptFileExtension(fileName) {
+        return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isJavaScript = isJavaScript;
-    function isTsx(fileName) {
-        return ts.fileExtensionIs(fileName, ".tsx");
+    ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension;
+    function allowsJsxExpressions(fileName) {
+        return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isTsx = isTsx;
+    ts.allowsJsxExpressions = allowsJsxExpressions;
     function getExpandedCharCodes(input) {
         var output = [];
         var length = input.length;
@@ -5362,6 +5572,12 @@ var ts;
         return result;
     }
     ts.convertToBase64 = convertToBase64;
+    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
+        return !ts.isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, false);
+    }
+    ts.convertToRelativePath = convertToRelativePath;
     var carriageReturnLineFeed = "\r\n";
     var lineFeed = "\n";
     function getNewLineCharacter(options) {
@@ -5509,27 +5725,19 @@ var ts;
         }
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
-    function arrayStructurallyIsEqualTo(array1, array2) {
-        if (!array1 || !array2) {
-            return false;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        return ts.arrayIsEqualTo(array1.sort(), array2.sort());
-    }
-    ts.arrayStructurallyIsEqualTo = arrayStructurallyIsEqualTo;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(272);
     ts.parseTime = 0;
-    function getNodeConstructor(kind) {
-        return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
-    }
-    ts.getNodeConstructor = getNodeConstructor;
-    function createNode(kind) {
-        return new (getNodeConstructor(kind))();
+    var NodeConstructor;
+    var SourceFileConstructor;
+    function createNode(kind, pos, end) {
+        if (kind === 248) {
+            return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
+        }
+        else {
+            return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
+        }
     }
     ts.createNode = createNode;
     function visitNode(cbNode, node) {
@@ -5544,8 +5752,8 @@ var ts;
     }
     function visitEachNode(cbNode, nodes) {
         if (nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                var node = nodes_1[_i];
                 var result = cbNode(node);
                 if (result) {
                     return result;
@@ -5928,6 +6136,8 @@ var ts;
     (function (Parser) {
         var scanner = ts.createScanner(2, true);
         var disallowInAndDecoratorContext = 1 | 4;
+        var NodeConstructor;
+        var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
         var syntaxCursor;
@@ -5940,13 +6150,16 @@ var ts;
         var contextFlags;
         var parseErrorBeforeNextFinishedNode = false;
         function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor);
+            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
+            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
             var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+            NodeConstructor = ts.objectAllocator.getNodeConstructor();
+            SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
             parseDiagnostics = [];
@@ -5954,12 +6167,12 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = ts.isJavaScript(fileName) ? 32 : 0;
+            contextFlags = isJavaScriptFile ? 32 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 : 0);
+            scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 : 0);
         }
         function clearState() {
             scanner.setText("");
@@ -5972,6 +6185,9 @@ var ts;
         }
         function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
             sourceFile = createSourceFile(fileName, languageVersion);
+            if (contextFlags & 32) {
+                sourceFile.parserContextFlags = 32;
+            }
             token = nextToken();
             processReferenceComments(sourceFile);
             sourceFile.statements = parseList(0, parseStatement);
@@ -5985,7 +6201,7 @@ var ts;
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 addJSDocComments();
             }
             return sourceFile;
@@ -6006,8 +6222,8 @@ var ts;
         function addJSDocComment(node) {
             var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
             if (comments) {
-                for (var _i = 0; _i < comments.length; _i++) {
-                    var comment = comments[_i];
+                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                    var comment = comments_1[_i];
                     var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
                     if (jsDocComment) {
                         node.jsDocComment = jsDocComment;
@@ -6031,15 +6247,14 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion) {
-            var sourceFile = createNode(248, 0);
-            sourceFile.pos = 0;
-            sourceFile.end = sourceText.length;
+            var sourceFile = new SourceFileConstructor(248, 0, sourceText.length);
+            nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 8192 : 0;
-            sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 : 0;
+            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 : 0;
+            sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 : 0;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -6258,13 +6473,10 @@ var ts;
         }
         function createNode(kind, pos) {
             nodeCount++;
-            var node = new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))();
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            node.pos = pos;
-            node.end = pos;
-            return node;
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -6402,7 +6614,7 @@ var ts;
                 case 12:
                     return token === 19 || token === 37 || isLiteralPropertyName();
                 case 9:
-                    return isLiteralPropertyName();
+                    return token === 19 || isLiteralPropertyName();
                 case 7:
                     if (token === 15) {
                         return lookAhead(isValidHeritageClauseObjectLiteral);
@@ -6877,7 +7089,7 @@ var ts;
             if (node.kind === 8
                 && sourceText.charCodeAt(tokenPos) === 48
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 65536;
+                node.flags |= 32768;
             }
             return node;
         }
@@ -6923,9 +7135,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(54)) {
-                return token === 9
-                    ? parseLiteralNode(true)
-                    : parseType();
+                return parseType();
             }
             return undefined;
         }
@@ -7182,6 +7392,8 @@ var ts;
                 case 131:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReferenceOrTypePredicate();
+                case 9:
+                    return parseLiteralNode(true);
                 case 103:
                 case 97:
                     return parseTokenNode();
@@ -7211,6 +7423,7 @@ var ts;
                 case 19:
                 case 25:
                 case 92:
+                case 9:
                     return true;
                 case 17:
                     return lookAhead(isStartOfParenthesizedOrFunctionType);
@@ -7446,7 +7659,7 @@ var ts;
             if (!arrowFunction) {
                 return undefined;
             }
-            var isAsync = !!(arrowFunction.flags & 512);
+            var isAsync = !!(arrowFunction.flags & 256);
             var lastToken = token;
             arrowFunction.equalsGreaterThanToken = parseExpectedToken(34, false, ts.Diagnostics._0_expected, "=>");
             arrowFunction.body = (lastToken === 34 || lastToken === 15)
@@ -7538,7 +7751,7 @@ var ts;
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
             var node = createNode(174);
             setModifiers(node, parseModifiersForArrowFunction());
-            var isAsync = !!(node.flags & 512);
+            var isAsync = !!(node.flags & 256);
             fillSignature(54, false, isAsync, !allowAmbiguity, node);
             if (!node.parameters) {
                 return undefined;
@@ -7724,7 +7937,6 @@ var ts;
             var unaryOperator = token;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38) {
-                var diagnostic;
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 if (simpleUnaryExpression.kind === 171) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
@@ -7817,17 +8029,32 @@ var ts;
         }
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
+            var result;
             if (opening.kind === 235) {
                 var node = createNode(233, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
-                return finishNode(node);
+                result = finishNode(node);
             }
             else {
                 ts.Debug.assert(opening.kind === 234);
-                return opening;
+                result = opening;
             }
+            if (inExpressionContext && token === 25) {
+                var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
+                if (invalidElement) {
+                    parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
+                    var badNode = createNode(181, result.pos);
+                    badNode.end = invalidElement.end;
+                    badNode.left = result;
+                    badNode.right = invalidElement;
+                    badNode.operatorToken = createMissingNode(24, false, undefined);
+                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
+                    return badNode;
+                }
+            }
+            return result;
         }
         function parseJsxText() {
             var node = createNode(236, scanner.getStartPos());
@@ -8137,7 +8364,7 @@ var ts;
             var node = createNode(164);
             parseExpected(19);
             if (scanner.hasPrecedingLineBreak())
-                node.flags |= 2048;
+                node.flags |= 1024;
             node.elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement);
             parseExpected(20);
             return finishNode(node);
@@ -8192,7 +8419,7 @@ var ts;
             var node = createNode(165);
             parseExpected(15);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 2048;
+                node.flags |= 1024;
             }
             node.properties = parseDelimitedList(12, parseObjectLiteralElement, true);
             parseExpected(16);
@@ -8208,7 +8435,7 @@ var ts;
             parseExpected(87);
             node.asteriskToken = parseOptionalToken(37);
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512);
+            var isAsync = !!(node.flags & 256);
             node.name =
                 isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
                     isGenerator ? doInYieldContext(parseOptionalIdentifier) :
@@ -8746,10 +8973,10 @@ var ts;
                 case 102:
                     break;
                 case 108:
-                    node.flags |= 16384;
+                    node.flags |= 8192;
                     break;
                 case 74:
-                    node.flags |= 32768;
+                    node.flags |= 16384;
                     break;
                 default:
                     ts.Debug.fail();
@@ -8783,9 +9010,9 @@ var ts;
             setModifiers(node, modifiers);
             parseExpected(87);
             node.asteriskToken = parseOptionalToken(37);
-            node.name = node.flags & 1024 ? parseOptionalIdentifier() : parseIdentifier();
+            node.name = node.flags & 512 ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512);
+            var isAsync = !!(node.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
@@ -8807,7 +9034,7 @@ var ts;
             method.name = name;
             method.questionToken = questionToken;
             var isGenerator = !!asteriskToken;
-            var isAsync = !!(method.flags & 512);
+            var isAsync = !!(method.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
             return finishNode(method);
@@ -8819,7 +9046,7 @@ var ts;
             property.name = name;
             property.questionToken = questionToken;
             property.type = parseTypeAnnotation();
-            property.initializer = modifiers && modifiers.flags & 128
+            property.initializer = modifiers && modifiers.flags & 64
                 ? allowInAnd(parseNonParameterInitializer)
                 : doOutsideOfContext(2 | 1, parseNonParameterInitializer);
             parseSemicolon();
@@ -9109,13 +9336,13 @@ var ts;
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
             var node = createNode(218, fullStart);
-            var namespaceFlag = flags & 131072;
+            var namespaceFlag = flags & 65536;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 1 | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 2 | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
@@ -9130,7 +9357,7 @@ var ts;
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
             if (parseOptional(126)) {
-                flags |= 131072;
+                flags |= 65536;
             }
             else {
                 parseExpected(125);
@@ -9344,7 +9571,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1
+                return node.flags & 2
                     || node.kind === 221 && node.moduleReference.kind === 232
                     || node.kind === 222
                     || node.kind === 227
@@ -9373,7 +9600,7 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2, undefined);
+                initializeState("file.js", content, 2, true, undefined);
                 var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -9624,7 +9851,7 @@ var ts;
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2, undefined);
+                initializeState("file.js", content, 2, true, undefined);
                 var jsDocComment = parseJSDocComment(undefined, start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -9918,8 +10145,8 @@ var ts;
                 array._children = undefined;
                 array.pos += delta;
                 array.end += delta;
-                for (var _i = 0; _i < array.length; _i++) {
-                    var node = array[_i];
+                for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
+                    var node = array_7[_i];
                     visitNode(node);
                 }
             }
@@ -9991,8 +10218,8 @@ var ts;
                     array.intersectsChange = true;
                     array._children = undefined;
                     adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    for (var _i = 0; _i < array.length; _i++) {
-                        var node = array[_i];
+                    for (var _i = 0, array_8 = array; _i < array_8.length; _i++) {
+                        var node = array_8[_i];
                         visitNode(node);
                     }
                     return;
@@ -10145,6 +10372,13 @@ var ts;
 var ts;
 (function (ts) {
     ts.bindTime = 0;
+    function or(state1, state2) {
+        return (state1 | state2) & 2
+            ? 2
+            : (state1 & state2) & 8
+                ? 8
+                : 4;
+    }
     function getModuleInstanceState(node) {
         if (node.kind === 215 || node.kind === 216) {
             return 0;
@@ -10152,7 +10386,7 @@ var ts;
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 222 || node.kind === 221) && !(node.flags & 1)) {
+        else if ((node.kind === 222 || node.kind === 221) && !(node.flags & 2)) {
             return 0;
         }
         else if (node.kind === 219) {
@@ -10179,28 +10413,52 @@ var ts;
         }
     }
     ts.getModuleInstanceState = getModuleInstanceState;
-    function bindSourceFile(file) {
+    var binder = createBinder();
+    function bindSourceFile(file, options) {
         var start = new Date().getTime();
-        bindSourceFileWorker(file);
+        binder(file, options);
         ts.bindTime += new Date().getTime() - start;
     }
     ts.bindSourceFile = bindSourceFile;
-    function bindSourceFileWorker(file) {
+    function createBinder() {
+        var file;
+        var options;
         var parent;
         var container;
         var blockScopeContainer;
         var lastContainer;
         var seenThisKeyword;
-        var inStrictMode = !!file.externalModuleIndicator;
+        var hasExplicitReturn;
+        var currentReachabilityState;
+        var labelStack;
+        var labelIndexMap;
+        var implicitLabels;
+        var inStrictMode;
         var symbolCount = 0;
-        var Symbol = ts.objectAllocator.getSymbolConstructor();
-        var classifiableNames = {};
-        if (!file.locals) {
-            bind(file);
-            file.symbolCount = symbolCount;
-            file.classifiableNames = classifiableNames;
+        var Symbol;
+        var classifiableNames;
+        function bindSourceFile(f, opts) {
+            file = f;
+            options = opts;
+            inStrictMode = !!file.externalModuleIndicator;
+            classifiableNames = {};
+            Symbol = ts.objectAllocator.getSymbolConstructor();
+            if (!file.locals) {
+                bind(file);
+                file.symbolCount = symbolCount;
+                file.classifiableNames = classifiableNames;
+            }
+            parent = undefined;
+            container = undefined;
+            blockScopeContainer = undefined;
+            lastContainer = undefined;
+            seenThisKeyword = false;
+            hasExplicitReturn = false;
+            labelStack = undefined;
+            labelIndexMap = undefined;
+            implicitLabels = undefined;
         }
-        return;
+        return bindSourceFile;
         function createSymbol(flags, name) {
             symbolCount++;
             return new Symbol(flags, name);
@@ -10229,6 +10487,9 @@ var ts;
                 }
                 if (node.name.kind === 136) {
                     var nameExpression = node.name.expression;
+                    if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
+                        return nameExpression.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
                 }
@@ -10249,9 +10510,11 @@ var ts;
                     return "__export";
                 case 227:
                     return node.isExportEquals ? "export=" : "default";
+                case 181:
+                    return "export=";
                 case 213:
                 case 214:
-                    return node.flags & 1024 ? "default" : undefined;
+                    return node.flags & 512 ? "default" : undefined;
             }
         }
         function getDisplayName(node) {
@@ -10259,7 +10522,7 @@ var ts;
         }
         function declareSymbol(symbolTable, parent, node, includes, excludes) {
             ts.Debug.assert(!ts.hasDynamicName(node));
-            var isDefaultExport = node.flags & 1024;
+            var isDefaultExport = node.flags & 512;
             var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
             var symbol;
             if (name !== undefined) {
@@ -10277,7 +10540,7 @@ var ts;
                         ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
                         : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
-                        if (declaration.flags & 1024) {
+                        if (declaration.flags & 512) {
                             message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                         }
                     });
@@ -10296,7 +10559,7 @@ var ts;
             return symbol;
         }
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2;
             if (symbolFlags & 8388608) {
                 if (node.kind === 230 || (node.kind === 221 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
@@ -10306,7 +10569,7 @@ var ts;
                 }
             }
             else {
-                if (hasExportModifier || container.flags & 262144) {
+                if (hasExportModifier || container.flags & 131072) {
                     var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
                         (symbolFlags & 793056 ? 2097152 : 0) |
                         (symbolFlags & 1536 ? 4194304 : 0);
@@ -10337,18 +10600,202 @@ var ts;
                 blockScopeContainer = node;
                 blockScopeContainer.locals = undefined;
             }
-            if (node.kind === 215) {
+            var savedReachabilityState;
+            var savedLabelStack;
+            var savedLabels;
+            var savedImplicitLabels;
+            var savedHasExplicitReturn;
+            var kind = node.kind;
+            var flags = node.flags;
+            flags &= ~1572864;
+            if (kind === 215) {
                 seenThisKeyword = false;
-                ts.forEachChild(node, bind);
-                node.flags = seenThisKeyword ? node.flags | 524288 : node.flags & ~524288;
             }
-            else {
-                ts.forEachChild(node, bind);
+            var saveState = kind === 248 || kind === 219 || ts.isFunctionLikeKind(kind);
+            if (saveState) {
+                savedReachabilityState = currentReachabilityState;
+                savedLabelStack = labelStack;
+                savedLabels = labelIndexMap;
+                savedImplicitLabels = implicitLabels;
+                savedHasExplicitReturn = hasExplicitReturn;
+                currentReachabilityState = 2;
+                hasExplicitReturn = false;
+                labelStack = labelIndexMap = implicitLabels = undefined;
+            }
+            bindReachableStatement(node);
+            if (currentReachabilityState === 2 && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
+                flags |= 524288;
+                if (hasExplicitReturn) {
+                    flags |= 1048576;
+                }
+            }
+            if (kind === 215) {
+                flags = seenThisKeyword ? flags | 262144 : flags & ~262144;
+            }
+            node.flags = flags;
+            if (saveState) {
+                hasExplicitReturn = savedHasExplicitReturn;
+                currentReachabilityState = savedReachabilityState;
+                labelStack = savedLabelStack;
+                labelIndexMap = savedLabels;
+                implicitLabels = savedImplicitLabels;
             }
             container = saveContainer;
             parent = saveParent;
             blockScopeContainer = savedBlockScopeContainer;
         }
+        function bindReachableStatement(node) {
+            if (checkUnreachable(node)) {
+                ts.forEachChild(node, bind);
+                return;
+            }
+            switch (node.kind) {
+                case 198:
+                    bindWhileStatement(node);
+                    break;
+                case 197:
+                    bindDoStatement(node);
+                    break;
+                case 199:
+                    bindForStatement(node);
+                    break;
+                case 200:
+                case 201:
+                    bindForInOrForOfStatement(node);
+                    break;
+                case 196:
+                    bindIfStatement(node);
+                    break;
+                case 204:
+                case 208:
+                    bindReturnOrThrow(node);
+                    break;
+                case 203:
+                case 202:
+                    bindBreakOrContinueStatement(node);
+                    break;
+                case 209:
+                    bindTryStatement(node);
+                    break;
+                case 206:
+                    bindSwitchStatement(node);
+                    break;
+                case 220:
+                    bindCaseBlock(node);
+                    break;
+                case 207:
+                    bindLabeledStatement(node);
+                    break;
+                default:
+                    ts.forEachChild(node, bind);
+                    break;
+            }
+        }
+        function bindWhileStatement(n) {
+            var preWhileState = n.expression.kind === 84 ? 4 : currentReachabilityState;
+            var postWhileState = n.expression.kind === 99 ? 4 : currentReachabilityState;
+            bind(n.expression);
+            currentReachabilityState = preWhileState;
+            var postWhileLabel = pushImplicitLabel();
+            bind(n.statement);
+            popImplicitLabel(postWhileLabel, postWhileState);
+        }
+        function bindDoStatement(n) {
+            var preDoState = currentReachabilityState;
+            var postDoLabel = pushImplicitLabel();
+            bind(n.statement);
+            var postDoState = n.expression.kind === 99 ? 4 : preDoState;
+            popImplicitLabel(postDoLabel, postDoState);
+            bind(n.expression);
+        }
+        function bindForStatement(n) {
+            var preForState = currentReachabilityState;
+            var postForLabel = pushImplicitLabel();
+            bind(n.initializer);
+            bind(n.condition);
+            bind(n.incrementor);
+            bind(n.statement);
+            var isInfiniteLoop = (!n.condition || n.condition.kind === 99);
+            var postForState = isInfiniteLoop ? 4 : preForState;
+            popImplicitLabel(postForLabel, postForState);
+        }
+        function bindForInOrForOfStatement(n) {
+            var preStatementState = currentReachabilityState;
+            var postStatementLabel = pushImplicitLabel();
+            bind(n.initializer);
+            bind(n.expression);
+            bind(n.statement);
+            popImplicitLabel(postStatementLabel, preStatementState);
+        }
+        function bindIfStatement(n) {
+            var ifTrueState = n.expression.kind === 84 ? 4 : currentReachabilityState;
+            var ifFalseState = n.expression.kind === 99 ? 4 : currentReachabilityState;
+            currentReachabilityState = ifTrueState;
+            bind(n.expression);
+            bind(n.thenStatement);
+            if (n.elseStatement) {
+                var preElseState = currentReachabilityState;
+                currentReachabilityState = ifFalseState;
+                bind(n.elseStatement);
+                currentReachabilityState = or(currentReachabilityState, preElseState);
+            }
+            else {
+                currentReachabilityState = or(currentReachabilityState, ifFalseState);
+            }
+        }
+        function bindReturnOrThrow(n) {
+            bind(n.expression);
+            if (n.kind === 204) {
+                hasExplicitReturn = true;
+            }
+            currentReachabilityState = 4;
+        }
+        function bindBreakOrContinueStatement(n) {
+            bind(n.label);
+            var isValidJump = jumpToLabel(n.label, n.kind === 203 ? currentReachabilityState : 4);
+            if (isValidJump) {
+                currentReachabilityState = 4;
+            }
+        }
+        function bindTryStatement(n) {
+            var preTryState = currentReachabilityState;
+            bind(n.tryBlock);
+            var postTryState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.catchClause);
+            var postCatchState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.finallyBlock);
+            currentReachabilityState = or(postTryState, postCatchState);
+        }
+        function bindSwitchStatement(n) {
+            var preSwitchState = currentReachabilityState;
+            var postSwitchLabel = pushImplicitLabel();
+            bind(n.expression);
+            bind(n.caseBlock);
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242; });
+            var postSwitchState = hasDefault && currentReachabilityState !== 2 ? 4 : preSwitchState;
+            popImplicitLabel(postSwitchLabel, postSwitchState);
+        }
+        function bindCaseBlock(n) {
+            var startState = currentReachabilityState;
+            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
+                var clause = _a[_i];
+                currentReachabilityState = startState;
+                bind(clause);
+                if (clause.statements.length && currentReachabilityState === 2 && options.noFallthroughCasesInSwitch) {
+                    errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
+                }
+            }
+        }
+        function bindLabeledStatement(n) {
+            bind(n.label);
+            var ok = pushNamedLabel(n.label);
+            bind(n.statement);
+            if (ok) {
+                popNamedLabel(n.label, currentReachabilityState);
+            }
+        }
         function getContainerFlags(node) {
             switch (node.kind) {
                 case 186:
@@ -10428,7 +10875,7 @@ var ts;
             }
         }
         function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 128
+            return node.flags & 64
                 ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
                 : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
@@ -10437,15 +10884,6 @@ var ts;
                 ? declareModuleMember(node, symbolFlags, symbolExcludes)
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
-        function isAmbientContext(node) {
-            while (node) {
-                if (node.flags & 2) {
-                    return true;
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function hasExportDeclarations(node) {
             var body = node.kind === 248 ? node : node.body;
             if (body.kind === 248 || body.kind === 219) {
@@ -10459,11 +10897,11 @@ var ts;
             return false;
         }
         function setExportContextFlag(node) {
-            if (isAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 262144;
+            if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
+                node.flags |= 131072;
             }
             else {
-                node.flags &= ~262144;
+                node.flags &= ~131072;
             }
         }
         function bindModuleDeclaration(node) {
@@ -10614,7 +11052,7 @@ var ts;
             }
         }
         function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 65536) {
+            if (inStrictMode && node.flags & 32768) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
             }
         }
@@ -10632,10 +11070,10 @@ var ts;
         }
         function checkStrictModeWithStatement(node) {
             if (inStrictMode) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
+                errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
             }
         }
-        function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) {
+        function errorOnFirstToken(node, message, arg0, arg1, arg2) {
             var span = ts.getSpanOfTokenAtPosition(file, node.pos);
             file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
         }
@@ -10643,6 +11081,9 @@ var ts;
             return "__" + ts.indexOf(node.parent.parameters, node);
         }
         function bind(node) {
+            if (!node) {
+                return;
+            }
             node.parent = parent;
             var savedInStrictMode = inStrictMode;
             if (!savedInStrictMode) {
@@ -10670,8 +11111,8 @@ var ts;
             }
         }
         function updateStrictModeStatementList(statements) {
-            for (var _i = 0; _i < statements.length; _i++) {
-                var statement = statements[_i];
+            for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) {
+                var statement = statements_1[_i];
                 if (!ts.isPrologueDirective(statement)) {
                     return;
                 }
@@ -10690,6 +11131,14 @@ var ts;
                 case 69:
                     return checkStrictModeIdentifier(node);
                 case 181:
+                    if (ts.isInJavaScriptFile(node)) {
+                        if (ts.isExportsPropertyAssignment(node)) {
+                            bindExportsPropertyAssignment(node);
+                        }
+                        else if (ts.isModuleExportsAssignment(node)) {
+                            bindModuleExportsAssignment(node);
+                        }
+                    }
                     return checkStrictModeBinaryExpression(node);
                 case 244:
                     return checkStrictModeCatchClause(node);
@@ -10749,6 +11198,11 @@ var ts;
                     checkStrictModeFunctionName(node);
                     var bindingName = node.name ? node.name.text : "__function";
                     return bindAnonymousDeclaration(node, 16, bindingName);
+                case 168:
+                    if (ts.isInJavaScriptFile(node)) {
+                        bindCallExpression(node);
+                    }
+                    break;
                 case 186:
                 case 214:
                     return bindClassLikeDeclaration(node);
@@ -10778,14 +11232,18 @@ var ts;
         function bindSourceFileIfExternalModule() {
             setExportContextFlag(file);
             if (ts.isExternalModule(file)) {
-                bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+                bindSourceFileAsExternalModule();
             }
         }
+        function bindSourceFileAsExternalModule() {
+            bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+        }
         function bindExportAssignment(node) {
+            var boundExpression = node.kind === 227 ? node.expression : node.right;
             if (!container.symbol || !container.symbol.exports) {
                 bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
             }
-            else if (node.expression.kind === 69) {
+            else if (boundExpression.kind === 69) {
                 declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608);
             }
             else {
@@ -10805,6 +11263,25 @@ var ts;
                 declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
             }
         }
+        function setCommonJsModuleIndicator(node) {
+            if (!file.commonJsModuleIndicator) {
+                file.commonJsModuleIndicator = node;
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindExportsPropertyAssignment(node) {
+            setCommonJsModuleIndicator(node);
+            declareSymbol(file.symbol.exports, file.symbol, node.left, 4 | 7340032, 0);
+        }
+        function bindModuleExportsAssignment(node) {
+            setCommonJsModuleIndicator(node);
+            bindExportAssignment(node);
+        }
+        function bindCallExpression(node) {
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+                setCommonJsModuleIndicator(node);
+            }
+        }
         function bindClassLikeDeclaration(node) {
             if (node.kind === 214) {
                 bindBlockScopedDeclaration(node, 32, 899519);
@@ -10858,7 +11335,7 @@ var ts;
             else {
                 declareSymbolAndAddToSymbolTable(node, 1, 107455);
             }
-            if (node.flags & 112 &&
+            if (node.flags & 56 &&
                 node.parent.kind === 144 &&
                 ts.isClassLike(node.parent.parent)) {
                 var classDeclaration = node.parent.parent;
@@ -10870,6 +11347,95 @@ var ts;
                 ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
                 : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
         }
+        function pushNamedLabel(name) {
+            initializeReachabilityStateIfNecessary();
+            if (ts.hasProperty(labelIndexMap, name.text)) {
+                return false;
+            }
+            labelIndexMap[name.text] = labelStack.push(1) - 1;
+            return true;
+        }
+        function pushImplicitLabel() {
+            initializeReachabilityStateIfNecessary();
+            var index = labelStack.push(1) - 1;
+            implicitLabels.push(index);
+            return index;
+        }
+        function popNamedLabel(label, outerState) {
+            var index = labelIndexMap[label.text];
+            ts.Debug.assert(index !== undefined);
+            ts.Debug.assert(labelStack.length == index + 1);
+            labelIndexMap[label.text] = undefined;
+            setCurrentStateAtLabel(labelStack.pop(), outerState, label);
+        }
+        function popImplicitLabel(implicitLabelIndex, outerState) {
+            if (labelStack.length !== implicitLabelIndex + 1) {
+                ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex);
+            }
+            var i = implicitLabels.pop();
+            if (implicitLabelIndex !== i) {
+                ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex);
+            }
+            setCurrentStateAtLabel(labelStack.pop(), outerState, undefined);
+        }
+        function setCurrentStateAtLabel(innerMergedState, outerState, label) {
+            if (innerMergedState === 1) {
+                if (label && !options.allowUnusedLabels) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label));
+                }
+                currentReachabilityState = outerState;
+            }
+            else {
+                currentReachabilityState = or(innerMergedState, outerState);
+            }
+        }
+        function jumpToLabel(label, outerState) {
+            initializeReachabilityStateIfNecessary();
+            var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels);
+            if (index === undefined) {
+                return false;
+            }
+            var stateAtLabel = labelStack[index];
+            labelStack[index] = stateAtLabel === 1 ? outerState : or(stateAtLabel, outerState);
+            return true;
+        }
+        function checkUnreachable(node) {
+            switch (currentReachabilityState) {
+                case 4:
+                    var reportError = (ts.isStatement(node) && node.kind !== 194) ||
+                        node.kind === 214 ||
+                        (node.kind === 218 && shouldReportErrorOnModuleDeclaration(node)) ||
+                        (node.kind === 217 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    if (reportError) {
+                        currentReachabilityState = 8;
+                        var reportUnreachableCode = !options.allowUnreachableCode &&
+                            !ts.isInAmbientContext(node) &&
+                            (node.kind !== 193 ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 24576 ||
+                                ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
+                        if (reportUnreachableCode) {
+                            errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
+                        }
+                    }
+                case 8:
+                    return true;
+                default:
+                    return false;
+            }
+            function shouldReportErrorOnModuleDeclaration(node) {
+                var instanceState = getModuleInstanceState(node);
+                return instanceState === 1 || (instanceState === 2 && options.preserveConstEnums);
+            }
+        }
+        function initializeReachabilityStateIfNecessary() {
+            if (labelIndexMap) {
+                return;
+            }
+            currentReachabilityState = 2;
+            labelIndexMap = {};
+            labelStack = [];
+            implicitLabels = [];
+        }
     }
 })(ts || (ts = {}));
 var ts;
@@ -10932,7 +11498,7 @@ var ts;
             symbolToString: symbolToString,
             getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
             getRootSymbols: getRootSymbols,
-            getContextualType: getContextualType,
+            getContextualType: getApparentTypeOfContextualType,
             getFullyQualifiedName: getFullyQualifiedName,
             getResolvedSignature: getResolvedSignature,
             getConstantValue: getConstantValue,
@@ -10995,6 +11561,7 @@ var ts;
         var getInstantiatedGlobalPromiseLikeType;
         var getGlobalPromiseConstructorLikeType;
         var getGlobalThenableType;
+        var jsxElementClassType;
         var tupleTypes = {};
         var unionTypes = {};
         var intersectionTypes = {};
@@ -11187,7 +11754,7 @@ var ts;
             return ts.getAncestor(node, 248);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 248 && !ts.isExternalModule(node);
+            return node.kind === 248 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -11243,7 +11810,7 @@ var ts;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
                         current.parent.kind === 141 &&
-                        (current.parent.flags & 128) === 0 &&
+                        (current.parent.flags & 64) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -11273,23 +11840,24 @@ var ts;
                 }
                 switch (location.kind) {
                     case 248:
-                        if (!ts.isExternalModule(location))
+                        if (!ts.isExternalOrCommonJsModule(location))
                             break;
                     case 218:
                         var moduleExports = getSymbolOfNode(location).exports;
                         if (location.kind === 248 ||
                             (location.kind === 218 && location.name.kind === 9)) {
+                            if (result = moduleExports["default"]) {
+                                var localSymbol = ts.getLocalSymbolForExportDefault(result);
+                                if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
+                                    break loop;
+                                }
+                                result = undefined;
+                            }
                             if (ts.hasProperty(moduleExports, name) &&
                                 moduleExports[name].flags === 8388608 &&
                                 ts.getDeclarationOfKind(moduleExports[name], 230)) {
                                 break;
                             }
-                            result = moduleExports["default"];
-                            var localSymbol = ts.getLocalSymbolForExportDefault(result);
-                            if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) {
-                                break loop;
-                            }
-                            result = undefined;
                         }
                         if (result = getSymbol(moduleExports, name, meaning & 8914931)) {
                             break loop;
@@ -11302,7 +11870,7 @@ var ts;
                         break;
                     case 141:
                     case 140:
-                        if (ts.isClassLike(location.parent) && !(location.flags & 128)) {
+                        if (ts.isClassLike(location.parent) && !(location.flags & 64)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455)) {
@@ -11315,7 +11883,7 @@ var ts;
                     case 186:
                     case 215:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056)) {
-                            if (lastLocation && lastLocation.flags & 128) {
+                            if (lastLocation && lastLocation.flags & 64) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
                                 return undefined;
                             }
@@ -11647,6 +12215,9 @@ var ts;
             if (moduleName === undefined) {
                 return;
             }
+            if (moduleName.indexOf("!") >= 0) {
+                moduleName = moduleName.substr(0, moduleName.indexOf("!"));
+            }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
                 var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
@@ -11749,8 +12320,8 @@ var ts;
         }
         function findConstructorDeclaration(node) {
             var members = node.members;
-            for (var _i = 0; _i < members.length; _i++) {
-                var member = members[_i];
+            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                var member = members_1[_i];
                 if (member.kind === 144 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
@@ -11817,7 +12388,7 @@ var ts;
                 }
                 switch (location_1.kind) {
                     case 248:
-                        if (!ts.isExternalModule(location_1)) {
+                        if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
                     case 218:
@@ -11944,7 +12515,7 @@ var ts;
         }
         function hasExternalModuleSymbol(declaration) {
             return (declaration.kind === 218 && declaration.name.kind === 9) ||
-                (declaration.kind === 248 && ts.isExternalModule(declaration));
+                (declaration.kind === 248 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -11956,7 +12527,7 @@ var ts;
                 if (!isDeclarationVisible(declaration)) {
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 1) &&
+                        !(anyImportSyntax.flags & 2) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -12086,8 +12657,8 @@ var ts;
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
-                            for (var _i = 0; _i < accessibleSymbolChain.length; _i++) {
-                                var accessibleSymbol = accessibleSymbolChain[_i];
+                            for (var _i = 0, accessibleSymbolChain_1 = accessibleSymbolChain; _i < accessibleSymbolChain_1.length; _i++) {
+                                var accessibleSymbol = accessibleSymbolChain_1[_i];
                                 appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
                             }
                         }
@@ -12142,7 +12713,7 @@ var ts;
                         writeAnonymousType(type, flags);
                     }
                     else if (type.flags & 256) {
-                        writer.writeStringLiteral(type.text);
+                        writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\"");
                     }
                     else {
                         writePunctuation(writer, 15);
@@ -12253,7 +12824,7 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 128; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
@@ -12359,8 +12930,8 @@ var ts;
                         var t = getTypeOfSymbol(p);
                         if (p.flags & (16 | 8192) && !getPropertiesOfObjectType(t).length) {
                             var signatures = getSignaturesOfType(t, 0);
-                            for (var _f = 0; _f < signatures.length; _f++) {
-                                var signature = signatures[_f];
+                            for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
+                                var signature = signatures_1[_f];
                                 buildSymbolDisplay(p, writer);
                                 if (p.flags & 536870912) {
                                     writePunctuation(writer, 53);
@@ -12506,7 +13077,7 @@ var ts;
                         }
                     }
                     else if (node.kind === 248) {
-                        return ts.isExternalModule(node) ? node : undefined;
+                        return ts.isExternalOrCommonJsModule(node) ? node : undefined;
                     }
                 }
                 ts.Debug.fail("getContainingModule cant reach here");
@@ -12563,7 +13134,7 @@ var ts;
                     case 217:
                     case 221:
                         var parent_4 = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
+                        if (!(ts.getCombinedNodeFlags(node) & 2) &&
                             !(node.kind !== 221 && parent_4.kind !== 248 && ts.isInAmbientContext(parent_4))) {
                             return isGlobalSourceFile(parent_4);
                         }
@@ -12574,7 +13145,7 @@ var ts;
                     case 146:
                     case 143:
                     case 142:
-                        if (node.flags & (32 | 64)) {
+                        if (node.flags & (16 | 32)) {
                             return false;
                         }
                     case 144:
@@ -12711,6 +13282,23 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node);
         }
+        function getTextOfPropertyName(name) {
+            switch (name.kind) {
+                case 69:
+                    return name.text;
+                case 9:
+                case 8:
+                    return name.text;
+                case 136:
+                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
+                        return name.expression.text;
+                    }
+            }
+            return undefined;
+        }
+        function isComputedNonLiteralName(name) {
+            return name.kind === 136 && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
             var parentType = getTypeForBindingElementParent(pattern.parent);
@@ -12726,8 +13314,12 @@ var ts;
             var type;
             if (pattern.kind === 161) {
                 var name_11 = declaration.propertyName || declaration.name;
-                type = getTypeOfPropertyOfType(parentType, name_11.text) ||
-                    isNumericLiteralName(name_11.text) && getIndexTypeOfType(parentType, 1) ||
+                if (isComputedNonLiteralName(name_11)) {
+                    return anyType;
+                }
+                var text = getTextOfPropertyName(name_11);
+                type = getTypeOfPropertyOfType(parentType, text) ||
+                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
                     getIndexTypeOfType(parentType, 0);
                 if (!type) {
                     error(name_11, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_11));
@@ -12805,10 +13397,16 @@ var ts;
         }
         function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
             var members = {};
+            var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
-                var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
                 var name = e.propertyName || e.name;
-                var symbol = createSymbol(flags, name.text);
+                if (isComputedNonLiteralName(name)) {
+                    hasComputedProperties = true;
+                    return;
+                }
+                var text = getTextOfPropertyName(name);
+                var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
+                var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType);
                 symbol.bindingElement = e;
                 members[symbol.name] = symbol;
@@ -12817,6 +13415,9 @@ var ts;
             if (includePatternInType) {
                 result.pattern = pattern;
             }
+            if (hasComputedProperties) {
+                result.flags |= 67108864;
+            }
             return result;
         }
         function getTypeFromArrayBindingPattern(pattern, includePatternInType) {
@@ -12867,6 +13468,12 @@ var ts;
                 if (declaration.kind === 227) {
                     return links.type = checkExpression(declaration.expression);
                 }
+                if (declaration.kind === 181) {
+                    return links.type = checkExpression(declaration.right);
+                }
+                if (declaration.kind === 166) {
+                    return checkExpressionCached(declaration.parent.right);
+                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
@@ -13003,8 +13610,8 @@ var ts;
             }
         }
         function appendTypeParameters(typeParameters, declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
+                var declaration = declarations_2[_i];
                 var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
                 if (!typeParameters) {
                     typeParameters = [tp];
@@ -13095,33 +13702,40 @@ var ts;
             }
             return type.resolvedBaseConstructorType;
         }
+        function hasClassBaseType(type) {
+            return !!ts.forEach(getBaseTypes(type), function (t) { return !!(t.symbol.flags & 32); });
+        }
         function getBaseTypes(type) {
+            var isClass = type.symbol.flags & 32;
+            var isInterface = type.symbol.flags & 64;
             if (!type.resolvedBaseTypes) {
-                if (type.symbol.flags & 32) {
+                if (!isClass && !isInterface) {
+                    ts.Debug.fail("type must be class or interface");
+                }
+                if (isClass) {
                     resolveBaseTypesOfClass(type);
                 }
-                else if (type.symbol.flags & 64) {
+                if (isInterface) {
                     resolveBaseTypesOfInterface(type);
                 }
-                else {
-                    ts.Debug.fail("type must be class or interface");
-                }
             }
             return type.resolvedBaseTypes;
         }
         function resolveBaseTypesOfClass(type) {
-            type.resolvedBaseTypes = emptyArray;
-            var baseContructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseContructorType.flags & 80896)) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
+            var baseConstructorType = getBaseConstructorTypeOfClass(type);
+            if (!(baseConstructorType.flags & 80896)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
             var baseType;
-            if (baseContructorType.symbol && baseContructorType.symbol.flags & 32) {
-                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol);
+            var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined;
+            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 &&
+                areAllOuterTypeParametersApplied(originalBaseType)) {
+                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol);
             }
             else {
-                var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments);
+                var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments);
                 if (!constructors.length) {
                     error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
                     return;
@@ -13139,10 +13753,24 @@ var ts;
                 error(type.symbol.valueDeclaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, undefined, 1));
                 return;
             }
-            type.resolvedBaseTypes = [baseType];
+            if (type.resolvedBaseTypes === emptyArray) {
+                type.resolvedBaseTypes = [baseType];
+            }
+            else {
+                type.resolvedBaseTypes.push(baseType);
+            }
+        }
+        function areAllOuterTypeParametersApplied(type) {
+            var outerTypeParameters = type.outerTypeParameters;
+            if (outerTypeParameters) {
+                var last = outerTypeParameters.length - 1;
+                var typeArguments = type.typeArguments;
+                return outerTypeParameters[last].symbol !== typeArguments[last].symbol;
+            }
+            return true;
         }
         function resolveBaseTypesOfInterface(type) {
-            type.resolvedBaseTypes = [];
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215 && ts.getInterfaceBaseTypeNodes(declaration)) {
@@ -13152,7 +13780,12 @@ var ts;
                         if (baseType !== unknownType) {
                             if (getTargetType(baseType).flags & (1024 | 2048)) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
-                                    type.resolvedBaseTypes.push(baseType);
+                                    if (type.resolvedBaseTypes === emptyArray) {
+                                        type.resolvedBaseTypes = [baseType];
+                                    }
+                                    else {
+                                        type.resolvedBaseTypes.push(baseType);
+                                    }
                                 }
                                 else {
                                     error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, undefined, 1));
@@ -13170,13 +13803,13 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215) {
-                    if (declaration.flags & 524288) {
+                    if (declaration.flags & 262144) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
                     if (baseTypeNodes) {
-                        for (var _b = 0; _b < baseTypeNodes.length; _b++) {
-                            var node = baseTypeNodes[_b];
+                        for (var _b = 0, baseTypeNodes_1 = baseTypeNodes; _b < baseTypeNodes_1.length; _b++) {
+                            var node = baseTypeNodes_1[_b];
                             if (ts.isSupportedExpressionWithTypeArguments(node)) {
                                 var baseSymbol = resolveEntityName(node.expression, 793056, true);
                                 if (!baseSymbol || !(baseSymbol.flags & 64) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
@@ -13207,7 +13840,7 @@ var ts;
                     type.typeArguments = type.typeParameters;
                     type.thisType = createType(512 | 33554432);
                     type.thisType.symbol = symbol;
-                    type.thisType.constraint = getTypeWithThisArgument(type);
+                    type.thisType.constraint = type;
                 }
             }
             return links.declaredType;
@@ -13344,23 +13977,23 @@ var ts;
         }
         function createSymbolTable(symbols) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                var symbol = symbols_1[_i];
                 result[symbol.name] = symbol;
             }
             return result;
         }
         function createInstantiatedSymbolTable(symbols, mapper, mappingThisOnly) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                var symbol = symbols_2[_i];
                 result[symbol.name] = mappingThisOnly && isIndependentMember(symbol) ? symbol : instantiateSymbol(symbol, mapper);
             }
             return result;
         }
         function addInheritedMembers(symbols, baseSymbols) {
-            for (var _i = 0; _i < baseSymbols.length; _i++) {
-                var s = baseSymbols[_i];
+            for (var _i = 0, baseSymbols_1 = baseSymbols; _i < baseSymbols_1.length; _i++) {
+                var s = baseSymbols_1[_i];
                 if (!ts.hasProperty(symbols, s.name)) {
                     symbols[s.name] = s;
                 }
@@ -13368,8 +14001,8 @@ var ts;
         }
         function addInheritedSignatures(signatures, baseSignatures) {
             if (baseSignatures) {
-                for (var _i = 0; _i < baseSignatures.length; _i++) {
-                    var signature = baseSignatures[_i];
+                for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
+                    var signature = baseSignatures_1[_i];
                     signatures.push(signature);
                 }
             }
@@ -13412,8 +14045,8 @@ var ts;
                     members = createSymbolTable(source.declaredProperties);
                 }
                 var thisArgument = ts.lastOrUndefined(typeArguments);
-                for (var _i = 0; _i < baseTypes.length; _i++) {
-                    var baseType = baseTypes[_i];
+                for (var _i = 0, baseTypes_1 = baseTypes; _i < baseTypes_1.length; _i++) {
+                    var baseType = baseTypes_1[_i];
                     var instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0));
@@ -13450,7 +14083,7 @@ var ts;
             return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
-            if (!getBaseTypes(classType).length) {
+            if (!hasClassBaseType(classType)) {
                 return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
@@ -13459,8 +14092,8 @@ var ts;
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
-            for (var _i = 0; _i < baseSignatures.length; _i++) {
-                var baseSig = baseSignatures[_i];
+            for (var _i = 0, baseSignatures_2 = baseSignatures; _i < baseSignatures_2.length; _i++) {
+                var baseSig = baseSignatures_2[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
                     var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
@@ -13488,8 +14121,8 @@ var ts;
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
         }
         function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
-            for (var _i = 0; _i < signatureList.length; _i++) {
-                var s = signatureList[_i];
+            for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
+                var s = signatureList_1[_i];
                 if (compareSignatures(s, signature, partialMatch, ignoreReturnTypes, compareTypes)) {
                     return s;
                 }
@@ -13543,8 +14176,8 @@ var ts;
         }
         function getUnionIndexType(types, kind) {
             var indexTypes = [];
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
+                var type = types_1[_i];
                 var indexType = getIndexTypeOfType(type, kind);
                 if (!indexType) {
                     return undefined;
@@ -13682,14 +14315,19 @@ var ts;
             type = getApparentType(type);
             return type.flags & 49152 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
         }
+        function getApparentTypeOfTypeParameter(type) {
+            if (!type.resolvedApparentType) {
+                var constraintType = getConstraintOfTypeParameter(type);
+                while (constraintType && constraintType.flags & 512) {
+                    constraintType = getConstraintOfTypeParameter(constraintType);
+                }
+                type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type);
+            }
+            return type.resolvedApparentType;
+        }
         function getApparentType(type) {
             if (type.flags & 512) {
-                do {
-                    type = getConstraintOfTypeParameter(type);
-                } while (type && type.flags & 512);
-                if (!type) {
-                    type = emptyObjectType;
-                }
+                type = getApparentTypeOfTypeParameter(type);
             }
             if (type.flags & 258) {
                 type = globalStringType;
@@ -13708,12 +14346,12 @@ var ts;
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
+                var current = types_2[_i];
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (32 | 64))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 | 32))) {
                         if (!props) {
                             props = [prop];
                         }
@@ -13734,8 +14372,8 @@ var ts;
             }
             var propTypes = [];
             var declarations = [];
-            for (var _a = 0; _a < props.length; _a++) {
-                var prop = props[_a];
+            for (var _a = 0, props_1 = props; _a < props_1.length; _a++) {
+                var prop = props_1[_a];
                 if (prop.declarations) {
                     ts.addRange(declarations, prop.declarations);
                 }
@@ -13842,7 +14480,7 @@ var ts;
             if (node.initializer) {
                 var signatureDeclaration = node.parent;
                 var signature = getSignatureFromDeclaration(signatureDeclaration);
-                var parameterIndex = signatureDeclaration.parameters.indexOf(node);
+                var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
                 ts.Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
@@ -13851,7 +14489,9 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 144 ? getDeclaredTypeOfClassOrInterface(declaration.parent.symbol) : undefined;
+                var classType = declaration.kind === 144 ?
+                    getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
+                    : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
@@ -13935,6 +14575,16 @@ var ts;
             }
             return result;
         }
+        function resolveExternalModuleTypeByLiteral(name) {
+            var moduleSym = resolveExternalModuleName(name, name);
+            if (moduleSym) {
+                var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                if (resolvedModuleSymbol) {
+                    return getTypeOfSymbol(resolvedModuleSymbol);
+                }
+            }
+            return anyType;
+        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3)) {
@@ -14066,8 +14716,8 @@ var ts;
         }
         function getPropagatingFlagsOfTypes(types) {
             var result = 0;
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
+                var type = types_3[_i];
                 result |= type.flags;
             }
             return result & 14680064;
@@ -14188,8 +14838,8 @@ var ts;
         function getTypeOfGlobalSymbol(symbol, arity) {
             function getTypeDeclaration(symbol) {
                 var declarations = symbol.declarations;
-                for (var _i = 0; _i < declarations.length; _i++) {
-                    var declaration = declarations[_i];
+                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                    var declaration = declarations_3[_i];
                     switch (declaration.kind) {
                         case 214:
                         case 215:
@@ -14287,8 +14937,8 @@ var ts;
             }
         }
         function addTypesToSet(typeSet, types, typeSetKind) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
+                var type = types_4[_i];
                 addTypeToSet(typeSet, type, typeSetKind);
             }
         }
@@ -14310,8 +14960,8 @@ var ts;
             }
         }
         function containsTypeAny(types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var type = types_5[_i];
                 if (isTypeAny(type)) {
                     return true;
                 }
@@ -14396,11 +15046,12 @@ var ts;
             return links.resolvedType;
         }
         function getStringLiteralType(node) {
-            if (ts.hasProperty(stringLiteralTypes, node.text)) {
-                return stringLiteralTypes[node.text];
+            var text = node.text;
+            if (ts.hasProperty(stringLiteralTypes, text)) {
+                return stringLiteralTypes[text];
             }
-            var type = stringLiteralTypes[node.text] = createType(256);
-            type.text = ts.getTextOfNode(node);
+            var type = stringLiteralTypes[text] = createType(256);
+            type.text = text;
             return type;
         }
         function getTypeFromStringLiteral(node) {
@@ -14414,7 +15065,8 @@ var ts;
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
             if (parent && (ts.isClassLike(parent) || parent.kind === 215)) {
-                if (!(container.flags & 128)) {
+                if (!(container.flags & 64) &&
+                    (container.kind !== 144 || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -14479,8 +15131,8 @@ var ts;
         function instantiateList(items, mapper, instantiator) {
             if (items && items.length) {
                 var result = [];
-                for (var _i = 0; _i < items.length; _i++) {
-                    var v = items[_i];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var v = items_1[_i];
                     result.push(instantiator(v, mapper));
                 }
                 return result;
@@ -14519,8 +15171,8 @@ var ts;
                 case 2: return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
-                for (var _i = 0; _i < sources.length; _i++) {
-                    var source = sources[_i];
+                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
+                    var source = sources_1[_i];
                     if (t === source) {
                         return anyType;
                     }
@@ -14815,7 +15467,7 @@ var ts;
                     var apparentType = getApparentType(source);
                     if (apparentType.flags & (80896 | 32768) && target.flags & 80896) {
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                        if (result = objectTypeRelatedTo(apparentType, target, reportStructuralErrors)) {
+                        if (result = objectTypeRelatedTo(apparentType, source, target, reportStructuralErrors)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
@@ -14834,7 +15486,7 @@ var ts;
                             return result;
                         }
                     }
-                    return objectTypeRelatedTo(source, target, false);
+                    return objectTypeRelatedTo(source, source, target, false);
                 }
                 if (source.flags & 512 && target.flags & 512) {
                     return typeParameterIdenticalTo(source, target);
@@ -14856,36 +15508,37 @@ var ts;
                         resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
                         return true;
                     }
-                    return false;
                 }
-                if (type.flags & 49152) {
+                else if (type.flags & 49152) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
                     }
-                    return false;
                 }
-                return true;
+                return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (!isKnownProperty(target, prop.name)) {
-                        if (reportErrors) {
-                            errorNode = prop.valueDeclaration;
-                            reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                if (!(target.flags & 67108864) && someConstituentTypeHasKind(target, 80896)) {
+                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        if (!isKnownProperty(target, prop.name)) {
+                            if (reportErrors) {
+                                errorNode = prop.valueDeclaration;
+                                reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                            }
+                            return true;
                         }
-                        return true;
                     }
                 }
+                return false;
             }
             function eachTypeRelatedToSomeType(source, target) {
                 var result = -1;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
+                    var sourceType = sourceTypes_1[_i];
                     var related = typeRelatedToSomeType(sourceType, target, false);
                     if (!related) {
                         return 0;
@@ -14907,8 +15560,8 @@ var ts;
             function typeRelatedToEachType(source, target, reportErrors) {
                 var result = -1;
                 var targetTypes = target.types;
-                for (var _i = 0; _i < targetTypes.length; _i++) {
-                    var targetType = targetTypes[_i];
+                for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
+                    var targetType = targetTypes_1[_i];
                     var related = isRelatedTo(source, targetType, reportErrors);
                     if (!related) {
                         return 0;
@@ -14930,8 +15583,8 @@ var ts;
             function eachTypeRelatedToType(source, target, reportErrors) {
                 var result = -1;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_2 = sourceTypes; _i < sourceTypes_2.length; _i++) {
+                    var sourceType = sourceTypes_2[_i];
                     var related = isRelatedTo(sourceType, target, reportErrors);
                     if (!related) {
                         return 0;
@@ -14957,9 +15610,6 @@ var ts;
                 return result;
             }
             function typeParameterIdenticalTo(source, target) {
-                if (source.symbol.name !== target.symbol.name) {
-                    return 0;
-                }
                 if (source.constraint === target.constraint) {
                     return -1;
                 }
@@ -14968,11 +15618,11 @@ var ts;
                 }
                 return isIdenticalTo(source.constraint, target.constraint);
             }
-            function objectTypeRelatedTo(source, target, reportErrors) {
+            function objectTypeRelatedTo(apparentSource, originalSource, target, reportErrors) {
                 if (overflow) {
                     return 0;
                 }
-                var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
+                var id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     if (!elaborateErrors || (related === 3)) {
@@ -14996,13 +15646,13 @@ var ts;
                     maybeStack = [];
                     expandingFlags = 0;
                 }
-                sourceStack[depth] = source;
+                sourceStack[depth] = apparentSource;
                 targetStack[depth] = target;
                 maybeStack[depth] = {};
                 maybeStack[depth][id] = 1;
                 depth++;
                 var saveExpandingFlags = expandingFlags;
-                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack, depth))
+                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(apparentSource, sourceStack, depth))
                     expandingFlags |= 1;
                 if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth))
                     expandingFlags |= 2;
@@ -15011,15 +15661,15 @@ var ts;
                     result = 1;
                 }
                 else {
-                    result = propertiesRelatedTo(source, target, reportErrors);
+                    result = propertiesRelatedTo(apparentSource, target, reportErrors);
                     if (result) {
-                        result &= signaturesRelatedTo(source, target, 0, reportErrors);
+                        result &= signaturesRelatedTo(apparentSource, target, 0, reportErrors);
                         if (result) {
-                            result &= signaturesRelatedTo(source, target, 1, reportErrors);
+                            result &= signaturesRelatedTo(apparentSource, target, 1, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, target, reportErrors);
+                                result &= stringIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, target, reportErrors);
+                                    result &= numberIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 }
                             }
                         }
@@ -15044,8 +15694,8 @@ var ts;
                 var result = -1;
                 var properties = getPropertiesOfObjectType(target);
                 var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 524288);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
+                    var targetProp = properties_1[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -15059,20 +15709,20 @@ var ts;
                         else if (!(targetProp.flags & 134217728)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 32 || targetPropFlags & 32) {
+                            if (sourcePropFlags & 16 || targetPropFlags & 16) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 32 && targetPropFlags & 32) {
+                                        if (sourcePropFlags & 16 && targetPropFlags & 16) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 32 ? source : target), typeToString(sourcePropFlags & 32 ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 ? source : target), typeToString(sourcePropFlags & 16 ? target : source));
                                         }
                                     }
                                     return 0;
                                 }
                             }
-                            else if (targetPropFlags & 64) {
+                            else if (targetPropFlags & 32) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32;
                                 var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
                                 var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
@@ -15083,7 +15733,7 @@ var ts;
                                     return 0;
                                 }
                             }
-                            else if (sourcePropFlags & 64) {
+                            else if (sourcePropFlags & 32) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -15118,8 +15768,8 @@ var ts;
                     return 0;
                 }
                 var result = -1;
-                for (var _i = 0; _i < sourceProperties.length; _i++) {
-                    var sourceProp = sourceProperties[_i];
+                for (var _i = 0, sourceProperties_1 = sourceProperties; _i < sourceProperties_1.length; _i++) {
+                    var sourceProp = sourceProperties_1[_i];
                     var targetProp = getPropertyOfObjectType(target, sourceProp.name);
                     if (!targetProp) {
                         return 0;
@@ -15151,13 +15801,13 @@ var ts;
                         return result;
                     }
                 }
-                outer: for (var _i = 0; _i < targetSignatures.length; _i++) {
-                    var t = targetSignatures[_i];
+                outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
+                    var t = targetSignatures_1[_i];
                     if (!t.hasStringLiterals || target.flags & 262144) {
                         var localErrors = reportErrors;
                         var checkedAbstractAssignability = false;
-                        for (var _a = 0; _a < sourceSignatures.length; _a++) {
-                            var s = sourceSignatures[_a];
+                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                            var s = sourceSignatures_1[_a];
                             if (!s.hasStringLiterals || source.flags & 262144) {
                                 var related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
@@ -15185,8 +15835,8 @@ var ts;
                         var targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
                         var sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol);
                         var targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol);
-                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 256;
-                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 256;
+                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 128;
+                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 128;
                         if (sourceIsAbstract && !(targetIsAbstract && targetDecl)) {
                             if (reportErrors) {
                                 reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
@@ -15292,12 +15942,15 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, target, reportErrors) {
+            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(0, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 0);
-                if (targetType && !(targetType.flags & 1)) {
+                if (targetType) {
+                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
+                        return -1;
+                    }
                     var sourceType = getIndexTypeOfType(source, 0);
                     if (!sourceType) {
                         if (reportErrors) {
@@ -15316,12 +15969,15 @@ var ts;
                 }
                 return -1;
             }
-            function numberIndexTypesRelatedTo(source, target, reportErrors) {
+            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(1, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 1);
-                if (targetType && !(targetType.flags & 1)) {
+                if (targetType) {
+                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
+                        return -1;
+                    }
                     var sourceStringType = getIndexTypeOfType(source, 0);
                     var sourceNumberType = getIndexTypeOfType(source, 1);
                     if (!(sourceStringType || sourceNumberType)) {
@@ -15381,8 +16037,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (32 | 64);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (32 | 64);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 | 32);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 | 32);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0;
             }
@@ -15398,18 +16054,24 @@ var ts;
             }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
+        function isMatchingSignature(source, target, partialMatch) {
+            if (source.parameters.length === target.parameters.length &&
+                source.minArgumentCount === target.minArgumentCount &&
+                source.hasRestParameter === target.hasRestParameter) {
+                return true;
+            }
+            if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter ||
+                source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) {
+                return true;
+            }
+            return false;
+        }
         function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
             if (source === target) {
                 return -1;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
-                if (!partialMatch ||
-                    source.parameters.length < target.parameters.length && !source.hasRestParameter ||
-                    source.minArgumentCount > target.minArgumentCount) {
-                    return 0;
-                }
+            if (!(isMatchingSignature(source, target, partialMatch))) {
+                return 0;
             }
             var result = -1;
             if (source.typeParameters && target.typeParameters) {
@@ -15429,11 +16091,10 @@ var ts;
             }
             source = getErasedSignature(source);
             target = getErasedSignature(target);
-            var sourceLen = source.parameters.length;
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = source.hasRestParameter && i === sourceLen - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = target.hasRestParameter && i === targetLen - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0;
@@ -15445,9 +16106,12 @@ var ts;
             }
             return result;
         }
+        function isRestParameterIndex(signature, parameterIndex) {
+            return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
+        }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var type = types_6[_i];
                 if (candidate !== type && !isTypeSubtypeOf(type, candidate))
                     return false;
             }
@@ -15492,6 +16156,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isStringLiteralType(type) {
+            return type.flags & 256;
+        }
         function isTupleType(type) {
             return !!(type.flags & 8192);
         }
@@ -15660,8 +16327,8 @@ var ts;
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
-            for (var _i = 0; _i < typeParameters.length; _i++) {
-                var unused = typeParameters[_i];
+            for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                var unused = typeParameters_1[_i];
                 inferences.push({
                     primary: undefined, secondary: undefined, isFixed: false
                 });
@@ -15727,8 +16394,8 @@ var ts;
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter;
-                    for (var _i = 0; _i < targetTypes.length; _i++) {
-                        var t = targetTypes[_i];
+                    for (var _i = 0, targetTypes_2 = targetTypes; _i < targetTypes_2.length; _i++) {
+                        var t = targetTypes_2[_i];
                         if (t.flags & 512 && ts.contains(context.typeParameters, t)) {
                             typeParameter = t;
                             typeParameterCount++;
@@ -15745,8 +16412,8 @@ var ts;
                 }
                 else if (source.flags & 49152) {
                     var sourceTypes = source.types;
-                    for (var _a = 0; _a < sourceTypes.length; _a++) {
-                        var sourceType = sourceTypes[_a];
+                    for (var _a = 0, sourceTypes_3 = sourceTypes; _a < sourceTypes_3.length; _a++) {
+                        var sourceType = sourceTypes_3[_a];
                         inferFromTypes(sourceType, target);
                     }
                 }
@@ -15779,8 +16446,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                    var targetProp = properties_2[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -16083,7 +16750,7 @@ var ts;
                 }
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
-                if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) {
                     return type;
                 }
                 var rightType = checkExpression(expr.right);
@@ -16111,6 +16778,12 @@ var ts;
                     }
                 }
                 if (targetType) {
+                    if (!assumeTrue) {
+                        if (type.flags & 16384) {
+                            return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); }));
+                        }
+                        return type;
+                    }
                     return getNarrowedType(type, targetType);
                 }
                 return type;
@@ -16209,24 +16882,30 @@ var ts;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
             if (languageVersion >= 2 ||
-                (symbol.flags & 2) === 0 ||
+                (symbol.flags & (2 | 32)) === 0 ||
                 symbol.valueDeclaration.parent.kind === 244) {
                 return;
             }
-            var container = symbol.valueDeclaration;
-            while (container.kind !== 212) {
-                container = container.parent;
+            var container;
+            if (symbol.flags & 32) {
+                container = getClassLikeDeclarationOfSymbol(symbol).parent;
             }
-            container = container.parent;
-            if (container.kind === 193) {
+            else {
+                container = symbol.valueDeclaration;
+                while (container.kind !== 212) {
+                    container = container.parent;
+                }
                 container = container.parent;
+                if (container.kind === 193) {
+                    container = container.parent;
+                }
             }
             var inFunction = isInsideFunction(node.parent, container);
             var current = container;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
-                if (isIterationStatement(current, false)) {
+                if (ts.isIterationStatement(current, false)) {
                     if (inFunction) {
-                        grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node));
+                        getNodeLinks(current).flags |= 65536;
                     }
                     getNodeLinks(symbol.valueDeclaration).flags |= 16384;
                     break;
@@ -16265,7 +16944,7 @@ var ts;
                     break;
                 case 141:
                 case 140:
-                    if (container.flags & 128) {
+                    if (container.flags & 64) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
@@ -16278,7 +16957,7 @@ var ts;
             }
             if (ts.isClassLike(container.parent)) {
                 var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 128 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return container.flags & 64 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
             }
             return anyType;
         }
@@ -16306,7 +16985,7 @@ var ts;
             var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
             var nodeCheckFlag = 0;
             if (canUseSuperExpression) {
-                if ((container.flags & 128) || isCallExpression) {
+                if ((container.flags & 64) || isCallExpression) {
                     nodeCheckFlag = 512;
                 }
                 else {
@@ -16351,7 +17030,7 @@ var ts;
                 }
                 else {
                     if (container && ts.isClassLike(container.parent)) {
-                        if (container.flags & 128) {
+                        if (container.flags & 64) {
                             return container.kind === 143 ||
                                 container.kind === 142 ||
                                 container.kind === 145 ||
@@ -16383,8 +17062,9 @@ var ts;
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (funcHasRestParameters &&
+                            indexOfParameter === (func.parameters.length - 1) &&
+                            isRestParameterIndex(contextualSignature, func.parameters.length - 1)) {
                             return getTypeOfSymbol(ts.lastOrUndefined(contextualSignature.parameters));
                         }
                     }
@@ -16489,8 +17169,8 @@ var ts;
             var types = type.types;
             var mappedType;
             var mappedTypes;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
+                var current = types_7[_i];
                 var t = mapper(current);
                 if (t) {
                     if (!mappedType) {
@@ -16515,6 +17195,9 @@ var ts;
         function getIndexTypeOfContextualType(type, kind) {
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
+        function contextualTypeIsStringLiteralType(type) {
+            return !!(type.flags & 16384 ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type));
+        }
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
@@ -16530,7 +17213,7 @@ var ts;
         }
         function getContextualTypeForObjectLiteralElement(element) {
             var objectLiteral = element.parent;
-            var type = getContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral);
             if (type) {
                 if (!ts.hasDynamicName(element)) {
                     var symbolName = getSymbolOfNode(element).name;
@@ -16546,7 +17229,7 @@ var ts;
         }
         function getContextualTypeForElementExpression(node) {
             var arrayLiteral = node.parent;
-            var type = getContextualType(arrayLiteral);
+            var type = getApparentTypeOfContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
                 return getTypeOfPropertyOfContextualType(type, "" + index)
@@ -16575,11 +17258,11 @@ var ts;
             }
             return undefined;
         }
-        function getContextualType(node) {
-            var type = getContextualTypeWorker(node);
+        function getApparentTypeOfContextualType(node) {
+            var type = getContextualType(node);
             return type && getApparentType(type);
         }
-        function getContextualTypeWorker(node) {
+        function getContextualType(node) {
             if (isInsideWithStatementBody(node)) {
                 return undefined;
             }
@@ -16645,7 +17328,7 @@ var ts;
             ts.Debug.assert(node.kind !== 143 || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+                : getApparentTypeOfContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -16654,8 +17337,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                var current = types_8[_i];
                 var signature = getNonGenericSignature(current);
                 if (signature) {
                     if (!signatureList) {
@@ -16706,8 +17389,8 @@ var ts;
             var hasSpreadElement = false;
             var elementTypes = [];
             var inDestructuringPattern = isAssignmentTarget(node);
-            for (var _i = 0; _i < elements.length; _i++) {
-                var e = elements[_i];
+            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                var e = elements_1[_i];
                 if (inDestructuringPattern && e.kind === 185) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
@@ -16728,7 +17411,7 @@ var ts;
                     type.pattern = node;
                     return type;
                 }
-                var contextualType = getContextualType(node);
+                var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
                     if (pattern && (pattern.kind === 162 || pattern.kind === 164)) {
@@ -16783,10 +17466,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = {};
             var propertiesArray = [];
-            var contextualType = getContextualType(node);
+            var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === 161 || contextualType.pattern.kind === 165);
             var typeFlags = 0;
+            var patternWithComputedProperties = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
@@ -16812,8 +17496,11 @@ var ts;
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
+                        if (ts.hasDynamicName(memberDecl)) {
+                            patternWithComputedProperties = true;
+                        }
                     }
-                    else if (contextualTypeHasPattern) {
+                    else if (contextualTypeHasPattern && !(contextualType.flags & 67108864)) {
                         var impliedProp = getPropertyOfType(contextualType, member.name);
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & 536870912;
@@ -16856,7 +17543,7 @@ var ts;
             var numberIndexType = getIndexType(1);
             var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
-            result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064);
+            result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064) | (patternWithComputedProperties ? 67108864 : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
@@ -16914,8 +17601,6 @@ var ts;
                     case 234:
                         checkJsxSelfClosingElement(child);
                         break;
-                    default:
-                        ts.Debug.assert(child.kind === 236);
                 }
             }
             return jsxElementType || anyType;
@@ -16968,8 +17653,8 @@ var ts;
         function checkJsxSpreadAttribute(node, elementAttributesType, nameTable) {
             var type = checkExpression(node.expression);
             var props = getPropertiesOfType(type);
-            for (var _i = 0; _i < props.length; _i++) {
-                var prop = props[_i];
+            for (var _i = 0, props_2 = props; _i < props_2.length; _i++) {
+                var prop = props_2[_i];
                 if (!nameTable[prop.name]) {
                     var targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
                     if (targetPropSym) {
@@ -17138,7 +17823,6 @@ var ts;
             var prop = getPropertyOfType(attributesType, attrib.name.text);
             return prop || unknownSymbol;
         }
-        var jsxElementClassType = undefined;
         function getJsxGlobalElementClassType() {
             if (!jsxElementClassType) {
                 jsxElementClassType = getExportedTypeFromNamespace(JsxNames.JSX, JsxNames.ElementClass);
@@ -17205,7 +17889,7 @@ var ts;
             return s.valueDeclaration ? s.valueDeclaration.kind : 141;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 16 | 128 : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 8 | 64 : 0;
         }
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationFlagsFromSymbol(prop);
@@ -17218,17 +17902,17 @@ var ts;
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
-                if (flags & 256) {
+                if (flags & 128) {
                     error(errorNode, ts.Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(declaringClass));
                     return false;
                 }
             }
-            if (!(flags & (32 | 64))) {
+            if (!(flags & (16 | 32))) {
                 return true;
             }
             var enclosingClassDeclaration = ts.getContainingClass(node);
             var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            if (flags & 32) {
+            if (flags & 16) {
                 if (declaringClass !== enclosingClass) {
                     error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
@@ -17242,7 +17926,7 @@ var ts;
                 error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 return false;
             }
-            if (flags & 128) {
+            if (flags & 64) {
                 return true;
             }
             if (type.flags & 33554432) {
@@ -17422,8 +18106,8 @@ var ts;
             var specializedIndex = -1;
             var spliceIndex;
             ts.Debug.assert(!result.length);
-            for (var _i = 0; _i < signatures.length; _i++) {
-                var signature = signatures[_i];
+            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
+                var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
                 var parent_5 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
@@ -17504,7 +18188,7 @@ var ts;
                 return false;
             }
             if (spreadArgIndex >= 0) {
-                return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
+                return isRestParameterIndex(signature, spreadArgIndex);
             }
             if (!signature.hasRestParameter && adjustedArgCount > signature.parameters.length) {
                 return false;
@@ -17650,83 +18334,83 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            switch (node.kind) {
-                case 214:
-                case 186:
+            if (node.kind === 214) {
+                var classSymbol = getSymbolOfNode(node);
+                return getTypeOfSymbol(classSymbol);
+            }
+            if (node.kind === 138) {
+                node = node.parent;
+                if (node.kind === 144) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
-                case 138:
-                    node = node.parent;
-                    if (node.kind === 144) {
-                        var classSymbol_1 = getSymbolOfNode(node);
-                        return getTypeOfSymbol(classSymbol_1);
-                    }
-                case 141:
-                case 143:
-                case 145:
-                case 146:
-                    return getParentTypeOfClassElement(node);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+                }
             }
+            if (node.kind === 141 ||
+                node.kind === 143 ||
+                node.kind === 145 ||
+                node.kind === 146) {
+                return getParentTypeOfClassElement(node);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            switch (node.kind) {
-                case 214:
-                    ts.Debug.fail("Class decorators should not have a second synthetic argument.");
-                    return unknownType;
-                case 138:
-                    node = node.parent;
-                    if (node.kind === 144) {
-                        return anyType;
-                    }
-                case 141:
-                case 143:
-                case 145:
-                case 146:
-                    var element = node;
-                    switch (element.name.kind) {
-                        case 69:
-                        case 8:
-                        case 9:
-                            return getStringLiteralType(element.name);
-                        case 136:
-                            var nameType = checkComputedPropertyName(element.name);
-                            if (allConstituentTypesHaveKind(nameType, 16777216)) {
-                                return nameType;
-                            }
-                            else {
-                                return stringType;
-                            }
-                        default:
-                            ts.Debug.fail("Unsupported property name.");
-                            return unknownType;
-                    }
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214) {
+                ts.Debug.fail("Class decorators should not have a second synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138) {
+                node = node.parent;
+                if (node.kind === 144) {
+                    return anyType;
+                }
+            }
+            if (node.kind === 141 ||
+                node.kind === 143 ||
+                node.kind === 145 ||
+                node.kind === 146) {
+                var element = node;
+                switch (element.name.kind) {
+                    case 69:
+                    case 8:
+                    case 9:
+                        return getStringLiteralType(element.name);
+                    case 136:
+                        var nameType = checkComputedPropertyName(element.name);
+                        if (allConstituentTypesHaveKind(nameType, 16777216)) {
+                            return nameType;
+                        }
+                        else {
+                            return stringType;
+                        }
+                    default:
+                        ts.Debug.fail("Unsupported property name.");
+                        return unknownType;
+                }
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            switch (node.kind) {
-                case 214:
-                    ts.Debug.fail("Class decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 138:
-                    return numberType;
-                case 141:
-                    ts.Debug.fail("Property decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 143:
-                case 145:
-                case 146:
-                    var propertyType = getTypeOfNode(node);
-                    return createTypedPropertyDescriptorType(propertyType);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214) {
+                ts.Debug.fail("Class decorators should not have a third synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138) {
+                return numberType;
+            }
+            if (node.kind === 141) {
+                ts.Debug.fail("Property decorators should not have a third synthetic argument.");
+                return unknownType;
+            }
+            if (node.kind === 143 ||
+                node.kind === 145 ||
+                node.kind === 146) {
+                var propertyType = getTypeOfNode(node);
+                return createTypedPropertyDescriptorType(propertyType);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         function getEffectiveDecoratorArgumentType(node, argIndex) {
             if (argIndex === 0) {
@@ -17834,8 +18518,8 @@ var ts;
                 reportError(ts.Diagnostics.Supplied_parameters_do_not_match_any_signature_of_call_target);
             }
             if (!produceDiagnostics) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var candidate = candidates[_i];
+                for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+                    var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
                             candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
@@ -17854,8 +18538,8 @@ var ts;
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
             }
             function chooseOverload(candidates, relation) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var originalCandidate = candidates[_i];
+                for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
+                    var originalCandidate = candidates_2[_i];
                     if (!hasCorrectArity(node, args, originalCandidate)) {
                         continue;
                     }
@@ -17958,7 +18642,7 @@ var ts;
                 return resolveErrorCall(node);
             }
             var valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
-            if (valueDecl && valueDecl.flags & 256) {
+            if (valueDecl && valueDecl.flags & 128) {
                 error(node, ts.Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, ts.declarationNameToString(valueDecl.name));
                 return resolveErrorCall(node);
             }
@@ -18074,6 +18758,9 @@ var ts;
                     return anyType;
                 }
             }
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+                return resolveExternalModuleTypeByLiteral(node.arguments[0]);
+            }
             return getReturnTypeOfSignature(signature);
         }
         function checkTaggedTemplateExpression(node) {
@@ -18084,7 +18771,9 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                if (!(isTypeAssignableTo(targetType, widenedType))) {
+                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258) &&
+                    someConstituentTypeHasKind(widenedType, 258);
+                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
                     checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
                 }
             }
@@ -18102,7 +18791,7 @@ var ts;
                 var contextualParameterType = getTypeAtPosition(context, i);
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
             }
-            if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
+            if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
                 var parameter = ts.lastOrUndefined(signature.parameters);
                 var contextualParameterType = getTypeOfSymbol(ts.lastOrUndefined(context.parameters));
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
@@ -18113,7 +18802,9 @@ var ts;
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
                     if (element.kind !== 187) {
-                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        if (element.name.kind === 69) {
+                            getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        }
                         assignBindingElementTypes(element);
                     }
                 }
@@ -18242,32 +18933,24 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function bodyContainsAReturnStatement(funcBody) {
-            return ts.forEachReturnStatement(funcBody, function (returnStatement) {
-                return true;
-            });
-        }
-        function bodyContainsSingleThrowStatement(body) {
-            return (body.statements.length === 1) && (body.statements[0].kind === 208);
-        }
-        function checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(func, returnType) {
+        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
             if (!produceDiagnostics) {
                 return;
             }
             if (returnType === voidType || isTypeAny(returnType)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192 || !(func.flags & 524288)) {
                 return;
             }
-            var bodyBlock = func.body;
-            if (bodyContainsAReturnStatement(bodyBlock)) {
-                return;
+            if (func.flags & 1048576) {
+                if (compilerOptions.noImplicitReturns) {
+                    error(func.type, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
-            if (bodyContainsSingleThrowStatement(bodyBlock)) {
-                return;
+            else {
+                error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement);
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
             ts.Debug.assert(node.kind !== 143 || ts.isObjectLiteralMethod(node));
@@ -18326,7 +19009,7 @@ var ts;
                 promisedType = checkAsyncFunctionReturnType(node);
             }
             if (returnType && !node.asteriskToken) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (node.body) {
                 if (!node.type) {
@@ -18385,7 +19068,7 @@ var ts;
                     case 69:
                     case 166: {
                         var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 32768) !== 0;
+                        return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384) !== 0;
                     }
                     case 167: {
                         var index = n.argumentExpression;
@@ -18393,7 +19076,7 @@ var ts;
                         if (symbol && index && index.kind === 9) {
                             var name_13 = index.text;
                             var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_13);
-                            return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 32768) !== 0;
+                            return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384) !== 0;
                         }
                         return false;
                     }
@@ -18473,8 +19156,8 @@ var ts;
             }
             if (type.flags & 49152) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                    var current = types_9[_i];
                     if (current.flags & kind) {
                         return true;
                     }
@@ -18489,8 +19172,8 @@ var ts;
             }
             if (type.flags & 49152) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                    var current = types_10[_i];
                     if (!(current.flags & kind)) {
                         return false;
                     }
@@ -18525,21 +19208,28 @@ var ts;
         }
         function checkObjectLiteralAssignment(node, sourceType, contextualMapper) {
             var properties = node.properties;
-            for (var _i = 0; _i < properties.length; _i++) {
-                var p = properties[_i];
+            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                var p = properties_3[_i];
                 if (p.kind === 245 || p.kind === 246) {
                     var name_14 = p.name;
+                    if (name_14.kind === 136) {
+                        checkComputedPropertyName(name_14);
+                    }
+                    if (isComputedNonLiteralName(name_14)) {
+                        continue;
+                    }
+                    var text = getTextOfPropertyName(name_14);
                     var type = isTypeAny(sourceType)
                         ? sourceType
-                        : getTypeOfPropertyOfType(sourceType, name_14.text) ||
-                            isNumericLiteralName(name_14.text) && getIndexTypeOfType(sourceType, 1) ||
+                        : getTypeOfPropertyOfType(sourceType, text) ||
+                            isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1) ||
                             getIndexTypeOfType(sourceType, 0);
                     if (type) {
                         if (p.kind === 246) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
-                            checkDestructuringAssignment(p.initializer || name_14, type);
+                            checkDestructuringAssignment(p.initializer, type);
                         }
                     }
                     else {
@@ -18717,6 +19407,9 @@ var ts;
                 case 31:
                 case 32:
                 case 33:
+                    if (someConstituentTypeHasKind(leftType, 258) && someConstituentTypeHasKind(rightType, 258)) {
+                        return booleanType;
+                    }
                     if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -18824,6 +19517,13 @@ var ts;
             var type2 = checkExpression(node.whenFalse, contextualMapper);
             return getUnionType([type1, type2]);
         }
+        function checkStringLiteralExpression(node) {
+            var contextualType = getContextualType(node);
+            if (contextualType && contextualTypeIsStringLiteralType(contextualType)) {
+                return getStringLiteralType(node);
+            }
+            return stringType;
+        }
         function checkTemplateExpression(node) {
             ts.forEach(node.templateSpans, function (templateSpan) {
                 checkExpression(templateSpan.expression);
@@ -18862,7 +19562,7 @@ var ts;
             if (isInferentialContext(contextualMapper)) {
                 var signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
-                    var contextualType = getContextualType(node);
+                    var contextualType = getApparentTypeOfContextualType(node);
                     if (contextualType) {
                         var contextualSignature = getSingleCallSignature(contextualType);
                         if (contextualSignature && !contextualSignature.typeParameters) {
@@ -18914,6 +19614,7 @@ var ts;
                 case 183:
                     return checkTemplateExpression(node);
                 case 9:
+                    return checkStringLiteralExpression(node);
                 case 11:
                     return stringType;
                 case 10:
@@ -18988,7 +19689,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 112) {
+            if (node.flags & 56) {
                 func = ts.getContainingFunction(node);
                 if (!(func.kind === 144 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
@@ -19169,7 +19870,7 @@ var ts;
         function checkMethodDeclaration(node) {
             checkGrammarMethod(node) || checkGrammarComputedPropertyName(node.name);
             checkFunctionLikeDeclaration(node);
-            if (node.flags & 256 && node.body) {
+            if (node.flags & 128 && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -19216,7 +19917,7 @@ var ts;
             }
             function isInstancePropertyWithInitializer(n) {
                 return n.kind === 141 &&
-                    !(n.flags & 128) &&
+                    !(n.flags & 64) &&
                     !!n.initializer;
             }
             var containingClassDecl = node.parent;
@@ -19229,12 +19930,12 @@ var ts;
                         error(node, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (8 | 16 | 32); });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         var superCallStatement;
-                        for (var _i = 0; _i < statements.length; _i++) {
-                            var statement = statements[_i];
+                        for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
+                            var statement = statements_2[_i];
                             if (statement.kind === 195 && isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
@@ -19260,15 +19961,22 @@ var ts;
             if (produceDiagnostics) {
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 if (node.kind === 145) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && !(bodyContainsAReturnStatement(node.body) || bodyContainsSingleThrowStatement(node.body))) {
-                        error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement);
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288)) {
+                        if (node.flags & 1048576) {
+                            if (compilerOptions.noImplicitReturns) {
+                                error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                            }
+                        }
+                        else {
+                            error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
+                        }
                     }
                 }
                 if (!ts.hasDynamicName(node)) {
                     var otherKind = node.kind === 145 ? 146 : 145;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 112) !== (otherAccessor.flags & 112))) {
+                        if (((node.flags & 56) !== (otherAccessor.flags & 56))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
                         var currentAccessorType = getAnnotatedAccessorType(node);
@@ -19335,7 +20043,7 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 32) && ts.isInAmbientContext(node);
+            return (node.flags & 16) && ts.isInAmbientContext(node);
         }
         function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
             if (!produceDiagnostics) {
@@ -19360,8 +20068,8 @@ var ts;
             else {
                 signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
             }
-            for (var _i = 0; _i < signaturesToCheck.length; _i++) {
-                var otherSignature = signaturesToCheck[_i];
+            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
+                var otherSignature = signaturesToCheck_1[_i];
                 if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) {
                     return;
                 }
@@ -19370,11 +20078,14 @@ var ts;
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
-            if (n.parent.kind !== 215 && ts.isInAmbientContext(n)) {
-                if (!(flags & 2)) {
-                    flags |= 1;
+            if (n.parent.kind !== 215 &&
+                n.parent.kind !== 214 &&
+                n.parent.kind !== 186 &&
+                ts.isInAmbientContext(n)) {
+                if (!(flags & 4)) {
+                    flags |= 2;
                 }
-                flags |= 2;
+                flags |= 4;
             }
             return flags & flagsToCheck;
         }
@@ -19392,16 +20103,16 @@ var ts;
                     var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
                         var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 1) {
+                        if (deviation & 2) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
                         }
-                        else if (deviation & 2) {
+                        else if (deviation & 4) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (32 | 64)) {
+                        else if (deviation & (16 | 32)) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
-                        else if (deviation & 256) {
+                        else if (deviation & 128) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
                         }
                     });
@@ -19418,7 +20129,7 @@ var ts;
                     });
                 }
             }
-            var flagsToCheck = 1 | 2 | 32 | 64 | 256;
+            var flagsToCheck = 2 | 4 | 16 | 32 | 128;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -19447,8 +20158,8 @@ var ts;
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
                             ts.Debug.assert(node.kind === 143 || node.kind === 142);
-                            ts.Debug.assert((node.flags & 128) !== (subsequentNode.flags & 128));
-                            var diagnostic = node.flags & 128 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                            ts.Debug.assert((node.flags & 64) !== (subsequentNode.flags & 64));
+                            var diagnostic = node.flags & 64 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                             error(errorNode_1, diagnostic);
                             return;
                         }
@@ -19463,7 +20174,7 @@ var ts;
                     error(errorNode, ts.Diagnostics.Constructor_implementation_is_missing);
                 }
                 else {
-                    if (node.flags & 256) {
+                    if (node.flags & 128) {
                         error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
                     }
                     else {
@@ -19474,8 +20185,8 @@ var ts;
             var isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & 1536;
             var duplicateFunctionDeclaration = false;
             var multipleConstructorImplementation = false;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var current = declarations[_i];
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
                 var inAmbientContextOrInterface = node.parent.kind === 215 || node.parent.kind === 155 || inAmbientContext;
@@ -19524,7 +20235,7 @@ var ts;
                 });
             }
             if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & 256)) {
+                !(lastSeenNonAmbientDeclaration.flags & 128)) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
             if (hasOverloads) {
@@ -19534,8 +20245,8 @@ var ts;
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
                     if (!bodySignature.hasStringLiterals) {
-                        for (var _a = 0; _a < signatures.length; _a++) {
-                            var signature = signatures[_a];
+                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                            var signature = signatures_3[_a];
                             if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) {
                                 error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
                                 break;
@@ -19565,9 +20276,9 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 | 1024);
-                if (effectiveDeclarationFlags & 1) {
-                    if (effectiveDeclarationFlags & 1024) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 | 512);
+                if (effectiveDeclarationFlags & 2) {
+                    if (effectiveDeclarationFlags & 512) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
                     else {
@@ -19703,9 +20414,12 @@ var ts;
             if (promiseType === unknownType && compilerOptions.isolatedModules) {
                 return unknownType;
             }
-            var promiseConstructor = getMergedSymbol(promiseType.symbol);
+            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
             if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType));
+                var typeName = promiseConstructor
+                    ? symbolToString(promiseConstructor)
+                    : typeToString(promiseType);
+                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
                 return unknownType;
             }
             var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
@@ -19864,7 +20578,7 @@ var ts;
                 if (isAsync) {
                     promisedType = checkAsyncFunctionReturnType(node);
                 }
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (produceDiagnostics && !node.type) {
                 if (compilerOptions.noImplicitAny && ts.nodeIsMissing(node.body) && !isPrivateWithinAmbient(node)) {
@@ -19962,12 +20676,12 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 248 && ts.isExternalModule(parent)) {
+            if (parent.kind === 248 && ts.isExternalOrCommonJsModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
         function checkVarDeclaredNamesNotShadowed(node) {
-            if ((ts.getCombinedNodeFlags(node) & 49152) !== 0 || ts.isParameterDeclaration(node)) {
+            if ((ts.getCombinedNodeFlags(node) & 24576) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
             if (node.kind === 211 && !node.initializer) {
@@ -19979,7 +20693,7 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 49152) {
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576) {
                         var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 212);
                         var container = varDeclList.parent.kind === 193 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
@@ -20033,6 +20747,11 @@ var ts;
                     checkExpressionCached(node.initializer);
                 }
             }
+            if (node.kind === 163) {
+                if (node.propertyName && node.propertyName.kind === 136) {
+                    checkComputedPropertyName(node.propertyName);
+                }
+            }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
@@ -20106,6 +20825,9 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
+            if (node.thenStatement.kind === 194) {
+                error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
+            }
             checkSourceElement(node.elseStatement);
         }
         function checkDoStatement(node) {
@@ -20355,7 +21077,7 @@ var ts;
                         error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                     else if (func.kind === 144) {
-                        if (!isTypeAssignableTo(exprType, returnType)) {
+                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
@@ -20388,6 +21110,7 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 if (clause.kind === 242 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
@@ -20404,6 +21127,9 @@ var ts;
                 if (produceDiagnostics && clause.kind === 241) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
+                    if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258)) {
+                        return;
+                    }
                     if (!isTypeAssignableTo(expressionType, caseType)) {
                         checkTypeAssignableTo(caseType, expressionType, caseClause.expression, undefined);
                     }
@@ -20485,7 +21211,7 @@ var ts;
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (!(member.flags & 128) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 64) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1);
@@ -20561,13 +21287,10 @@ var ts;
             return getTypeOfSymbol(getSymbolOfNode(node));
         }
         function checkClassDeclaration(node) {
-            if (!node.name && !(node.flags & 1024)) {
+            if (!node.name && !(node.flags & 512)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
             checkClassLikeDeclaration(node);
-            if (getSymbolOfNode(node).flags & 64 && !ts.isInAmbientContext(node)) {
-                error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-            }
             ts.forEach(node.members, checkSourceElement);
         }
         function checkClassLikeDeclaration(node) {
@@ -20614,8 +21337,8 @@ var ts;
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
             if (implementedTypeNodes) {
-                for (var _b = 0; _b < implementedTypeNodes.length; _b++) {
-                    var typeRefNode = implementedTypeNodes[_b];
+                for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
+                    var typeRefNode = implementedTypeNodes_1[_b];
                     if (!ts.isSupportedExpressionWithTypeArguments(typeRefNode)) {
                         error(typeRefNode.expression, ts.Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
                     }
@@ -20647,8 +21370,8 @@ var ts;
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
             var baseProperties = getPropertiesOfObjectType(baseType);
-            for (var _i = 0; _i < baseProperties.length; _i++) {
-                var baseProperty = baseProperties[_i];
+            for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
+                var baseProperty = baseProperties_1[_i];
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 134217728) {
                     continue;
@@ -20659,7 +21382,7 @@ var ts;
                 if (derived) {
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
-                        if (baseDeclarationFlags & 256 && (!derivedClassDecl || !(derivedClassDecl.flags & 256))) {
+                        if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(derivedClassDecl.flags & 128))) {
                             if (derivedClassDecl.kind === 186) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
@@ -20670,10 +21393,10 @@ var ts;
                     }
                     else {
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 32) || (derivedDeclarationFlags & 32)) {
+                        if ((baseDeclarationFlags & 16) || (derivedDeclarationFlags & 16)) {
                             continue;
                         }
-                        if ((baseDeclarationFlags & 128) !== (derivedDeclarationFlags & 128)) {
+                        if ((baseDeclarationFlags & 64) !== (derivedDeclarationFlags & 64)) {
                             continue;
                         }
                         if ((base.flags & derived.flags & 8192) || ((base.flags & 98308) && (derived.flags & 98308))) {
@@ -20739,11 +21462,11 @@ var ts;
             var seen = {};
             ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
             var ok = true;
-            for (var _i = 0; _i < baseTypes.length; _i++) {
-                var base = baseTypes[_i];
+            for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
+                var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var prop = properties[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     if (!ts.hasProperty(seen, prop.name)) {
                         seen[prop.name] = { prop: prop, containingType: base };
                     }
@@ -20787,15 +21510,6 @@ var ts;
                         checkIndexConstraints(type);
                     }
                 }
-                if (symbol && symbol.declarations) {
-                    for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
-                        var declaration = _c[_b];
-                        if (declaration.kind === 214 && !ts.isInAmbientContext(declaration)) {
-                            error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-                            break;
-                        }
-                    }
-                }
             }
             ts.forEach(ts.getInterfaceBaseTypeNodes(node), function (heritageElement) {
                 if (!ts.isSupportedExpressionWithTypeArguments(heritageElement)) {
@@ -20823,11 +21537,14 @@ var ts;
                 var enumIsConst = ts.isConst(node);
                 for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                     var member = _a[_i];
-                    if (member.name.kind === 136) {
+                    if (isComputedNonLiteralName(member.name)) {
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
-                    else if (isNumericLiteralName(member.name.text)) {
-                        error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                    else {
+                        var text = getTextOfPropertyName(member.name);
+                        if (isNumericLiteralName(text)) {
+                            error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                        }
                     }
                     var previousEnumMemberIsNonConstant = autoValue === undefined;
                     var initializer = member.initializer;
@@ -21021,8 +21738,8 @@ var ts;
         }
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
             var declarations = symbol.declarations;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
+                var declaration = declarations_5[_i];
                 if ((declaration.kind === 214 ||
                     (declaration.kind === 213 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
@@ -21150,7 +21867,7 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -21177,7 +21894,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 1) {
+                if (node.flags & 2) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -21205,7 +21922,7 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -21244,7 +21961,7 @@ var ts;
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69) {
@@ -21525,8 +22242,10 @@ var ts;
         function checkSourceFileWorker(node) {
             var links = getNodeLinks(node);
             if (!(links.flags & 1)) {
-                if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) {
-                    return;
+                if (compilerOptions.skipDefaultLibCheck) {
+                    if (node.hasNoDefaultLib) {
+                        return;
+                    }
                 }
                 checkGrammarSourceFile(node);
                 emitExtends = false;
@@ -21535,7 +22254,7 @@ var ts;
                 potentialThisCollisions.length = 0;
                 ts.forEach(node.statements, checkSourceElement);
                 checkFunctionAndClassExpressionBodies(node);
-                if (ts.isExternalModule(node)) {
+                if (ts.isExternalOrCommonJsModule(node)) {
                     checkExternalModuleExports(node);
                 }
                 if (potentialThisCollisions.length) {
@@ -21613,7 +22332,7 @@ var ts;
                     }
                     switch (location.kind) {
                         case 248:
-                            if (!ts.isExternalModule(location)) {
+                            if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
                         case 218:
@@ -21629,7 +22348,7 @@ var ts;
                             }
                         case 214:
                         case 215:
-                            if (!(memberFlags & 128)) {
+                            if (!(memberFlags & 64)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056);
                             }
                             break;
@@ -21891,7 +22610,7 @@ var ts;
         }
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 128
+            return node.flags & 64
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -21927,6 +22646,9 @@ var ts;
             }
             return [symbol];
         }
+        function isArgumentsLocalBinding(node) {
+            return getReferencedValueSymbol(node) === argumentsSymbol;
+        }
         function getReferencedExportContainer(node) {
             var symbol = getReferencedValueSymbol(node);
             if (symbol) {
@@ -22168,15 +22890,25 @@ var ts;
                 collectLinkedAliases: collectLinkedAliases,
                 getReferencedValueDeclaration: getReferencedValueDeclaration,
                 getTypeReferenceSerializationKind: getTypeReferenceSerializationKind,
-                isOptionalParameter: isOptionalParameter
+                isOptionalParameter: isOptionalParameter,
+                isArgumentsLocalBinding: isArgumentsLocalBinding,
+                getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration
             };
         }
+        function getExternalModuleFileFromDeclaration(declaration) {
+            var specifier = ts.getExternalModuleName(declaration);
+            var moduleSymbol = getSymbolAtLocation(specifier);
+            if (!moduleSymbol) {
+                return undefined;
+            }
+            return ts.getDeclarationOfKind(moduleSymbol, 248);
+        }
         function initializeTypeChecker() {
             ts.forEach(host.getSourceFiles(), function (file) {
-                ts.bindSourceFile(file);
+                ts.bindSourceFile(file, compilerOptions);
             });
             ts.forEach(host.getSourceFiles(), function (file) {
-                if (!ts.isExternalModule(file)) {
+                if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
             });
@@ -22317,19 +23049,19 @@ var ts;
                             text = "private";
                             lastPrivate = modifier;
                         }
-                        if (flags & 112) {
+                        if (flags & 56) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 128) {
+                        else if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
                         else if (node.parent.kind === 219 || node.parent.kind === 248) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
-                        else if (flags & 256) {
+                        else if (flags & 128) {
                             if (modifier.kind === 110) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
@@ -22340,10 +23072,10 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113:
-                        if (flags & 128) {
+                        if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
                         else if (node.parent.kind === 219 || node.parent.kind === 248) {
@@ -22352,23 +23084,23 @@ var ts;
                         else if (node.kind === 138) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
-                        else if (flags & 256) {
+                        else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 128;
+                        flags |= 64;
                         lastStatic = modifier;
                         break;
                     case 82:
-                        if (flags & 1) {
+                        if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 2) {
+                        else if (flags & 4) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
-                        else if (flags & 256) {
+                        else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (node.parent.kind === 214) {
@@ -22377,13 +23109,13 @@ var ts;
                         else if (node.kind === 138) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 1;
+                        flags |= 2;
                         break;
                     case 122:
-                        if (flags & 2) {
+                        if (flags & 4) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
-                        else if (flags & 512) {
+                        else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.parent.kind === 214) {
@@ -22395,69 +23127,69 @@ var ts;
                         else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 219) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 2;
+                        flags |= 4;
                         lastDeclare = modifier;
                         break;
                     case 115:
-                        if (flags & 256) {
+                        if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
                         if (node.kind !== 214) {
                             if (node.kind !== 143) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
                             }
-                            if (!(node.parent.kind === 214 && node.parent.flags & 256)) {
+                            if (!(node.parent.kind === 214 && node.parent.flags & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 128) {
+                            if (flags & 64) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 32) {
+                            if (flags & 16) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
-                        flags |= 256;
+                        flags |= 128;
                         break;
                     case 118:
-                        if (flags & 512) {
+                        if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 4 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.kind === 138) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
-                        flags |= 512;
+                        flags |= 256;
                         lastAsync = modifier;
                         break;
                 }
             }
             if (node.kind === 144) {
-                if (flags & 128) {
+                if (flags & 64) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & 256) {
+                if (flags & 128) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 64) {
+                else if (flags & 32) {
                     return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
                 }
-                else if (flags & 32) {
+                else if (flags & 16) {
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
-                else if (flags & 512) {
+                else if (flags & 256) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
                 return;
             }
-            else if ((node.kind === 222 || node.kind === 221) && flags & 2) {
+            else if ((node.kind === 222 || node.kind === 221) && flags & 4) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 138 && (flags & 112) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 138 && (flags & 56) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
-            if (flags & 512) {
+            if (flags & 256) {
                 return checkGrammarAsyncModifier(node, lastAsync);
             }
         }
@@ -22557,7 +23289,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 2035) {
+            if (parameter.flags & 1022) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -22577,7 +23309,7 @@ var ts;
             }
         }
         function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 2035) {
+            if (node.flags & 1022) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
             }
         }
@@ -22599,8 +23331,8 @@ var ts;
         function checkGrammarForOmittedArgument(node, args) {
             if (args) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                for (var _i = 0; _i < args.length; _i++) {
-                    var arg = args[_i];
+                for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
+                    var arg = args_1[_i];
                     if (arg.kind === 187) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
@@ -22840,7 +23572,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 2035) {
+                    else if (parameter.flags & 1022) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -22853,7 +23585,7 @@ var ts;
             }
         }
         function checkGrammarForNonSymbolComputedProperty(node, message) {
-            if (node.kind === 136 && !ts.isWellKnownSymbolSyntactically(node.expression)) {
+            if (ts.isDynamicName(node)) {
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -22889,19 +23621,6 @@ var ts;
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
-        function isIterationStatement(node, lookInLabeledStatements) {
-            switch (node.kind) {
-                case 199:
-                case 200:
-                case 201:
-                case 197:
-                case 198:
-                    return true;
-                case 207:
-                    return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-            }
-            return false;
-        }
         function checkGrammarBreakOrContinueStatement(node) {
             var current = node;
             while (current) {
@@ -22912,7 +23631,7 @@ var ts;
                     case 207:
                         if (node.label && current.label.text === node.label.text) {
                             var isMisplacedContinueLabel = node.kind === 202
-                                && !isIterationStatement(current.statement, true);
+                                && !ts.isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -22925,7 +23644,7 @@ var ts;
                         }
                         break;
                     default:
-                        if (isIterationStatement(current, false) && !node.label) {
+                        if (ts.isIterationStatement(current, false) && !node.label) {
                             return false;
                         }
                         break;
@@ -22987,8 +23706,8 @@ var ts;
             }
             else {
                 var elements = name.elements;
-                for (var _i = 0; _i < elements.length; _i++) {
-                    var element = elements[_i];
+                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                    var element = elements_2[_i];
                     if (element.kind !== 187) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
@@ -23102,12 +23821,13 @@ var ts;
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
             if (node.kind === 215 ||
+                node.kind === 216 ||
                 node.kind === 222 ||
                 node.kind === 221 ||
                 node.kind === 228 ||
                 node.kind === 227 ||
-                (node.flags & 2) ||
-                (node.flags & (1 | 1024))) {
+                (node.flags & 4) ||
+                (node.flags & (2 | 512))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -23145,7 +23865,7 @@ var ts;
             }
         }
         function checkGrammarNumericLiteral(node) {
-            if (node.flags & 65536 && languageVersion >= 1) {
+            if (node.flags & 32768 && languageVersion >= 1) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -23179,11 +23899,15 @@ var ts;
         var writeTextOfNode;
         var writer = createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
-        var currentSourceFile;
+        var currentText;
+        var currentLineMap;
+        var currentIdentifiers;
+        var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
         var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        var noDeclare = !root;
         var moduleElementDeclarationEmitInfo = [];
         var asynchronousSubModuleDeclarationEmitInfo;
         var referencePathsOutput = "";
@@ -23192,7 +23916,7 @@ var ts;
                 var addedGlobalFileReference = false;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
-                    if (referencedFile && ((referencedFile.flags & 8192) ||
+                    if (referencedFile && ((referencedFile.flags & 4096) ||
                         ts.shouldEmitToOwnFile(referencedFile, compilerOptions) ||
                         !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
@@ -23219,21 +23943,53 @@ var ts;
         }
         else {
             var emittedReferencedFiles = [];
+            var prevModuleElementDeclarationEmitInfo = [];
             ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                if (!ts.isDeclarationFile(sourceFile)) {
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) &&
+                            if (referencedFile && (ts.isDeclarationFile(referencedFile) &&
                                 !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
                         });
                     }
+                }
+                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                    noDeclare = false;
                     emitSourceFile(sourceFile);
                 }
+                else if (ts.isExternalModule(sourceFile)) {
+                    noDeclare = true;
+                    write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {");
+                    writeLine();
+                    increaseIndent();
+                    emitSourceFile(sourceFile);
+                    decreaseIndent();
+                    write("}");
+                    writeLine();
+                    if (moduleElementDeclarationEmitInfo.length) {
+                        var oldWriter = writer;
+                        ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
+                            if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
+                                ts.Debug.assert(aliasEmitInfo.node.kind === 222);
+                                createAndSetNewTextWriterWithSymbolWriter();
+                                ts.Debug.assert(aliasEmitInfo.indent === 1);
+                                increaseIndent();
+                                writeImportDeclaration(aliasEmitInfo.node);
+                                aliasEmitInfo.asynchronousOutput = writer.getText();
+                                decreaseIndent();
+                            }
+                        });
+                        setWriter(oldWriter);
+                    }
+                    prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
+                    moduleElementDeclarationEmitInfo = [];
+                }
             });
+            moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo);
         }
         return {
             reportedDeclarationError: reportedDeclarationError,
@@ -23242,13 +23998,12 @@ var ts;
             referencePathsOutput: referencePathsOutput
         };
         function hasInternalAnnotation(range) {
-            var text = currentSourceFile.text;
-            var comment = text.substring(range.pos, range.end);
+            var comment = currentText.substring(range.pos, range.end);
             return comment.indexOf("@internal") >= 0;
         }
         function stripInternal(node) {
             if (node) {
-                var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos);
                 if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
                     return;
                 }
@@ -23329,7 +24084,7 @@ var ts;
                 var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
                     }
                     else {
                         diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
@@ -23370,15 +24125,15 @@ var ts;
             }
         }
         function emitLines(nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+                var node = nodes_2[_i];
                 emit(node);
             }
         }
         function emitSeparatedList(nodes, separator, eachNodeEmitFn, canEmitFn) {
             var currentWriterPos = writer.getTextPos();
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+                var node = nodes_3[_i];
                 if (!canEmitFn || canEmitFn(node)) {
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(separator);
@@ -23393,9 +24148,9 @@ var ts;
         }
         function writeJsDocComments(declaration) {
             if (declaration) {
-                var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile);
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments);
-                ts.emitComments(currentSourceFile, writer, jsDocComments, true, newLine, ts.writeCommentRange);
+                var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
+                ts.emitComments(currentText, currentLineMap, writer, jsDocComments, true, newLine, ts.writeCommentRange);
             }
         }
         function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) {
@@ -23412,7 +24167,7 @@ var ts;
                 case 103:
                 case 97:
                 case 9:
-                    return writeTextOfNode(currentSourceFile, type);
+                    return writeTextOfNode(currentText, type);
                 case 188:
                     return emitExpressionWithTypeArguments(type);
                 case 151:
@@ -23443,14 +24198,14 @@ var ts;
             }
             function writeEntityName(entityName) {
                 if (entityName.kind === 69) {
-                    writeTextOfNode(currentSourceFile, entityName);
+                    writeTextOfNode(currentText, entityName);
                 }
                 else {
                     var left = entityName.kind === 135 ? entityName.left : entityName.expression;
                     var right = entityName.kind === 135 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
-                    writeTextOfNode(currentSourceFile, right);
+                    writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
@@ -23478,7 +24233,7 @@ var ts;
                 }
             }
             function emitTypePredicate(type) {
-                writeTextOfNode(currentSourceFile, type.parameterName);
+                writeTextOfNode(currentText, type.parameterName);
                 write(" is ");
                 emitType(type.type);
             }
@@ -23518,19 +24273,23 @@ var ts;
             }
         }
         function emitSourceFile(node) {
-            currentSourceFile = node;
+            currentText = node.text;
+            currentLineMap = ts.getLineStarts(node);
+            currentIdentifiers = node.identifiers;
+            isCurrentFileExternalModule = ts.isExternalModule(node);
             enclosingDeclaration = node;
+            ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true);
             emitLines(node.statements);
         }
         function getExportDefaultTempVariableName() {
             var baseName = "_default";
-            if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) {
+            if (!ts.hasProperty(currentIdentifiers, baseName)) {
                 return baseName;
             }
             var count = 0;
             while (true) {
                 var name_19 = baseName + "_" + (++count);
-                if (!ts.hasProperty(currentSourceFile.identifiers, name_19)) {
+                if (!ts.hasProperty(currentIdentifiers, name_19)) {
                     return name_19;
                 }
             }
@@ -23538,7 +24297,7 @@ var ts;
         function emitExportAssignment(node) {
             if (node.expression.kind === 69) {
                 write(node.isExportEquals ? "export = " : "export default ");
-                writeTextOfNode(currentSourceFile, node.expression);
+                writeTextOfNode(currentText, node.expression);
             }
             else {
                 var tempVarName = getExportDefaultTempVariableName();
@@ -23573,7 +24332,7 @@ var ts;
                 writeModuleElement(node);
             }
             else if (node.kind === 221 ||
-                (node.parent.kind === 248 && ts.isExternalModule(currentSourceFile))) {
+                (node.parent.kind === 248 && isCurrentFileExternalModule)) {
                 var isVisible;
                 if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
@@ -23625,39 +24384,39 @@ var ts;
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent === currentSourceFile) {
-                if (node.flags & 1) {
+            if (node.parent.kind === 248) {
+                if (node.flags & 2) {
                     write("export ");
                 }
-                if (node.flags & 1024) {
+                if (node.flags & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 215) {
+                else if (node.kind !== 215 && !noDeclare) {
                     write("declare ");
                 }
             }
         }
         function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 32) {
+            if (node.flags & 16) {
                 write("private ");
             }
-            else if (node.flags & 64) {
+            else if (node.flags & 32) {
                 write("protected ");
             }
-            if (node.flags & 128) {
+            if (node.flags & 64) {
                 write("static ");
             }
-            if (node.flags & 256) {
+            if (node.flags & 128) {
                 write("abstract ");
             }
         }
         function writeImportEqualsDeclaration(node) {
             emitJsDocComments(node);
-            if (node.flags & 1) {
+            if (node.flags & 2) {
                 write("export ");
             }
             write("import ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" = ");
             if (ts.isInternalModuleImportEqualsDeclaration(node)) {
                 emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError);
@@ -23665,7 +24424,7 @@ var ts;
             }
             else {
                 write("require(");
-                writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node));
+                writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 write(");");
             }
             writer.writeLine();
@@ -23688,18 +24447,18 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 1)) {
+            if (!node.importClause && !(node.flags & 2)) {
                 return;
             }
             emitJsDocComments(node);
-            if (node.flags & 1) {
+            if (node.flags & 2) {
                 write("export ");
             }
             write("import ");
             if (node.importClause) {
                 var currentWriterPos = writer.getTextPos();
                 if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) {
-                    writeTextOfNode(currentSourceFile, node.importClause.name);
+                    writeTextOfNode(currentText, node.importClause.name);
                 }
                 if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) {
                     if (currentWriterPos !== writer.getTextPos()) {
@@ -23707,7 +24466,7 @@ var ts;
                     }
                     if (node.importClause.namedBindings.kind === 224) {
                         write("* as ");
-                        writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name);
+                        writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
                     else {
                         write("{ ");
@@ -23717,16 +24476,28 @@ var ts;
                 }
                 write(" from ");
             }
-            writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+            emitExternalModuleSpecifier(node.moduleSpecifier);
             write(";");
             writer.writeLine();
         }
+        function emitExternalModuleSpecifier(moduleSpecifier) {
+            if (moduleSpecifier.kind === 9 && (!root) && (compilerOptions.out || compilerOptions.outFile)) {
+                var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent);
+                if (moduleName) {
+                    write("\"");
+                    write(moduleName);
+                    write("\"");
+                    return;
+                }
+            }
+            writeTextOfNode(currentText, moduleSpecifier);
+        }
         function emitImportOrExportSpecifier(node) {
             if (node.propertyName) {
-                writeTextOfNode(currentSourceFile, node.propertyName);
+                writeTextOfNode(currentText, node.propertyName);
                 write(" as ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
         }
         function emitExportSpecifier(node) {
             emitImportOrExportSpecifier(node);
@@ -23746,7 +24517,7 @@ var ts;
             }
             if (node.moduleSpecifier) {
                 write(" from ");
-                writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+                emitExternalModuleSpecifier(node.moduleSpecifier);
             }
             write(";");
             writer.writeLine();
@@ -23754,17 +24525,17 @@ var ts;
         function writeModuleDeclaration(node) {
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 131072) {
+            if (node.flags & 65536) {
                 write("namespace ");
             }
             else {
                 write("module ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             while (node.body.kind !== 219) {
                 node = node.body;
                 write(".");
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
@@ -23783,7 +24554,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("type ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             emitTypeParameters(node.typeParameters);
             write(" = ");
             emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
@@ -23805,7 +24576,7 @@ var ts;
                 write("const ");
             }
             write("enum ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" {");
             writeLine();
             increaseIndent();
@@ -23816,7 +24587,7 @@ var ts;
         }
         function emitEnumMemberDeclaration(node) {
             emitJsDocComments(node);
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var enumMemberValue = resolver.getConstantValue(node);
             if (enumMemberValue !== undefined) {
                 write(" = ");
@@ -23826,14 +24597,14 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 143 && (node.parent.flags & 32);
+            return node.parent.kind === 143 && (node.parent.flags & 16);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
                 increaseIndent();
                 emitJsDocComments(node);
                 decreaseIndent();
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
                     if (node.parent.kind === 152 ||
@@ -23868,7 +24639,7 @@ var ts;
                             break;
                         case 143:
                         case 142:
-                            if (node.parent.flags & 128) {
+                            if (node.parent.flags & 64) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else if (node.parent.parent.kind === 214) {
@@ -23931,7 +24702,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 112) {
+                        if (param.flags & 56) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -23939,11 +24710,11 @@ var ts;
             }
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 256) {
+            if (node.flags & 128) {
                 write("abstract ");
             }
             write("class ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -23966,7 +24737,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("interface ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -23996,14 +24767,14 @@ var ts;
                     emitBindingPattern(node.name);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if ((node.kind === 141 || node.kind === 140) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
                     if ((node.kind === 141 || node.kind === 140) && node.parent.kind === 155) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 32)) {
+                    else if (!(node.flags & 16)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
@@ -24017,7 +24788,7 @@ var ts;
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
                 else if (node.kind === 141 || node.kind === 140) {
-                    if (node.flags & 128) {
+                    if (node.flags & 64) {
                         return symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -24070,7 +24841,7 @@ var ts;
                         emitBindingPattern(bindingElement.name);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, bindingElement.name);
+                        writeTextOfNode(currentText, bindingElement.name);
                         writeTypeOfDeclaration(bindingElement, undefined, getBindingElementTypeVisibilityError);
                     }
                 }
@@ -24111,8 +24882,8 @@ var ts;
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
                 emitClassMemberDeclarationFlags(node);
-                writeTextOfNode(currentSourceFile, node.name);
-                if (!(node.flags & 32)) {
+                writeTextOfNode(currentText, node.name);
+                if (!(node.flags & 16)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
@@ -24139,7 +24910,7 @@ var ts;
             function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 146) {
-                    if (accessorWithTypeAnnotation.parent.flags & 128) {
+                    if (accessorWithTypeAnnotation.parent.flags & 64) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
@@ -24156,7 +24927,7 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 128) {
+                    if (accessorWithTypeAnnotation.flags & 64) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -24192,13 +24963,13 @@ var ts;
                 }
                 if (node.kind === 213) {
                     write("function ");
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                 }
                 else if (node.kind === 144) {
                     write("constructor");
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if (ts.hasQuestionToken(node)) {
                         write("?");
                     }
@@ -24237,7 +25008,7 @@ var ts;
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 144 && !(node.flags & 32)) {
+            else if (node.kind !== 144 && !(node.flags & 16)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -24265,7 +25036,7 @@ var ts;
                         break;
                     case 143:
                     case 142:
-                        if (node.flags & 128) {
+                        if (node.flags & 64) {
                             diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -24311,7 +25082,7 @@ var ts;
                 emitBindingPattern(node.name);
             }
             else {
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             if (resolver.isOptionalParameter(node)) {
                 write("?");
@@ -24322,7 +25093,7 @@ var ts;
                 node.parent.parent.kind === 155) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 32)) {
+            else if (!(node.parent.flags & 16)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
             function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
@@ -24351,7 +25122,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     case 143:
                     case 142:
-                        if (node.parent.flags & 128) {
+                        if (node.parent.flags & 64) {
                             return symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -24410,7 +25181,7 @@ var ts;
                 }
                 else if (bindingElement.kind === 163) {
                     if (bindingElement.propertyName) {
-                        writeTextOfNode(currentSourceFile, bindingElement.propertyName);
+                        writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
                     }
                     if (bindingElement.name) {
@@ -24422,7 +25193,7 @@ var ts;
                             if (bindingElement.dotDotDotToken) {
                                 write("...");
                             }
-                            writeTextOfNode(currentSourceFile, bindingElement.name);
+                            writeTextOfNode(currentText, bindingElement.name);
                         }
                     }
                 }
@@ -24467,7 +25238,7 @@ var ts;
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 8192
+            var declFileName = referencedFile.flags & 4096
                 ? referencedFile.fileName
                 : ts.shouldEmitToOwnFile(referencedFile, compilerOptions)
                     ? ts.getOwnEmitOutputFilePath(referencedFile, host, ".d.ts")
@@ -24505,6 +25276,18 @@ var ts;
         return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile);
     }
     ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile;
+    function getResolvedExternalModuleName(host, file) {
+        return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || ts.isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
     var entities = {
         "quot": 0x0022,
         "amp": 0x0026,
@@ -24774,15 +25557,19 @@ var ts;
         var newLine = host.getNewLine();
         var jsxDesugaring = host.getCompilerOptions().jsx !== 1;
         var shouldEmitJsx = function (s) { return (s.languageVariant === 1 && !jsxDesugaring); };
+        var outFile = compilerOptions.outFile || compilerOptions.out;
+        var emitJavaScript = createFileEmitter();
         if (targetSourceFile === undefined) {
-            ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
-                    var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
-                    emitFile(jsFilePath, sourceFile);
-                }
-            });
-            if (compilerOptions.outFile || compilerOptions.out) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            if (outFile) {
+                emitFile(outFile);
+            }
+            else {
+                ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                    if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
+                        var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
+                        emitFile(jsFilePath, sourceFile);
+                    }
+                });
             }
         }
         else {
@@ -24790,8 +25577,8 @@ var ts;
                 var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
                 emitFile(jsFilePath, targetSourceFile);
             }
-            else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            else if (!ts.isDeclarationFile(targetSourceFile) && outFile) {
+                emitFile(outFile);
             }
         }
         diagnostics = ts.sortAndDeduplicateDiagnostics(diagnostics);
@@ -24800,16 +25587,8 @@ var ts;
             diagnostics: diagnostics,
             sourceMaps: sourceMapDataList
         };
-        function isNodeDescendentOf(node, ancestor) {
-            while (node) {
-                if (node === ancestor)
-                    return true;
-                node = node.parent;
-            }
-            return false;
-        }
         function isUniqueLocalName(name, container) {
-            for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
+            for (var node = container; ts.isNodeDescendentOf(node, container); node = node.nextContainer) {
                 if (node.locals && ts.hasProperty(node.locals, name)) {
                     if (node.locals[name].flags & (107455 | 1048576 | 8388608)) {
                         return false;
@@ -24818,19 +25597,57 @@ var ts;
             }
             return true;
         }
-        function emitJavaScript(jsFilePath, root) {
+        function setLabeledJump(state, isBreak, labelText, labelMarker) {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = {};
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = {};
+                }
+                state.labeledNonLocalContinues[labelText] = labelMarker;
+            }
+        }
+        function hoistVariableDeclarationFromLoop(state, declaration) {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+            visit(declaration.name);
+            function visit(node) {
+                if (node.kind === 69) {
+                    state.hoistedLocalVariables.push(node);
+                }
+                else {
+                    for (var _a = 0, _b = node.elements; _a < _b.length; _a++) {
+                        var element = _b[_a];
+                        visit(element.name);
+                    }
+                }
+            }
+        }
+        function createFileEmitter() {
             var writer = ts.createTextWriter(newLine);
             var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent;
             var currentSourceFile;
+            var currentText;
+            var currentLineMap;
+            var currentFileIdentifiers;
+            var renamedDependencies;
+            var isEs6Module;
+            var isCurrentFileExternalModule;
             var exportFunctionForFile;
-            var generatedNameSet = {};
-            var nodeToGeneratedName = [];
+            var generatedNameSet;
+            var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
-            var extendsEmitted = false;
-            var decorateEmitted = false;
-            var paramEmitted = false;
-            var awaiterEmitted = false;
-            var tempFlags = 0;
+            var convertedLoopState;
+            var extendsEmitted;
+            var decorateEmitted;
+            var paramEmitted;
+            var awaiterEmitted;
+            var tempFlags;
             var tempVariables;
             var tempParameters;
             var externalImports;
@@ -24847,6 +25664,7 @@ var ts;
             var scopeEmitStart = function (scopeDeclaration, scopeName) { };
             var scopeEmitEnd = function () { };
             var sourceMapData;
+            var root;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var moduleEmitDelegates = (_a = {},
                 _a[5] = emitES6Module,
@@ -24856,30 +25674,75 @@ var ts;
                 _a[1] = emitCommonJSModule,
                 _a
             );
-            if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
-                initializeEmitterWithSourceMaps();
-            }
-            if (root) {
-                emitSourceFile(root);
-            }
-            else {
-                ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emitSourceFile(sourceFile);
+            var bundleEmitDelegates = (_b = {},
+                _b[5] = function () { },
+                _b[2] = emitAMDModule,
+                _b[4] = emitSystemModule,
+                _b[3] = function () { },
+                _b[1] = function () { },
+                _b
+            );
+            return doEmit;
+            function doEmit(jsFilePath, rootFile) {
+                writer.reset();
+                currentSourceFile = undefined;
+                currentText = undefined;
+                currentLineMap = undefined;
+                exportFunctionForFile = undefined;
+                generatedNameSet = {};
+                nodeToGeneratedName = [];
+                computedPropertyNamesToGeneratedNames = undefined;
+                convertedLoopState = undefined;
+                extendsEmitted = false;
+                decorateEmitted = false;
+                paramEmitted = false;
+                awaiterEmitted = false;
+                tempFlags = 0;
+                tempVariables = undefined;
+                tempParameters = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStars = undefined;
+                detachedCommentsInfo = undefined;
+                sourceMapData = undefined;
+                isEs6Module = false;
+                renamedDependencies = undefined;
+                isCurrentFileExternalModule = false;
+                root = rootFile;
+                if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
+                    initializeEmitterWithSourceMaps(jsFilePath, root);
+                }
+                if (root) {
+                    emitSourceFile(root);
+                }
+                else {
+                    if (modulekind) {
+                        ts.forEach(host.getSourceFiles(), emitEmitHelpers);
                     }
-                });
+                    ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                        if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) {
+                            emitSourceFile(sourceFile);
+                        }
+                    });
+                }
+                writeLine();
+                writeEmittedFiles(writer.getText(), jsFilePath, compilerOptions.emitBOM);
             }
-            writeLine();
-            writeEmittedFiles(writer.getText(), compilerOptions.emitBOM);
-            return;
             function emitSourceFile(sourceFile) {
                 currentSourceFile = sourceFile;
+                currentText = sourceFile.text;
+                currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
+                renamedDependencies = sourceFile.renamedDependencies;
+                currentFileIdentifiers = sourceFile.identifiers;
+                isCurrentFileExternalModule = ts.isExternalModule(sourceFile);
                 emit(sourceFile);
             }
             function isUniqueName(name) {
                 return !resolver.hasGlobalName(name) &&
-                    !ts.hasProperty(currentSourceFile.identifiers, name) &&
+                    !ts.hasProperty(currentFileIdentifiers, name) &&
                     !ts.hasProperty(generatedNameSet, name);
             }
             function makeTempVariableName(flags) {
@@ -24952,7 +25815,7 @@ var ts;
                 var id = ts.getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
-            function initializeEmitterWithSourceMaps() {
+            function initializeEmitterWithSourceMaps(jsFilePath, root) {
                 var sourceMapDir;
                 var sourceMapSourceIndex = -1;
                 var sourceMapNameIndexMap = {};
@@ -25021,7 +25884,7 @@ var ts;
                     }
                 }
                 function recordSourceMapSpan(pos) {
-                    var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos);
+                    var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos);
                     sourceLinePos.line++;
                     sourceLinePos.character++;
                     var emittedLine = writer.getLine();
@@ -25049,13 +25912,13 @@ var ts;
                     }
                 }
                 function recordEmitNodeStartSpan(node) {
-                    recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos));
+                    recordSourceMapSpan(ts.skipTrivia(currentText, node.pos));
                 }
                 function recordEmitNodeEndSpan(node) {
                     recordSourceMapSpan(node.end);
                 }
                 function writeTextWithSpanRecord(tokenKind, startPos, emitFn) {
-                    var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
+                    var tokenStartPos = ts.skipTrivia(currentText, startPos);
                     recordSourceMapSpan(tokenStartPos);
                     var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
                     recordSourceMapSpan(tokenEndPos);
@@ -25125,9 +25988,9 @@ var ts;
                     sourceMapNameIndices.pop();
                 }
                 ;
-                function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) {
+                function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) {
                     recordSourceMapSpan(comment.pos);
-                    ts.writeCommentRange(currentSourceFile, writer, comment, newLine);
+                    ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine);
                     recordSourceMapSpan(comment.end);
                 }
                 function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) {
@@ -25157,7 +26020,7 @@ var ts;
                         return output;
                     }
                 }
-                function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) {
+                function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) {
                     encodeLastRecordedSourceMapSpan();
                     var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent);
                     sourceMapDataList.push(sourceMapData);
@@ -25170,7 +26033,7 @@ var ts;
                         ts.writeFile(host, diagnostics, sourceMapData.sourceMapFilePath, sourceMapText, false);
                         sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL;
                     }
-                    writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark);
+                    writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark);
                 }
                 var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath));
                 sourceMapData = {
@@ -25233,7 +26096,7 @@ var ts;
                 scopeEmitEnd = recordScopeNameEnd;
                 writeComment = writeCommentRangeWithMap;
             }
-            function writeJavaScriptFile(emitOutput, writeByteOrderMark) {
+            function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) {
                 ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
             function createTempVariable(flags) {
@@ -25403,7 +26266,7 @@ var ts;
                     return getQuotedEscapedLiteralText("\"", node.text, "\"");
                 }
                 if (node.parent) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                    return ts.getTextOfNodeFromSourceText(currentText, node);
                 }
                 switch (node.kind) {
                     case 9:
@@ -25425,7 +26288,7 @@ var ts;
                 return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote;
             }
             function emitDownlevelRawTemplateLiteral(node) {
-                var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                var text = ts.getTextOfNodeFromSourceText(currentText, node);
                 var isLast = node.kind === 11 || node.kind === 14;
                 text = text.substring(1, text.length - (isLast ? 1 : 2));
                 text = text.replace(/\r\n?/g, "\n");
@@ -25755,7 +26618,7 @@ var ts;
                         write(node.text);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, node);
+                        writeTextOfNode(currentText, node);
                     }
                     write("\"");
                 }
@@ -25839,39 +26702,43 @@ var ts;
                         write(".");
                     }
                 }
-                else if (modulekind !== 5) {
-                    var declaration = resolver.getReferencedImportDeclaration(node);
-                    if (declaration) {
-                        if (declaration.kind === 223) {
-                            write(getGeneratedNameForNode(declaration.parent));
-                            write(languageVersion === 0 ? "[\"default\"]" : ".default");
-                            return;
-                        }
-                        else if (declaration.kind === 226) {
-                            write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                            var name_24 = declaration.propertyName || declaration.name;
-                            var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_24);
-                            if (languageVersion === 0 && identifier === "default") {
-                                write("[\"default\"]");
+                else {
+                    if (modulekind !== 5) {
+                        var declaration = resolver.getReferencedImportDeclaration(node);
+                        if (declaration) {
+                            if (declaration.kind === 223) {
+                                write(getGeneratedNameForNode(declaration.parent));
+                                write(languageVersion === 0 ? "[\"default\"]" : ".default");
+                                return;
                             }
-                            else {
-                                write(".");
-                                write(identifier);
+                            else if (declaration.kind === 226) {
+                                write(getGeneratedNameForNode(declaration.parent.parent.parent));
+                                var name_24 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_24);
+                                if (languageVersion === 0 && identifier === "default") {
+                                    write("[\"default\"]");
+                                }
+                                else {
+                                    write(".");
+                                    write(identifier);
+                                }
+                                return;
                             }
-                            return;
                         }
                     }
-                    declaration = resolver.getReferencedNestedRedeclaration(node);
-                    if (declaration) {
-                        write(getGeneratedNameForNode(declaration.name));
-                        return;
+                    if (languageVersion !== 2) {
+                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                        if (declaration) {
+                            write(getGeneratedNameForNode(declaration.name));
+                            return;
+                        }
                     }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function isNameOfNestedRedeclaration(node) {
@@ -25888,6 +26755,13 @@ var ts;
                 return false;
             }
             function emitIdentifier(node) {
+                if (convertedLoopState) {
+                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
+                        var name_25 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_25);
+                        return;
+                    }
+                }
                 if (!node.parent) {
                     write(node.text);
                 }
@@ -25901,7 +26775,7 @@ var ts;
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function emitThis(node) {
@@ -26059,7 +26933,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, true, (node.flags & 2048) !== 0, elements.hasTrailingComma, true);
+                    emitListWithSpread(elements, true, (node.flags & 1024) !== 0, elements.hasTrailingComma, true);
                 }
             }
             function emitObjectLiteralBody(node, numElements) {
@@ -26074,7 +26948,7 @@ var ts;
                         emitLinePreservingList(node, properties, languageVersion >= 1, true);
                     }
                     else {
-                        var multiLine = (node.flags & 2048) !== 0;
+                        var multiLine = (node.flags & 1024) !== 0;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -26093,7 +26967,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 2048) !== 0;
+                var multiLine = (node.flags & 1024) !== 0;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -26268,8 +27142,8 @@ var ts;
                 return container && container.kind !== 248;
             }
             function emitShorthandPropertyAssignment(node) {
-                writeTextOfNode(currentSourceFile, node.name);
-                if (languageVersion < 2 || isNamespaceExportReference(node.name)) {
+                writeTextOfNode(currentText, node.name);
+                if (modulekind !== 5 || isNamespaceExportReference(node.name)) {
                     write(": ");
                     emit(node.name);
                 }
@@ -26319,10 +27193,10 @@ var ts;
                 }
                 emit(node.expression);
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
-                var shouldEmitSpace;
+                var shouldEmitSpace = false;
                 if (!indentedBeforeDot) {
                     if (node.expression.kind === 8) {
-                        var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression);
+                        var text = ts.getTextOfNodeFromSourceText(currentText, node.expression);
                         shouldEmitSpace = text.indexOf(ts.tokenToString(21)) < 0;
                     }
                     else {
@@ -26605,13 +27479,13 @@ var ts;
                 return isSourceFileLevelDeclarationInSystemJsModule(node, false);
             }
             function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
-                if (!node || languageVersion >= 2 || !isCurrentFileSystemExternalModule()) {
+                if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
                 var current = node;
                 while (current) {
                     if (current.kind === 248) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1) !== 0);
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2) !== 0);
                     }
                     else if (ts.isFunctionLike(current) || current.kind === 219) {
                         return false;
@@ -26791,8 +27665,16 @@ var ts;
                 }
             }
             function emitDoStatement(node) {
+                emitLoop(node, emitDoStatementWorker);
+            }
+            function emitDoStatementWorker(node, loop) {
                 write("do");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
                 if (node.statement.kind === 192) {
                     write(" ");
                 }
@@ -26804,15 +27686,30 @@ var ts;
                 write(");");
             }
             function emitWhileStatement(node) {
+                emitLoop(node, emitWhileStatementWorker);
+            }
+            function emitWhileStatementWorker(node, loop) {
                 write("while (");
                 emit(node.expression);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
             }
             function tryEmitStartOfVariableDeclarationList(decl, startPos) {
                 if (shouldHoistVariable(decl, true)) {
                     return false;
                 }
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576) === 0) {
+                    for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
+                        var varDecl = _b[_a];
+                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
+                    }
+                    return false;
+                }
                 var tokenKind = 102;
                 if (decl && languageVersion >= 2) {
                     if (ts.isLet(decl)) {
@@ -26858,7 +27755,221 @@ var ts;
                 }
                 return started;
             }
+            function shouldConvertLoopBody(node) {
+                return languageVersion < 2 &&
+                    (resolver.getNodeCheckFlags(node) & 65536) !== 0;
+            }
+            function emitLoop(node, loopEmitter) {
+                var shouldConvert = shouldConvertLoopBody(node);
+                if (!shouldConvert) {
+                    loopEmitter(node, undefined);
+                }
+                else {
+                    var loop = convertLoopBody(node);
+                    if (node.parent.kind === 207) {
+                        emitLabelAndColon(node.parent);
+                    }
+                    loopEmitter(node, loop);
+                }
+            }
+            function convertLoopBody(node) {
+                var functionName = makeUniqueName("_loop");
+                var loopInitializer;
+                switch (node.kind) {
+                    case 199:
+                    case 200:
+                    case 201:
+                        if (node.initializer.kind === 212) {
+                            loopInitializer = node.initializer;
+                        }
+                        break;
+                }
+                var loopParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576)) {
+                    loopParameters = [];
+                    for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
+                        var varDeclaration = _b[_a];
+                        collectNames(varDeclaration.name);
+                    }
+                }
+                var bodyIsBlock = node.statement.kind === 192;
+                var paramList = loopParameters ? loopParameters.join(", ") : "";
+                writeLine();
+                write("var " + functionName + " = function(" + paramList + ")");
+                if (!bodyIsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                var convertedOuterLoopState = convertedLoopState;
+                convertedLoopState = {};
+                if (convertedOuterLoopState) {
+                    if (convertedOuterLoopState.argumentsName) {
+                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
+                    }
+                    if (convertedOuterLoopState.hoistedLocalVariables) {
+                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
+                    }
+                }
+                emitEmbeddedStatement(node.statement);
+                if (!bodyIsBlock) {
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                write(";");
+                writeLine();
+                if (convertedLoopState.argumentsName) {
+                    if (convertedOuterLoopState) {
+                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
+                    }
+                    else {
+                        write("var " + convertedLoopState.argumentsName + " = arguments;");
+                        writeLine();
+                    }
+                }
+                if (convertedLoopState.hoistedLocalVariables) {
+                    if (convertedOuterLoopState) {
+                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
+                    }
+                    else {
+                        write("var ");
+                        var seen;
+                        for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
+                            var id = _d[_c];
+                            if (!seen) {
+                                seen = {};
+                            }
+                            else {
+                                write(", ");
+                            }
+                            if (!ts.hasProperty(seen, id.text)) {
+                                emit(id);
+                                seen[id.text] = id.text;
+                            }
+                        }
+                        write(";");
+                        writeLine();
+                    }
+                }
+                var currentLoopState = convertedLoopState;
+                convertedLoopState = convertedOuterLoopState;
+                return { functionName: functionName, paramList: paramList, state: currentLoopState };
+                function collectNames(name) {
+                    if (name.kind === 69) {
+                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        loopParameters.push(nameText);
+                    }
+                    else {
+                        for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
+                            var element = _b[_a];
+                            collectNames(element.name);
+                        }
+                    }
+                }
+            }
+            function emitNormalLoopBody(node, emitAsEmbeddedStatement) {
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = 2 | 4;
+                }
+                if (emitAsEmbeddedStatement) {
+                    emitEmbeddedStatement(node.statement);
+                }
+                else if (node.statement.kind === 192) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+            }
+            function emitConvertedLoopCall(loop, emitAsBlock) {
+                if (emitAsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                    !loop.state.labeledNonLocalBreaks &&
+                    !loop.state.labeledNonLocalContinues;
+                var loopResult = makeUniqueName("state");
+                if (!isSimpleLoop) {
+                    write("var " + loopResult + " = ");
+                }
+                write(loop.functionName + "(" + loop.paramList + ");");
+                if (!isSimpleLoop) {
+                    writeLine();
+                    if (loop.state.nonLocalJumps & 8) {
+                        write("if (typeof " + loopResult + " === \"object\") ");
+                        if (convertedLoopState) {
+                            write("return " + loopResult + ";");
+                            convertedLoopState.nonLocalJumps |= 8;
+                        }
+                        else {
+                            write("return " + loopResult + ".value");
+                        }
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 2) {
+                        write("if (" + loopResult + " === \"break\") break;");
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 4) {
+                        write("if (" + loopResult + " === \"continue\") continue;");
+                        writeLine();
+                    }
+                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
+                }
+                if (emitAsBlock) {
+                    writeLine();
+                    decreaseIndent();
+                    write("}");
+                }
+                function emitDispatchTableForLabeledJumps(loopResultVariable, currentLoop, outerLoop) {
+                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
+                        return;
+                    }
+                    write("switch(" + loopResultVariable + ") {");
+                    increaseIndent();
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, true, loopResultVariable, outerLoop);
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, false, loopResultVariable, outerLoop);
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                function emitDispatchEntriesForLabeledJumps(table, isBreak, loopResultVariable, outerLoop) {
+                    if (!table) {
+                        return;
+                    }
+                    for (var labelText in table) {
+                        var labelMarker = table[labelText];
+                        writeLine();
+                        write("case \"" + labelMarker + "\": ");
+                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
+                            if (isBreak) {
+                                write("break ");
+                            }
+                            else {
+                                write("continue ");
+                            }
+                            write(labelText + ";");
+                        }
+                        else {
+                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                            write("return " + loopResultVariable + ";");
+                        }
+                    }
+                }
+            }
             function emitForStatement(node) {
+                emitLoop(node, emitForStatementWorker);
+            }
+            function emitForStatementWorker(node, loop) {
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
@@ -26880,12 +27991,22 @@ var ts;
                 write(";");
                 emitOptional(" ", node.incrementor);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
             }
             function emitForInOrForOfStatement(node) {
                 if (languageVersion < 2 && node.kind === 201) {
-                    return emitDownLevelForOfStatement(node);
+                    emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
+                else {
+                    emitLoop(node, emitForInOrForOfStatementWorker);
+                }
+            }
+            function emitForInOrForOfStatementWorker(node, loop) {
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
@@ -26907,28 +28028,36 @@ var ts;
                 }
                 emit(node.expression);
                 emitToken(18, node.expression.end);
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, true);
+                }
+                else {
+                    emitNormalLoopBody(node, true);
+                }
             }
             function emitDownLevelForOfStatement(node) {
+                emitLoop(node, emitDownLevelForOfStatementWorker);
+            }
+            function emitDownLevelForOfStatementWorker(node, loop) {
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
-                var rhsIsIdentifier = node.expression.kind === 69;
                 var counter = createTempVariable(268435456);
-                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(0);
+                var rhsReference = ts.createSynthesizedNode(69);
+                rhsReference.text = node.expression.kind === 69 ?
+                    makeUniqueName(node.expression.text) :
+                    makeTempVariableName(0);
                 emitStart(node.expression);
                 write("var ");
                 emitNodeWithoutSourceMap(counter);
                 write(" = 0");
                 emitEnd(node.expression);
-                if (!rhsIsIdentifier) {
-                    write(", ");
-                    emitStart(node.expression);
-                    emitNodeWithoutSourceMap(rhsReference);
-                    write(" = ");
-                    emitNodeWithoutSourceMap(node.expression);
-                    emitEnd(node.expression);
-                }
+                write(", ");
+                emitStart(node.expression);
+                emitNodeWithoutSourceMap(rhsReference);
+                write(" = ");
+                emitNodeWithoutSourceMap(node.expression);
+                emitEnd(node.expression);
                 write("; ");
                 emitStart(node.initializer);
                 emitNodeWithoutSourceMap(counter);
@@ -26978,23 +28107,65 @@ var ts;
                 }
                 emitEnd(node.initializer);
                 write(";");
-                if (node.statement.kind === 192) {
-                    emitLines(node.statement.statements);
+                if (loop) {
+                    writeLine();
+                    emitConvertedLoopCall(loop, false);
                 }
                 else {
-                    writeLine();
-                    emit(node.statement);
+                    emitNormalLoopBody(node, false);
                 }
                 writeLine();
                 decreaseIndent();
                 write("}");
             }
             function emitBreakOrContinueStatement(node) {
+                if (convertedLoopState) {
+                    var jump = node.kind === 203 ? 2 : 4;
+                    var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
+                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+                    if (!canUseBreakOrContinue) {
+                        if (!node.label) {
+                            if (node.kind === 203) {
+                                convertedLoopState.nonLocalJumps |= 2;
+                                write("return \"break\";");
+                            }
+                            else {
+                                convertedLoopState.nonLocalJumps |= 4;
+                                write("return \"continue\";");
+                            }
+                        }
+                        else {
+                            var labelMarker;
+                            if (node.kind === 203) {
+                                labelMarker = "break-" + node.label.text;
+                                setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
+                            }
+                            else {
+                                labelMarker = "continue-" + node.label.text;
+                                setLabeledJump(convertedLoopState, false, node.label.text, labelMarker);
+                            }
+                            write("return \"" + labelMarker + "\";");
+                        }
+                        return;
+                    }
+                }
                 emitToken(node.kind === 203 ? 70 : 75, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
             function emitReturnStatement(node) {
+                if (convertedLoopState) {
+                    convertedLoopState.nonLocalJumps |= 8;
+                    write("return { value: ");
+                    if (node.expression) {
+                        emit(node.expression);
+                    }
+                    else {
+                        write("void 0");
+                    }
+                    write(" };");
+                    return;
+                }
                 emitToken(94, node.pos);
                 emitOptional(" ", node.expression);
                 write(";");
@@ -27012,7 +28183,15 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(18, node.expression.end);
                 write(" ");
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps |= 2;
+                }
                 emitCaseBlock(node.caseBlock, endPos);
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
             }
             function emitCaseBlock(node, startPos) {
                 emitToken(15, startPos);
@@ -27023,16 +28202,16 @@ var ts;
                 emitToken(16, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, node2.end);
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
                 if (node.kind === 241) {
@@ -27082,10 +28261,24 @@ var ts;
                 emitToken(76, node.pos);
                 write(";");
             }
-            function emitLabelledStatement(node) {
+            function emitLabelAndColon(node) {
                 emit(node.label);
                 write(": ");
+            }
+            function emitLabeledStatement(node) {
+                if (!ts.isIterationStatement(node.statement, false) || !shouldConvertLoopBody(node.statement)) {
+                    emitLabelAndColon(node);
+                }
+                if (convertedLoopState) {
+                    if (!convertedLoopState.labels) {
+                        convertedLoopState.labels = {};
+                    }
+                    convertedLoopState.labels[node.label.text] = node.label.text;
+                }
                 emit(node.statement);
+                if (convertedLoopState) {
+                    convertedLoopState.labels[node.label.text] = undefined;
+                }
             }
             function getContainingModule(node) {
                 do {
@@ -27099,7 +28292,7 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 1) {
+                if (ts.getCombinedNodeFlags(node) & 2) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
@@ -27121,9 +28314,9 @@ var ts;
             }
             function emitEs6ExportDefaultCompat(node) {
                 if (node.parent.kind === 248) {
-                    ts.Debug.assert(!!(node.flags & 1024) || node.kind === 227);
+                    ts.Debug.assert(!!(node.flags & 512) || node.kind === 227);
                     if (modulekind === 1 || modulekind === 2 || modulekind === 3) {
-                        if (!currentSourceFile.symbol.exports["___esModule"]) {
+                        if (!isEs6Module) {
                             if (languageVersion === 1) {
                                 write("Object.defineProperty(exports, \"__esModule\", { value: true });");
                                 writeLine();
@@ -27137,12 +28330,12 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 1) {
+                if (node.flags & 2) {
                     writeLine();
                     emitStart(node);
                     if (modulekind === 4 && node.parent === currentSourceFile) {
                         write(exportFunctionForFile + "(\"");
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             write("default");
                         }
                         else {
@@ -27153,7 +28346,7 @@ var ts;
                         write(")");
                     }
                     else {
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0) {
                                 write("exports[\"default\"]");
@@ -27241,7 +28434,7 @@ var ts;
                 var emitCount = 0;
                 var canDefineTempVariablesInPlace = false;
                 if (root.kind === 211) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 1;
+                    var isExported = ts.getCombinedNodeFlags(root) & 2;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
@@ -27286,12 +28479,18 @@ var ts;
                     return node;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
-                    var syntheticName = ts.createSynthesizedNode(propName.kind);
-                    syntheticName.text = propName.text;
-                    if (syntheticName.kind !== 69) {
-                        return createElementAccessExpression(object, syntheticName);
+                    var index;
+                    var nameIsComputed = propName.kind === 136;
+                    if (nameIsComputed) {
+                        index = ensureIdentifier(propName.expression, false);
                     }
-                    return createPropertyAccessExpression(object, syntheticName);
+                    else {
+                        index = ts.createSynthesizedNode(propName.kind);
+                        index.text = propName.text;
+                    }
+                    return !nameIsComputed && index.kind === 69
+                        ? createPropertyAccessExpression(object, index)
+                        : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
                     var call = ts.createSynthesizedNode(168);
@@ -27307,8 +28506,8 @@ var ts;
                     if (properties.length !== 1) {
                         value = ensureIdentifier(value, true);
                     }
-                    for (var _a = 0; _a < properties.length; _a++) {
-                        var p = properties[_a];
+                    for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
+                        var p = properties_5[_a];
                         if (p.kind === 245 || p.kind === 246) {
                             var propName = p.name;
                             var target_1 = p.kind === 246 ? p : p.initializer || propName;
@@ -27426,9 +28625,9 @@ var ts;
                 else {
                     var initializer = node.initializer;
                     if (!initializer && languageVersion < 2) {
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 16384) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 16384);
-                        if (isUninitializedLet &&
+                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384) &&
+                            (getCombinedFlagsForIdentifier(node.name) & 8192);
+                        if (isLetDefinedInLoop &&
                             node.parent.parent.kind !== 200 &&
                             node.parent.parent.kind !== 201) {
                             initializer = createVoidZero();
@@ -27466,13 +28665,13 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 1) &&
+                return !!(node.flags & 2) &&
                     modulekind === 5 &&
                     node.parent.kind === 248;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 1) {
+                if (node.flags & 2) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
                         startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
@@ -27496,7 +28695,7 @@ var ts;
                 }
             }
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
-                if (!(node.flags & 1)) {
+                if (!(node.flags & 2)) {
                     return true;
                 }
                 if (isES6ExportedDeclaration(node)) {
@@ -27513,12 +28712,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_25 = createTempVariable(0);
+                        var name_26 = createTempVariable(0);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_25);
-                        emit(name_25);
+                        tempParameters.push(name_26);
+                        emit(name_26);
                     }
                     else {
                         emit(node.name);
@@ -27653,7 +28852,7 @@ var ts;
                 if (!shouldEmitAsArrowFunction(node)) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             write("default ");
                         }
                     }
@@ -27705,7 +28904,6 @@ var ts;
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
                 var isArrowFunction = node.kind === 174;
                 var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096) !== 0;
-                var args;
                 if (!isArrowFunction) {
                     write(" {");
                     increaseIndent();
@@ -27755,9 +28953,11 @@ var ts;
                 }
             }
             function emitSignatureAndBody(node) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -27778,6 +28978,8 @@ var ts;
                 if (!isES6ExportedDeclaration(node)) {
                     emitExportMemberAssignment(node);
                 }
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -27788,7 +28990,7 @@ var ts;
                 emitRestParameter(node);
             }
             function emitExpressionFunctionBody(node, body) {
-                if (languageVersion < 2 || node.flags & 512) {
+                if (languageVersion < 2 || node.flags & 256) {
                     emitDownLevelExpressionFunctionBody(node, body);
                     return;
                 }
@@ -27804,7 +29006,7 @@ var ts;
                 scopeEmitStart(node);
                 increaseIndent();
                 var outPos = writer.getTextPos();
-                emitDetachedComments(node.body);
+                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
@@ -27840,7 +29042,7 @@ var ts;
                 scopeEmitStart(node);
                 var initialTextPos = writer.getTextPos();
                 increaseIndent();
-                emitDetachedComments(body.statements);
+                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
                 var startIndex = emitDirectivePrologues(body.statements, true);
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
@@ -27882,7 +29084,7 @@ var ts;
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 112) {
+                    if (param.flags & 56) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -27914,15 +29116,15 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 141 && isStatic === ((member.flags & 128) !== 0) && member.initializer) {
+                    if (member.kind === 141 && isStatic === ((member.flags & 64) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
                 return properties;
             }
             function emitPropertyDeclarations(node, properties) {
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var property = properties[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var property = properties_6[_a];
                     emitPropertyDeclaration(node, property);
                 }
             }
@@ -27935,7 +29137,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 128) {
+                    if (property.flags & 64) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -28034,7 +29236,7 @@ var ts;
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 128) {
+                        if (member.flags & 64) {
                             write("static ");
                         }
                         if (member.kind === 145) {
@@ -28058,13 +29260,17 @@ var ts;
                 }
             }
             function emitConstructor(node, baseTypeElement) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
                 emitConstructorWorker(node, baseTypeElement);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -28075,7 +29281,7 @@ var ts;
                     if (member.kind === 144 && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    if (member.kind === 141 && member.initializer && (member.flags & 128) === 0) {
+                    if (member.kind === 141 && member.initializer && (member.flags & 64) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -28112,7 +29318,7 @@ var ts;
                 increaseIndent();
                 if (ctor) {
                     startIndex = emitDirectivePrologues(ctor.body.statements, true);
-                    emitDetachedComments(ctor.body.statements);
+                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
                 }
                 emitCaptureThisForNodeIfNecessary(node);
                 var superCall;
@@ -28183,7 +29389,7 @@ var ts;
                 var thisNodeIsDecorated = ts.nodeIsDecorated(node);
                 if (node.kind === 214) {
                     if (thisNodeIsDecorated) {
-                        if (isES6ExportedDeclaration(node) && !(node.flags & 1024)) {
+                        if (isES6ExportedDeclaration(node) && !(node.flags & 512)) {
                             write("export ");
                         }
                         write("let ");
@@ -28192,7 +29398,7 @@ var ts;
                     }
                     else if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024) {
+                        if (node.flags & 512) {
                             write("default ");
                         }
                     }
@@ -28208,7 +29414,7 @@ var ts;
                     write(" = ");
                 }
                 write("class");
-                if ((node.name || (node.flags & 1024 && staticProperties.length > 0)) && !thisNodeIsDecorated) {
+                if ((node.name || (node.flags & 512 && staticProperties.length > 0)) && !thisNodeIsDecorated) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -28231,8 +29437,8 @@ var ts;
                     write(";");
                 }
                 if (isClassExpressionWithStaticProperties) {
-                    for (var _a = 0; _a < staticProperties.length; _a++) {
-                        var property = staticProperties[_a];
+                    for (var _a = 0, staticProperties_1 = staticProperties; _a < staticProperties_1.length; _a++) {
+                        var property = staticProperties_1[_a];
                         write(",");
                         writeLine();
                         emitPropertyDeclaration(node, property, tempVariable, true);
@@ -28248,7 +29454,7 @@ var ts;
                     emitPropertyDeclarations(node, staticProperties);
                     emitDecoratorsOfClass(node);
                 }
-                if (!isES6ExportedDeclaration(node) && (node.flags & 1)) {
+                if (!isES6ExportedDeclaration(node) && (node.flags & 2)) {
                     writeLine();
                     emitStart(node);
                     emitModuleMemberName(node);
@@ -28257,7 +29463,7 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                else if (isES6ExportedDeclaration(node) && (node.flags & 1024) && thisNodeIsDecorated) {
+                else if (isES6ExportedDeclaration(node) && (node.flags & 512) && thisNodeIsDecorated) {
                     writeLine();
                     write("export default ");
                     emitDeclarationName(node);
@@ -28282,6 +29488,8 @@ var ts;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
                 var saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                var saveConvertedLoopState = convertedLoopState;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -28309,6 +29517,8 @@ var ts;
                 });
                 write(";");
                 emitTempDeclarations(true);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -28333,13 +29543,13 @@ var ts;
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 128)) {
+                if (!(member.flags & 64)) {
                     write(".prototype");
                 }
             }
             function emitDecoratorsOfClass(node) {
                 emitDecoratorsOfMembers(node, 0);
-                emitDecoratorsOfMembers(node, 128);
+                emitDecoratorsOfMembers(node, 64);
                 emitDecoratorsOfConstructor(node);
             }
             function emitDecoratorsOfConstructor(node) {
@@ -28374,7 +29584,7 @@ var ts;
             function emitDecoratorsOfMembers(node, staticFlag) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.flags & 128) !== staticFlag) {
+                    if ((member.flags & 64) !== staticFlag) {
                         continue;
                     }
                     if (!ts.nodeCanBeDecorated(member)) {
@@ -28701,7 +29911,7 @@ var ts;
                     return;
                 }
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
-                    if (!(node.flags & 1) || isES6ExportedDeclaration(node)) {
+                    if (!(node.flags & 2) || isES6ExportedDeclaration(node)) {
                         emitStart(node);
                         if (isES6ExportedDeclaration(node)) {
                             write("export ");
@@ -28732,7 +29942,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 1 && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 2 && !shouldHoistDeclarationInSystemJsModule(node)) {
                     writeLine();
                     emitStart(node);
                     write("var ");
@@ -28743,7 +29953,7 @@ var ts;
                     write(";");
                 }
                 if (modulekind !== 5 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 1)) {
+                    if (modulekind === 4 && (node.flags & 2)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -28819,11 +30029,15 @@ var ts;
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === 219) {
+                    var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
+                    convertedLoopState = undefined;
                     tempFlags = 0;
                     tempVariables = undefined;
                     emit(node.body);
+                    ts.Debug.assert(convertedLoopState === undefined);
+                    convertedLoopState = saveConvertedLoopState;
                     tempFlags = saveTempFlags;
                     tempVariables = saveTempVariables;
                 }
@@ -28841,7 +30055,7 @@ var ts;
                     scopeEmitEnd();
                 }
                 write(")(");
-                if ((node.flags & 1) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 2) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -28851,7 +30065,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 1)) {
+                    if (modulekind === 4 && (node.flags & 2)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -28863,8 +30077,8 @@ var ts;
                 }
             }
             function tryRenameExternalModule(moduleName) {
-                if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                    return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\"";
+                if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) {
+                    return "\"" + renamedDependencies[moduleName.text] + "\"";
                 }
                 return undefined;
             }
@@ -28949,7 +30163,7 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 221 && (node.flags & 1) !== 0;
+                    var isExportedImport = node.kind === 221 && (node.flags & 2) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
                     if (modulekind !== 2) {
                         emitLeadingComments(node);
@@ -29004,7 +30218,7 @@ var ts;
                     return;
                 }
                 if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     var variableDeclarationIsHoisted = shouldHoistVariable(node, true);
@@ -29015,7 +30229,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 1)) {
+                        else if (!(node.flags & 2)) {
                             write("var ");
                         }
                     }
@@ -29103,8 +30317,8 @@ var ts;
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
                 ts.Debug.assert(modulekind === 5);
                 var needsComma = false;
-                for (var _a = 0; _a < specifiers.length; _a++) {
-                    var specifier = specifiers[_a];
+                for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
+                    var specifier = specifiers_1[_a];
                     if (shouldEmit(specifier)) {
                         if (needsComma) {
                             write(", ");
@@ -29188,8 +30402,8 @@ var ts;
                             else {
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_26 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_26] || (exportSpecifiers[name_26] = [])).push(specifier);
+                                    var name_27 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_27] || (exportSpecifiers[name_27] = [])).push(specifier);
                                 }
                             }
                             break;
@@ -29216,7 +30430,7 @@ var ts;
             function getLocalNameForExternalImport(node) {
                 var namespaceDeclaration = getNamespaceDeclarationNode(node);
                 if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
+                    return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
                 if (node.kind === 222 && node.importClause) {
                     return getGeneratedNameForNode(node);
@@ -29238,8 +30452,8 @@ var ts;
                 }
                 writeLine();
                 var started = false;
-                for (var _a = 0; _a < externalImports.length; _a++) {
-                    var importNode = externalImports[_a];
+                for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
+                    var importNode = externalImports_1[_a];
                     var skipNode = importNode.kind === 228 ||
                         (importNode.kind === 222 && !importNode.importClause);
                     if (skipNode) {
@@ -29264,8 +30478,8 @@ var ts;
                 }
                 if (!exportedDeclarations && ts.isEmpty(exportSpecifiers)) {
                     var hasExportDeclarationWithExportClause = false;
-                    for (var _a = 0; _a < externalImports.length; _a++) {
-                        var externalImport = externalImports[_a];
+                    for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
+                        var externalImport = externalImports_2[_a];
                         if (externalImport.kind === 228 && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
@@ -29293,8 +30507,8 @@ var ts;
                         }
                     }
                 }
-                for (var _d = 0; _d < externalImports.length; _d++) {
-                    var externalImport = externalImports[_d];
+                for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
+                    var externalImport = externalImports_3[_d];
                     if (externalImport.kind !== 228) {
                         continue;
                     }
@@ -29338,7 +30552,7 @@ var ts;
                     return exportStarFunction;
                 }
                 function writeExportedName(node) {
-                    if (node.kind !== 69 && node.flags & 1024) {
+                    if (node.kind !== 69 && node.flags & 512) {
                         return;
                     }
                     if (started) {
@@ -29369,11 +30583,11 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; ++i) {
                         var local = hoistedVars[i];
-                        var name_27 = local.kind === 69
+                        var name_28 = local.kind === 69
                             ? local
                             : local.name;
-                        if (name_27) {
-                            var text = ts.unescapeIdentifier(name_27.text);
+                        if (name_28) {
+                            var text = ts.unescapeIdentifier(name_28.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -29391,7 +30605,7 @@ var ts;
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 ? local.parent : local);
-                        if (flags & 1) {
+                        if (flags & 2) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -29401,11 +30615,11 @@ var ts;
                     write(";");
                 }
                 if (hoistedFunctionDeclarations) {
-                    for (var _a = 0; _a < hoistedFunctionDeclarations.length; _a++) {
-                        var f = hoistedFunctionDeclarations[_a];
+                    for (var _a = 0, hoistedFunctionDeclarations_1 = hoistedFunctionDeclarations; _a < hoistedFunctionDeclarations_1.length; _a++) {
+                        var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 1) {
+                        if (f.flags & 2) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -29415,7 +30629,7 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 2) {
+                    if (node.flags & 4) {
                         return;
                     }
                     if (node.kind === 213) {
@@ -29452,15 +30666,15 @@ var ts;
                     }
                     if (node.kind === 211 || node.kind === 163) {
                         if (shouldHoistVariable(node, false)) {
-                            var name_28 = node.name;
-                            if (name_28.kind === 69) {
+                            var name_29 = node.name;
+                            if (name_29.kind === 69) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_28);
+                                hoistedVars.push(name_29);
                             }
                             else {
-                                ts.forEachChild(name_28, visit);
+                                ts.forEachChild(name_29, visit);
                             }
                         }
                         return;
@@ -29485,11 +30699,11 @@ var ts;
                 if (checkIfSourceFileLevelDecl && !shouldHoistDeclarationInSystemJsModule(node)) {
                     return false;
                 }
-                return (ts.getCombinedNodeFlags(node) & 49152) === 0 ||
+                return (ts.getCombinedNodeFlags(node) & 24576) === 0 ||
                     ts.getEnclosingBlockScopeContainer(node).kind === 248;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 && ts.isExternalModule(currentSourceFile);
+                return modulekind === 4 && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 emitVariableDeclarationsForImports();
@@ -29520,8 +30734,8 @@ var ts;
                     var parameterName = makeUniqueName(ts.forEach(group, getLocalNameForExternalImport) || "");
                     write("function (" + parameterName + ") {");
                     increaseIndent();
-                    for (var _a = 0; _a < group.length; _a++) {
-                        var entry = group[_a];
+                    for (var _a = 0, group_1 = group; _a < group_1.length; _a++) {
+                        var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
                             case 222:
@@ -29602,15 +30816,19 @@ var ts;
                 writeLine();
                 write("}");
             }
-            function emitSystemModule(node) {
+            function writeModuleName(node, emitRelativePathAsModuleName) {
+                var moduleName = node.moduleName;
+                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
+                    write("\"" + moduleName + "\", ");
+                }
+            }
+            function emitSystemModule(node, emitRelativePathAsModuleName) {
                 collectExternalModuleInfo(node);
                 ts.Debug.assert(!exportFunctionForFile);
                 exportFunctionForFile = makeUniqueName("exports");
                 writeLine();
                 write("System.register(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
+                writeModuleName(node, emitRelativePathAsModuleName);
                 write("[");
                 var groupIndices = {};
                 var dependencyGroups = [];
@@ -29628,6 +30846,12 @@ var ts;
                     if (i !== 0) {
                         write(", ");
                     }
+                    if (emitRelativePathAsModuleName) {
+                        var name_30 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]);
+                        if (name_30) {
+                            text = "\"" + name_30 + "\"";
+                        }
+                    }
                     write(text);
                 }
                 write("], function(" + exportFunctionForFile + ") {");
@@ -29641,7 +30865,7 @@ var ts;
                 writeLine();
                 write("});");
             }
-            function getAMDDependencyNames(node, includeNonAmdDependencies) {
+            function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
                 var aliasedModuleNames = [];
                 var unaliasedModuleNames = [];
                 var importAliasNames = [];
@@ -29655,9 +30879,15 @@ var ts;
                         unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
                     }
                 }
-                for (var _c = 0; _c < externalImports.length; _c++) {
-                    var importNode = externalImports[_c];
+                for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
+                    var importNode = externalImports_4[_c];
                     var externalModuleName = getExternalModuleNameText(importNode);
+                    if (emitRelativePathAsModuleName) {
+                        var name_31 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                        if (name_31) {
+                            externalModuleName = "\"" + name_31 + "\"";
+                        }
+                    }
                     var importAliasName = getLocalNameForExternalImport(importNode);
                     if (includeNonAmdDependencies && importAliasName) {
                         aliasedModuleNames.push(externalModuleName);
@@ -29669,8 +30899,8 @@ var ts;
                 }
                 return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
             }
-            function emitAMDDependencies(node, includeNonAmdDependencies) {
-                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies);
+            function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
+                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
                 emitAMDDependencyList(dependencyNames);
                 write(", ");
                 emitAMDFactoryHeader(dependencyNames);
@@ -29697,15 +30927,13 @@ var ts;
                 }
                 write(") {");
             }
-            function emitAMDModule(node) {
+            function emitAMDModule(node, emitRelativePathAsModuleName) {
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 writeLine();
                 write("define(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
-                emitAMDDependencies(node, true);
+                writeModuleName(node, emitRelativePathAsModuleName);
+                emitAMDDependencies(node, true, emitRelativePathAsModuleName);
                 increaseIndent();
                 var startIndex = emitDirectivePrologues(node.statements, true);
                 emitExportStarHelper();
@@ -29909,10 +31137,15 @@ var ts;
             function emitSourceFileNode(node) {
                 writeLine();
                 emitShebang();
-                emitDetachedComments(node);
+                emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                    var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1];
-                    emitModule(node);
+                    if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1];
+                        emitModule(node);
+                    }
+                    else {
+                        bundleEmitDelegates[modulekind](node, true);
+                    }
                 }
                 else {
                     var startIndex = emitDirectivePrologues(node.statements, false);
@@ -29932,7 +31165,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 2) {
+                    if (node.flags & 4) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -30117,7 +31350,7 @@ var ts;
                     case 242:
                         return emitCaseOrDefaultClause(node);
                     case 207:
-                        return emitLabelledStatement(node);
+                        return emitLabeledStatement(node);
                     case 208:
                         return emitThrowStatement(node);
                     case 209:
@@ -30156,7 +31389,7 @@ var ts;
                 return detachedCommentsInfo !== undefined && ts.lastOrUndefined(detachedCommentsInfo).nodePos === pos;
             }
             function getLeadingCommentsWithoutDetachedComments() {
-                var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
+                var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
                 if (detachedCommentsInfo.length - 1) {
                     detachedCommentsInfo.pop();
                 }
@@ -30165,15 +31398,11 @@ var ts;
                 }
                 return leadingComments;
             }
-            function isPinnedComments(comment) {
-                return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 33;
-            }
             function isTripleSlashComment(comment) {
-                if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 &&
+                if (currentText.charCodeAt(comment.pos + 1) === 47 &&
                     comment.pos + 2 < comment.end &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 47) {
-                    var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end);
+                    currentText.charCodeAt(comment.pos + 2) === 47) {
+                    var textSubStr = currentText.substring(comment.pos, comment.end);
                     return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) ||
                         textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ?
                         true : false;
@@ -30187,7 +31416,7 @@ var ts;
                             return getLeadingCommentsWithoutDetachedComments();
                         }
                         else {
-                            return ts.getLeadingCommentRangesOfNode(node, currentSourceFile);
+                            return ts.getLeadingCommentRangesOfNodeFromText(node, currentText);
                         }
                     }
                 }
@@ -30195,7 +31424,7 @@ var ts;
             function getTrailingCommentsToEmit(node) {
                 if (node.parent) {
                     if (node.parent.kind === 248 || node.end !== node.parent.end) {
-                        return ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
+                        return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
             }
@@ -30218,22 +31447,22 @@ var ts;
                         leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment);
             }
             function emitTrailingComments(node) {
                 if (compilerOptions.removeComments) {
                     return;
                 }
                 var trailingComments = getTrailingCommentsToEmit(node);
-                ts.emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, false, newLine, writeComment);
             }
             function emitTrailingCommentsOfPosition(pos) {
                 if (compilerOptions.removeComments) {
                     return;
                 }
-                var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos);
-                ts.emitComments(currentSourceFile, writer, trailingComments, true, newLine, writeComment);
+                var trailingComments = ts.getTrailingCommentRanges(currentText, pos);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, true, newLine, writeComment);
             }
             function emitLeadingCommentsOfPositionWorker(pos) {
                 if (compilerOptions.removeComments) {
@@ -30244,59 +31473,29 @@ var ts;
                     leadingComments = getLeadingCommentsWithoutDetachedComments();
                 }
                 else {
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
+                    leadingComments = ts.getLeadingCommentRanges(currentText, pos);
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
-                ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment);
             }
-            function emitDetachedComments(node) {
-                var leadingComments;
-                if (compilerOptions.removeComments) {
-                    if (node.pos === 0) {
-                        leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComments);
+            function emitDetachedCommentsAndUpdateCommentsInfo(node) {
+                var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
+                if (currentDetachedCommentInfo) {
+                    if (detachedCommentsInfo) {
+                        detachedCommentsInfo.push(currentDetachedCommentInfo);
                     }
-                }
-                else {
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
-                }
-                if (leadingComments) {
-                    var detachedComments = [];
-                    var lastComment;
-                    ts.forEach(leadingComments, function (comment) {
-                        if (lastComment) {
-                            var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, lastComment.end);
-                            var commentLine = ts.getLineOfLocalPosition(currentSourceFile, comment.pos);
-                            if (commentLine >= lastCommentLine + 2) {
-                                return detachedComments;
-                            }
-                        }
-                        detachedComments.push(comment);
-                        lastComment = comment;
-                    });
-                    if (detachedComments.length) {
-                        var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end);
-                        var nodeLine = ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos));
-                        if (nodeLine >= lastCommentLine + 2) {
-                            ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                            ts.emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                            if (detachedCommentsInfo) {
-                                detachedCommentsInfo.push(currentDetachedCommentInfo);
-                            }
-                            else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
-                            }
-                        }
+                    else {
+                        detachedCommentsInfo = [currentDetachedCommentInfo];
                     }
                 }
             }
             function emitShebang() {
-                var shebang = ts.getShebang(currentSourceFile.text);
+                var shebang = ts.getShebang(currentText);
                 if (shebang) {
                     write(shebang);
                 }
             }
-            var _a;
+            var _a, _b;
         }
         function emitFile(jsFilePath, sourceFile) {
             emitJavaScript(jsFilePath, sourceFile);
@@ -30352,11 +31551,11 @@ var ts;
         if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
             var failedLookupLocations = [];
             var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+            var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             if (resolvedFileName) {
                 return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
             }
-            resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+            resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             return resolvedFileName
                 ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
                 : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
@@ -30366,8 +31565,8 @@ var ts;
         }
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function loadNodeModuleFromFile(candidate, failedLookupLocation, host) {
-        return ts.forEach(ts.moduleFileExtensions, tryLoad);
+    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) {
+        return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
             if (host.fileExists(fileName)) {
@@ -30379,7 +31578,7 @@ var ts;
             }
         }
     }
-    function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
         if (host.fileExists(packageJsonPath)) {
             var jsonContent;
@@ -30391,7 +31590,7 @@ var ts;
                 jsonContent = { typings: undefined };
             }
             if (jsonContent.typings) {
-                var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
+                var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
                 if (result) {
                     return result;
                 }
@@ -30400,7 +31599,7 @@ var ts;
         else {
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host);
+        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host);
     }
     function loadModuleFromNodeModules(moduleName, directory, host) {
         var failedLookupLocations = [];
@@ -30410,11 +31609,11 @@ var ts;
             if (baseName !== "node_modules") {
                 var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
                 var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+                var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
-                result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+                result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
@@ -30439,9 +31638,10 @@ var ts;
         var searchName;
         var failedLookupLocations = [];
         var referencedSourceFile;
+        var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions;
         while (true) {
             searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) {
+            referencedSourceFile = ts.forEach(extensions, function (extension) {
                 if (extension === ".tsx" && !compilerOptions.jsx) {
                     return undefined;
                 }
@@ -30469,14 +31669,11 @@ var ts;
     ts.classicNameResolver = classicNameResolver;
     ts.defaultInitCompilerOptions = {
         module: 1,
-        target: 0,
+        target: 1,
         noImplicitAny: false,
-        outDir: "built",
-        rootDir: ".",
         sourceMap: false
     };
     function createCompilerHost(options, setParentNodes) {
-        var currentDirectory;
         var existingDirectories = {};
         function getCanonicalFileName(fileName) {
             return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
@@ -30534,7 +31731,7 @@ var ts;
             getSourceFile: getSourceFile,
             getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
+            getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
             getCanonicalFileName: getCanonicalFileName,
             getNewLine: function () { return newLine; },
@@ -30586,10 +31783,12 @@ var ts;
         var skipDefaultLib = options.noLib;
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
+        var currentDirectory = host.getCurrentDirectory();
         var resolveModuleNamesWorker = host.resolveModuleNames
             ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
             : (function (moduleNames, containingFile) { return ts.map(moduleNames, function (moduleName) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; }); });
-        var filesByName = ts.createFileMap(function (fileName) { return host.getCanonicalFileName(fileName); });
+        var filesByName = ts.createFileMap();
+        var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
         if (oldProgram) {
             var oldOptions = oldProgram.getCompilerOptions();
             if ((oldOptions.module !== options.module) ||
@@ -30624,7 +31823,7 @@ var ts;
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
             getCommonSourceDirectory: function () { return commonSourceDirectory; },
             emit: emit,
-            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            getCurrentDirectory: function () { return currentDirectory; },
             getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
@@ -30636,8 +31835,8 @@ var ts;
             if (!classifiableNames) {
                 getTypeChecker();
                 classifiableNames = {};
-                for (var _i = 0; _i < files.length; _i++) {
-                    var sourceFile = files[_i];
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var sourceFile = files_3[_i];
                     ts.copyMap(sourceFile.classifiableNames, classifiableNames);
                 }
             }
@@ -30653,6 +31852,7 @@ var ts;
                 return false;
             }
             var newSourceFiles = [];
+            var filePaths = [];
             var modifiedSourceFiles = [];
             for (var _i = 0, _a = oldProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var oldSourceFile = _a[_i];
@@ -30660,6 +31860,8 @@ var ts;
                 if (!newSourceFile) {
                     return false;
                 }
+                newSourceFile.path = oldSourceFile.path;
+                filePaths.push(newSourceFile.path);
                 if (oldSourceFile !== newSourceFile) {
                     if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
                         return false;
@@ -30673,7 +31875,7 @@ var ts;
                     }
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(newSourceFile.imports, function (name) { return name.text; });
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFile.fileName);
+                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
                         for (var i = 0; i < moduleNames.length; ++i) {
                             var newResolution = resolutions[i];
                             var oldResolution = ts.getResolvedModule(oldSourceFile, moduleNames[i]);
@@ -30695,14 +31897,13 @@ var ts;
                 }
                 newSourceFiles.push(newSourceFile);
             }
-            for (var _b = 0; _b < newSourceFiles.length; _b++) {
-                var file = newSourceFiles[_b];
-                filesByName.set(file.fileName, file);
+            for (var i = 0, len = newSourceFiles.length; i < len; ++i) {
+                filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _c = 0; _c < modifiedSourceFiles.length; _c++) {
-                var modifiedFile = modifiedSourceFiles[_c];
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
             oldProgram.structureIsReused = true;
@@ -30710,10 +31911,10 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return {
-                getCanonicalFileName: function (fileName) { return host.getCanonicalFileName(fileName); },
+                getCanonicalFileName: getCanonicalFileName,
                 getCommonSourceDirectory: program.getCommonSourceDirectory,
                 getCompilerOptions: program.getCompilerOptions,
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
@@ -30741,7 +31942,7 @@ var ts;
             return emitResult;
         }
         function getSourceFile(fileName) {
-            return filesByName.get(fileName) || filesByName.get(ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory()));
+            return filesByName.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
         }
         function getDiagnosticsHelper(sourceFile, getDiagnostics, cancellationToken) {
             if (sourceFile) {
@@ -30827,35 +32028,47 @@ var ts;
             if (file.imports) {
                 return;
             }
+            var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var imports;
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var node = _a[_i];
-                collect(node, true);
+                collect(node, true, false);
             }
             file.imports = imports || emptyArray;
-            function collect(node, allowRelativeModuleNames) {
-                switch (node.kind) {
-                    case 222:
-                    case 221:
-                    case 228:
-                        var moduleNameExpr = ts.getExternalModuleName(node);
-                        if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
+            return;
+            function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) {
+                if (!collectOnlyRequireCalls) {
+                    switch (node.kind) {
+                        case 222:
+                        case 221:
+                        case 228:
+                            var moduleNameExpr = ts.getExternalModuleName(node);
+                            if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
+                                break;
+                            }
+                            if (!moduleNameExpr.text) {
+                                break;
+                            }
+                            if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
+                                (imports || (imports = [])).push(moduleNameExpr);
+                            }
                             break;
-                        }
-                        if (!moduleNameExpr.text) {
+                        case 218:
+                            if (node.name.kind === 9 && (node.flags & 4 || ts.isDeclarationFile(file))) {
+                                ts.forEachChild(node.body, function (node) {
+                                    collect(node, false, collectOnlyRequireCalls);
+                                });
+                            }
                             break;
-                        }
-                        if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
-                            (imports || (imports = [])).push(moduleNameExpr);
-                        }
-                        break;
-                    case 218:
-                        if (node.name.kind === 9 && (node.flags & 2 || ts.isDeclarationFile(file))) {
-                            ts.forEachChild(node.body, function (node) {
-                                collect(node, false);
-                            });
-                        }
-                        break;
+                    }
+                }
+                if (isJavaScriptFile) {
+                    if (ts.isRequireCall(node)) {
+                        (imports || (imports = [])).push(node.arguments[0]);
+                    }
+                    else {
+                        ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, true); });
+                    }
                 }
             }
         }
@@ -30867,7 +32080,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + ts.supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -30877,13 +32090,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -30899,14 +32112,20 @@ var ts;
                 }
             }
         }
-        function findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
-            if (filesByName.contains(fileName)) {
-                return getSourceFileFromCache(fileName, false);
+        function reportFileNamesDifferOnlyInCasingError(fileName, existingFileName, refFile, refPos, refEnd) {
+            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
-            var normalizedAbsolutePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+            else {
+                fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+        }
+        function findSourceFile(fileName, normalizedAbsolutePath, isDefaultLib, refFile, refPos, refEnd) {
             if (filesByName.contains(normalizedAbsolutePath)) {
-                var file_1 = getSourceFileFromCache(normalizedAbsolutePath, true);
-                filesByName.set(fileName, file_1);
+                var file_1 = filesByName.get(normalizedAbsolutePath);
+                if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== normalizedAbsolutePath) {
+                    reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
+                }
                 return file_1;
             }
             var file = host.getSourceFile(fileName, options.target, function (hostErrorMessage) {
@@ -30917,17 +32136,25 @@ var ts;
                     fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
                 }
             });
-            filesByName.set(fileName, file);
+            filesByName.set(normalizedAbsolutePath, file);
             if (file) {
+                file.path = normalizedAbsolutePath;
+                if (host.useCaseSensitiveFileNames()) {
+                    var existingFile = filesByNameIgnoreCase.get(normalizedAbsolutePath);
+                    if (existingFile) {
+                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
+                    }
+                    else {
+                        filesByNameIgnoreCase.set(normalizedAbsolutePath, file);
+                    }
+                }
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
-                filesByName.set(normalizedAbsolutePath, file);
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
                     processReferencedFiles(file, basePath);
                 }
                 processImportedModules(file, basePath);
                 if (isDefaultLib) {
-                    file.isDefaultLib = true;
                     files.unshift(file);
                 }
                 else {
@@ -30935,21 +32162,6 @@ var ts;
                 }
             }
             return file;
-            function getSourceFileFromCache(fileName, useAbsolutePath) {
-                var file = filesByName.get(fileName);
-                if (file && host.useCaseSensitiveFileNames()) {
-                    var sourceFileName = useAbsolutePath ? ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()) : file.fileName;
-                    if (ts.normalizeSlashes(fileName) !== ts.normalizeSlashes(sourceFileName)) {
-                        if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                            fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                        else {
-                            fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                    }
-                }
-                return file;
-            }
         }
         function processReferencedFiles(file, basePath) {
             ts.forEach(file.referencedFiles, function (ref) {
@@ -30957,26 +32169,25 @@ var ts;
                 processSourceFile(referencedFileName, false, file, ref.pos, ref.end);
             });
         }
+        function getCanonicalFileName(fileName) {
+            return host.getCanonicalFileName(fileName);
+        }
         function processImportedModules(file, basePath) {
             collectExternalModuleReferences(file);
             if (file.imports.length) {
                 file.resolvedModules = {};
                 var moduleNames = ts.map(file.imports, function (name) { return name.text; });
-                var resolutions = resolveModuleNamesWorker(moduleNames, file.fileName);
+                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
                 for (var i = 0; i < file.imports.length; ++i) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
                     if (resolution && !options.noResolve) {
-                        var importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             if (!ts.isExternalModule(importedFile)) {
                                 var start_2 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_2, file.imports[i].end - start_2, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
-                            else if (!ts.fileExtensionIs(importedFile.fileName, ".d.ts")) {
-                                var start_3 = ts.getTokenPosOfNode(file.imports[i], file);
-                                fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_3, file.imports[i].end - start_3, ts.Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
-                            }
                             else if (importedFile.referencedFiles.length) {
                                 var firstRef = importedFile.referencedFiles[0];
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, ts.Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
@@ -30989,13 +32200,9 @@ var ts;
                 file.resolvedModules = undefined;
             }
             return;
-            function findModuleSourceFile(fileName, nameLiteral) {
-                return findSourceFile(fileName, false, file, ts.skipTrivia(file.text, nameLiteral.pos), nameLiteral.end);
-            }
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var commonPathComponents;
-            var currentDirectory = host.getCurrentDirectory();
             ts.forEach(files, function (sourceFile) {
                 if (ts.isDeclarationFile(sourceFile)) {
                     return;
@@ -31020,15 +32227,17 @@ var ts;
                     commonPathComponents.length = sourcePathComponents.length;
                 }
             });
+            if (!commonPathComponents) {
+                return currentDirectory;
+            }
             return ts.getNormalizedPathFromPathComponents(commonPathComponents);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
-                var currentDirectory = host.getCurrentDirectory();
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+                    var sourceFile = sourceFiles_1[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -31088,7 +32297,7 @@ var ts;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
                 if (!options.module && languageVersion < 2) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher));
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
                 if (firstNonExternalModuleSourceFile) {
@@ -31101,14 +32310,16 @@ var ts;
                 programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided));
             }
             if (options.module === 5 && languageVersion < 2) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
+            }
+            if (outFile && options.module && !(options.module === 2 || options.module === 4)) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             if (options.outDir ||
                 options.sourceRoot ||
-                (options.mapRoot &&
-                    (!outFile || firstExternalModuleSourceFile !== undefined))) {
+                options.mapRoot) {
                 if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
-                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, host.getCurrentDirectory());
+                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
                     commonSourceDirectory = computeCommonSourceDirectory(files);
@@ -31144,7 +32355,7 @@ var ts;
     var BreakpointResolver;
     (function (BreakpointResolver) {
         function spanInSourceFileAtLocation(sourceFile, position) {
-            if (sourceFile.flags & 8192) {
+            if (sourceFile.flags & 4096) {
                 return undefined;
             }
             var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
@@ -31319,7 +32530,7 @@ var ts;
                         : isDeclarationOfForStatement
                             ? variableDeclaration.parent.parent.initializer.declarations
                             : undefined;
-                    if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) {
+                    if (variableDeclaration.initializer || (variableDeclaration.flags & 2)) {
                         if (declarations && declarations[0] === variableDeclaration) {
                             if (isParentVariableStatement) {
                                 return textSpan(variableDeclaration.parent, variableDeclaration);
@@ -31340,7 +32551,7 @@ var ts;
                 }
                 function canHaveSpanInParameterDeclaration(parameter) {
                     return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 16) || !!(parameter.flags & 32);
+                        !!(parameter.flags & 8) || !!(parameter.flags & 16);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (canHaveSpanInParameterDeclaration(parameter)) {
@@ -31358,7 +32569,7 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1) ||
+                    return !!(functionDeclaration.flags & 2) ||
                         (functionDeclaration.parent.kind === 214 && functionDeclaration.kind !== 144);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
@@ -31440,7 +32651,6 @@ var ts;
                             }
                         case 244:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                            ;
                         case 220:
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -31475,7 +32685,6 @@ var ts;
                         default:
                             return spanInNode(node.parent);
                     }
-                    return spanInNode(node.parent);
                 }
                 function spanInColonToken(node) {
                     if (ts.isFunctionLike(node.parent) || node.parent.kind === 245) {
@@ -31536,8 +32745,8 @@ var ts;
                     var lastSingleLineCommentEnd = -1;
                     var isFirstSingleLineComment = true;
                     var singleLineCommentCount = 0;
-                    for (var _i = 0; _i < comments.length; _i++) {
-                        var currentComment = comments[_i];
+                    for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
+                        var currentComment = comments_2[_i];
                         if (currentComment.kind === 2) {
                             if (isFirstSingleLineComment) {
                                 firstSingleLineCommentStart = currentComment.pos;
@@ -31658,31 +32867,32 @@ var ts;
         function getNavigateToItems(program, cancellationToken, searchValue, maxResultCount) {
             var patternMatcher = ts.createPatternMatcher(searchValue);
             var rawItems = [];
+            var baseSensitivity = { sensitivity: "base" };
             ts.forEach(program.getSourceFiles(), function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_29 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_29);
+                for (var name_32 in nameToDeclarations) {
+                    var declarations = ts.getProperty(nameToDeclarations, name_32);
                     if (declarations) {
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_29);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_32);
                         if (!matches) {
                             continue;
                         }
-                        for (var _i = 0; _i < declarations.length; _i++) {
-                            var declaration = declarations[_i];
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
                             if (patternMatcher.patternContainsDots) {
                                 var containers = getContainers(declaration);
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_29);
+                                matches = patternMatcher.getMatches(containers, name_32);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_29, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_32, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -31695,8 +32905,8 @@ var ts;
             return items;
             function allMatchesAreCaseSensitive(matches) {
                 ts.Debug.assert(matches.length > 0);
-                for (var _i = 0; _i < matches.length; _i++) {
-                    var match = matches[_i];
+                for (var _i = 0, matches_1 = matches; _i < matches_1.length; _i++) {
+                    var match = matches_1[_i];
                     if (!match.isCaseSensitive) {
                         return false;
                     }
@@ -31764,8 +32974,8 @@ var ts;
             function bestMatchKind(matches) {
                 ts.Debug.assert(matches.length > 0);
                 var bestMatchKind = ts.PatternMatchKind.camelCase;
-                for (var _i = 0; _i < matches.length; _i++) {
-                    var match = matches[_i];
+                for (var _i = 0, matches_2 = matches; _i < matches_2.length; _i++) {
+                    var match = matches_2[_i];
                     var kind = match.kind;
                     if (kind < bestMatchKind) {
                         bestMatchKind = kind;
@@ -31773,7 +32983,6 @@ var ts;
                 }
                 return bestMatchKind;
             }
-            var baseSensitivity = { sensitivity: "base" };
             function compareNavigateToItems(i1, i2) {
                 return i1.matchKind - i2.matchKind ||
                     i1.name.localeCompare(i2.name, undefined, baseSensitivity) ||
@@ -31901,8 +33110,8 @@ var ts;
             }
             function addTopLevelNodes(nodes, topLevelNodes) {
                 nodes = sortNodes(nodes);
-                for (var _i = 0; _i < nodes.length; _i++) {
-                    var node = nodes[_i];
+                for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
+                    var node = nodes_4[_i];
                     switch (node.kind) {
                         case 214:
                         case 217:
@@ -31940,8 +33149,8 @@ var ts;
             function getItemsWorker(nodes, createItem) {
                 var items = [];
                 var keyToItem = {};
-                for (var _i = 0; _i < nodes.length; _i++) {
-                    var child = nodes[_i];
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var child = nodes_5[_i];
                     var item = createItem(child);
                     if (item !== undefined) {
                         if (item.text.length > 0) {
@@ -31984,7 +33193,7 @@ var ts;
                         if (ts.isBindingPattern(node.name)) {
                             break;
                         }
-                        if ((node.flags & 2035) === 0) {
+                        if ((node.flags & 1022) === 0) {
                             return undefined;
                         }
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
@@ -32011,9 +33220,9 @@ var ts;
                     case 211:
                     case 163:
                         var variableDeclarationNode;
-                        var name_30;
+                        var name_33;
                         if (node.kind === 163) {
-                            name_30 = node.name;
+                            name_33 = node.name;
                             variableDeclarationNode = node;
                             while (variableDeclarationNode && variableDeclarationNode.kind !== 211) {
                                 variableDeclarationNode = variableDeclarationNode.parent;
@@ -32023,16 +33232,16 @@ var ts;
                         else {
                             ts.Debug.assert(!ts.isBindingPattern(node.name));
                             variableDeclarationNode = node;
-                            name_30 = node.name;
+                            name_33 = node.name;
                         }
                         if (ts.isConst(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.constElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.constElement);
                         }
                         else if (ts.isLet(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.letElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.letElement);
                         }
                         else {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.variableElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.variableElement);
                         }
                     case 144:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
@@ -32248,8 +33457,8 @@ var ts;
             if (isLowercase) {
                 if (index > 0) {
                     var wordSpans = getWordSpans(candidate);
-                    for (var _i = 0; _i < wordSpans.length; _i++) {
-                        var span = wordSpans[_i];
+                    for (var _i = 0, wordSpans_1 = wordSpans; _i < wordSpans_1.length; _i++) {
+                        var span = wordSpans_1[_i];
                         if (partStartsWith(candidate, span, chunk.text, true)) {
                             return createPatternMatch(PatternMatchKind.substring, punctuationStripped, partStartsWith(candidate, span, chunk.text, false));
                         }
@@ -32301,8 +33510,8 @@ var ts;
             }
             var subWordTextChunks = segment.subWordTextChunks;
             var matches = undefined;
-            for (var _i = 0; _i < subWordTextChunks.length; _i++) {
-                var subWordTextChunk = subWordTextChunks[_i];
+            for (var _i = 0, subWordTextChunks_1 = subWordTextChunks; _i < subWordTextChunks_1.length; _i++) {
+                var subWordTextChunk = subWordTextChunks_1[_i];
                 var result = matchTextChunk(candidate, subWordTextChunk, true);
                 if (!result) {
                     return undefined;
@@ -32639,7 +33848,7 @@ var ts;
             var resolvedSignature = typeChecker.getResolvedSignature(call, candidates);
             cancellationToken.throwIfCancellationRequested();
             if (!candidates.length) {
-                if (ts.isJavaScript(sourceFile.fileName)) {
+                if (ts.isSourceFileJavaScript(sourceFile)) {
                     return createJavaScriptSignatureHelpItems(argumentInfo);
                 }
                 return undefined;
@@ -32665,8 +33874,8 @@ var ts;
                     var nameToDeclarations = sourceFile_1.getNamedDeclarations();
                     var declarations = ts.getProperty(nameToDeclarations, name.text);
                     if (declarations) {
-                        for (var _b = 0; _b < declarations.length; _b++) {
-                            var declaration = declarations[_b];
+                        for (var _b = 0, declarations_7 = declarations; _b < declarations_7.length; _b++) {
+                            var declaration = declarations_7[_b];
                             var symbol = declaration.symbol;
                             if (symbol) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
@@ -32742,8 +33951,8 @@ var ts;
             function getArgumentIndex(argumentsList, node) {
                 var argumentIndex = 0;
                 var listChildren = argumentsList.getChildren();
-                for (var _i = 0; _i < listChildren.length; _i++) {
-                    var child = listChildren[_i];
+                for (var _i = 0, listChildren_1 = listChildren; _i < listChildren_1.length; _i++) {
+                    var child = listChildren_1[_i];
                     if (child === node) {
                         break;
                     }
@@ -33185,8 +34394,8 @@ var ts;
                 return n;
             }
             var children = n.getChildren();
-            for (var _i = 0; _i < children.length; _i++) {
-                var child = children[_i];
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
                 var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) ||
                     (child.pos === previousToken.end);
                 if (shouldDiveInChildNode && nodeHasTokens(child)) {
@@ -33309,17 +34518,17 @@ var ts;
     function getNodeModifiers(node) {
         var flags = ts.getCombinedNodeFlags(node);
         var result = [];
-        if (flags & 32)
-            result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 64)
-            result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
         if (flags & 16)
+            result.push(ts.ScriptElementKindModifier.privateMemberModifier);
+        if (flags & 32)
+            result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
+        if (flags & 8)
             result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 128)
+        if (flags & 64)
             result.push(ts.ScriptElementKindModifier.staticModifier);
-        if (flags & 256)
+        if (flags & 128)
             result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 1)
+        if (flags & 2)
             result.push(ts.ScriptElementKindModifier.exportedModifier);
         if (ts.isInAmbientContext(node))
             result.push(ts.ScriptElementKindModifier.ambientModifier);
@@ -34155,9 +35364,9 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_31 in o) {
-                    if (o[name_31] === rule) {
-                        return name_31;
+                for (var name_34 in o) {
+                    if (o[name_34] === rule) {
+                        return name_34;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -34532,7 +35741,7 @@ var ts;
                 function TokenRangeAccess(from, to, except) {
                     this.tokens = [];
                     for (var token = from; token <= to; token++) {
-                        if (except.indexOf(token) < 0) {
+                        if (ts.indexOf(except, token) < 0) {
                             this.tokens.push(token);
                         }
                     }
@@ -35120,8 +36329,8 @@ var ts;
                         }
                     }
                     var inheritedIndentation = -1;
-                    for (var _i = 0; _i < nodes.length; _i++) {
-                        var child = nodes[_i];
+                    for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
+                        var child = nodes_6[_i];
                         inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, true);
                     }
                     if (listEndToken !== 0) {
@@ -35145,7 +36354,7 @@ var ts;
                     var tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
                     if (isTokenInRange) {
                         var rangeHasError = rangeContainsError(currentTokenInfo.token);
-                        var prevStartLine = previousRangeStartLine;
+                        var savePreviousRange = previousRange;
                         lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
                         if (rangeHasError) {
                             indentToken = false;
@@ -35155,7 +36364,8 @@ var ts;
                                 indentToken = lineAdded;
                             }
                             else {
-                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                                var prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
+                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
                             }
                         }
                     }
@@ -35202,8 +36412,8 @@ var ts;
                 }
             }
             function processTrivia(trivia, parent, contextNode, dynamicIndentation) {
-                for (var _i = 0; _i < trivia.length; _i++) {
-                    var triviaItem = trivia[_i];
+                for (var _i = 0, trivia_1 = trivia; _i < trivia_1.length; _i++) {
+                    var triviaItem = trivia_1[_i];
                     if (ts.isComment(triviaItem.kind) && ts.rangeContainsRange(originalRange, triviaItem)) {
                         var triviaItemStart = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos);
                         processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
@@ -35732,7 +36942,6 @@ var ts;
                                 return node;
                         }
                     }
-                    return node;
                 }
             }
             function deriveActualIndentationFromList(list, index, sourceFile, options) {
@@ -35920,15 +37129,18 @@ var ts;
     ];
     var jsDocCompletionEntries;
     function createNode(kind, pos, end, flags, parent) {
-        var node = new (ts.getNodeConstructor(kind))();
-        node.pos = pos;
-        node.end = end;
+        var node = new NodeObject(kind, pos, end);
         node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
-        function NodeObject() {
+        function NodeObject(kind, pos, end) {
+            this.kind = kind;
+            this.pos = pos;
+            this.end = end;
+            this.flags = 0;
+            this.parent = undefined;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -35962,17 +37174,17 @@ var ts;
             while (pos < end) {
                 var token = scanner.scan();
                 var textPos = scanner.getTextPos();
-                nodes.push(createNode(token, pos, textPos, 4096, this));
+                nodes.push(createNode(token, pos, textPos, 2048, this));
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(271, nodes.pos, nodes.end, 4096, this);
+            var list = createNode(271, nodes.pos, nodes.end, 2048, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+                var node = nodes_7[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -36367,8 +37579,8 @@ var ts;
     })();
     var SourceFileObject = (function (_super) {
         __extends(SourceFileObject, _super);
-        function SourceFileObject() {
-            _super.apply(this, arguments);
+        function SourceFileObject(kind, pos, end) {
+            _super.call(this, kind, pos, end);
         }
         SourceFileObject.prototype.update = function (newText, textChangeRange) {
             return ts.updateSourceFile(this, newText, textChangeRange);
@@ -36478,7 +37690,7 @@ var ts;
                         }
                         break;
                     case 138:
-                        if (!(node.flags & 112)) {
+                        if (!(node.flags & 56)) {
                             break;
                         }
                     case 211:
@@ -36637,6 +37849,9 @@ var ts;
         ClassificationTypeNames.typeAliasName = "type alias name";
         ClassificationTypeNames.parameterName = "parameter name";
         ClassificationTypeNames.docCommentTagName = "doc comment tag name";
+        ClassificationTypeNames.jsxOpenTagName = "jsx open tag name";
+        ClassificationTypeNames.jsxCloseTagName = "jsx close tag name";
+        ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name";
         return ClassificationTypeNames;
     })();
     ts.ClassificationTypeNames = ClassificationTypeNames;
@@ -36677,18 +37892,20 @@ var ts;
     var HostCache = (function () {
         function HostCache(host, getCanonicalFileName) {
             this.host = host;
-            this.fileNameToEntry = ts.createFileMap(getCanonicalFileName);
+            this.getCanonicalFileName = getCanonicalFileName;
+            this.currentDirectory = host.getCurrentDirectory();
+            this.fileNameToEntry = ts.createFileMap();
             var rootFileNames = host.getScriptFileNames();
-            for (var _i = 0; _i < rootFileNames.length; _i++) {
-                var fileName = rootFileNames[_i];
-                this.createEntry(fileName);
+            for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) {
+                var fileName = rootFileNames_1[_i];
+                this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
             }
             this._compilationSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
         }
         HostCache.prototype.compilationSettings = function () {
             return this._compilationSettings;
         };
-        HostCache.prototype.createEntry = function (fileName) {
+        HostCache.prototype.createEntry = function (fileName, path) {
             var entry;
             var scriptSnapshot = this.host.getScriptSnapshot(fileName);
             if (scriptSnapshot) {
@@ -36698,36 +37915,37 @@ var ts;
                     scriptSnapshot: scriptSnapshot
                 };
             }
-            this.fileNameToEntry.set(fileName, entry);
+            this.fileNameToEntry.set(path, entry);
             return entry;
         };
-        HostCache.prototype.getEntry = function (fileName) {
-            return this.fileNameToEntry.get(fileName);
+        HostCache.prototype.getEntry = function (path) {
+            return this.fileNameToEntry.get(path);
         };
-        HostCache.prototype.contains = function (fileName) {
-            return this.fileNameToEntry.contains(fileName);
+        HostCache.prototype.contains = function (path) {
+            return this.fileNameToEntry.contains(path);
         };
         HostCache.prototype.getOrCreateEntry = function (fileName) {
-            if (this.contains(fileName)) {
-                return this.getEntry(fileName);
+            var path = ts.toPath(fileName, this.currentDirectory, this.getCanonicalFileName);
+            if (this.contains(path)) {
+                return this.getEntry(path);
             }
-            return this.createEntry(fileName);
+            return this.createEntry(fileName, path);
         };
         HostCache.prototype.getRootFileNames = function () {
             var fileNames = [];
-            this.fileNameToEntry.forEachValue(function (value) {
+            this.fileNameToEntry.forEachValue(function (path, value) {
                 if (value) {
                     fileNames.push(value.hostFileName);
                 }
             });
             return fileNames;
         };
-        HostCache.prototype.getVersion = function (fileName) {
-            var file = this.getEntry(fileName);
+        HostCache.prototype.getVersion = function (path) {
+            var file = this.getEntry(path);
             return file && file.version;
         };
-        HostCache.prototype.getScriptSnapshot = function (fileName) {
-            var file = this.getEntry(fileName);
+        HostCache.prototype.getScriptSnapshot = function (path) {
+            var file = this.getEntry(path);
             return file && file.scriptSnapshot;
         };
         return HostCache;
@@ -36870,7 +38088,8 @@ var ts;
             : (function (fileName) { return fileName.toLowerCase(); });
     }
     ts.createGetCanonicalFileName = createGetCanonicalFileName;
-    function createDocumentRegistry(useCaseSensitiveFileNames) {
+    function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
+        if (currentDirectory === void 0) { currentDirectory = ""; }
         var buckets = {};
         var getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames);
         function getKeyFromCompilationSettings(settings) {
@@ -36880,7 +38099,7 @@ var ts;
             var key = getKeyFromCompilationSettings(settings);
             var bucket = ts.lookUp(buckets, key);
             if (!bucket && createIfMissing) {
-                buckets[key] = bucket = ts.createFileMap(getCanonicalFileName);
+                buckets[key] = bucket = ts.createFileMap();
             }
             return bucket;
         }
@@ -36888,14 +38107,13 @@ var ts;
             var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === '_'; }).map(function (name) {
                 var entries = ts.lookUp(buckets, name);
                 var sourceFiles = [];
-                for (var i in entries) {
-                    var entry = entries.get(i);
+                entries.forEachValue(function (key, entry) {
                     sourceFiles.push({
-                        name: i,
+                        name: key,
                         refCount: entry.languageServiceRefCount,
                         references: entry.owners.slice(0)
                     });
-                }
+                });
                 sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
                 return {
                     bucket: name,
@@ -36912,7 +38130,8 @@ var ts;
         }
         function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) {
             var bucket = getBucketForCompilationSettings(compilationSettings, true);
-            var entry = bucket.get(fileName);
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var entry = bucket.get(path);
             if (!entry) {
                 ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
                 var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, false);
@@ -36921,7 +38140,7 @@ var ts;
                     languageServiceRefCount: 0,
                     owners: []
                 };
-                bucket.set(fileName, entry);
+                bucket.set(path, entry);
             }
             else {
                 if (entry.sourceFile.version !== version) {
@@ -36936,11 +38155,12 @@ var ts;
         function releaseDocument(fileName, compilationSettings) {
             var bucket = getBucketForCompilationSettings(compilationSettings, false);
             ts.Debug.assert(bucket !== undefined);
-            var entry = bucket.get(fileName);
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var entry = bucket.get(path);
             entry.languageServiceRefCount--;
             ts.Debug.assert(entry.languageServiceRefCount >= 0);
             if (entry.languageServiceRefCount === 0) {
-                bucket.remove(fileName);
+                bucket.remove(path);
             }
         }
         return {
@@ -36951,8 +38171,9 @@ var ts;
         };
     }
     ts.createDocumentRegistry = createDocumentRegistry;
-    function preProcessFile(sourceText, readImportFiles) {
+    function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) {
         if (readImportFiles === void 0) { readImportFiles = true; }
+        if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
         var referencedFiles = [];
         var importedFiles = [];
         var ambientExternalModules;
@@ -36986,93 +38207,53 @@ var ts;
                 end: pos + importPath.length
             });
         }
-        function processImport() {
-            scanner.setText(sourceText);
-            var token = scanner.scan();
-            while (token !== 1) {
-                if (token === 122) {
-                    token = scanner.scan();
-                    if (token === 125) {
-                        token = scanner.scan();
-                        if (token === 9) {
-                            recordAmbientExternalModule();
-                            continue;
-                        }
-                    }
-                }
-                else if (token === 89) {
+        function tryConsumeDeclare() {
+            var token = scanner.getToken();
+            if (token === 122) {
+                token = scanner.scan();
+                if (token === 125) {
                     token = scanner.scan();
                     if (token === 9) {
-                        recordModuleName();
-                        continue;
-                    }
-                    else {
-                        if (token === 69 || ts.isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === 133) {
-                                token = scanner.scan();
-                                if (token === 9) {
-                                    recordModuleName();
-                                    continue;
-                                }
-                            }
-                            else if (token === 56) {
-                                token = scanner.scan();
-                                if (token === 127) {
-                                    token = scanner.scan();
-                                    if (token === 17) {
-                                        token = scanner.scan();
-                                        if (token === 9) {
-                                            recordModuleName();
-                                            continue;
-                                        }
-                                    }
-                                }
-                            }
-                            else if (token === 24) {
-                                token = scanner.scan();
-                            }
-                            else {
-                                continue;
-                            }
-                        }
-                        if (token === 15) {
-                            token = scanner.scan();
-                            while (token !== 16) {
-                                token = scanner.scan();
-                            }
-                            if (token === 16) {
-                                token = scanner.scan();
-                                if (token === 133) {
-                                    token = scanner.scan();
-                                    if (token === 9) {
-                                        recordModuleName();
-                                    }
-                                }
-                            }
-                        }
-                        else if (token === 37) {
-                            token = scanner.scan();
-                            if (token === 116) {
-                                token = scanner.scan();
-                                if (token === 69 || ts.isKeyword(token)) {
-                                    token = scanner.scan();
-                                    if (token === 133) {
-                                        token = scanner.scan();
-                                        if (token === 9) {
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                        recordAmbientExternalModule();
                     }
                 }
-                else if (token === 82) {
-                    token = scanner.scan();
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeImport() {
+            var token = scanner.getToken();
+            if (token === 89) {
+                token = scanner.scan();
+                if (token === 9) {
+                    recordModuleName();
+                    return true;
+                }
+                else {
+                    if (token === 69 || ts.isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === 133) {
+                            token = scanner.scan();
+                            if (token === 9) {
+                                recordModuleName();
+                                return true;
+                            }
+                        }
+                        else if (token === 56) {
+                            if (tryConsumeRequireCall(true)) {
+                                return true;
+                            }
+                        }
+                        else if (token === 24) {
+                            token = scanner.scan();
+                        }
+                        else {
+                            return true;
+                        }
+                    }
                     if (token === 15) {
                         token = scanner.scan();
-                        while (token !== 16) {
+                        while (token !== 16 && token !== 1) {
                             token = scanner.scan();
                         }
                         if (token === 16) {
@@ -37086,6 +38267,35 @@ var ts;
                         }
                     }
                     else if (token === 37) {
+                        token = scanner.scan();
+                        if (token === 116) {
+                            token = scanner.scan();
+                            if (token === 69 || ts.isKeyword(token)) {
+                                token = scanner.scan();
+                                if (token === 133) {
+                                    token = scanner.scan();
+                                    if (token === 9) {
+                                        recordModuleName();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeExport() {
+            var token = scanner.getToken();
+            if (token === 82) {
+                token = scanner.scan();
+                if (token === 15) {
+                    token = scanner.scan();
+                    while (token !== 16 && token !== 1) {
+                        token = scanner.scan();
+                    }
+                    if (token === 16) {
                         token = scanner.scan();
                         if (token === 133) {
                             token = scanner.scan();
@@ -37094,31 +38304,99 @@ var ts;
                             }
                         }
                     }
-                    else if (token === 89) {
+                }
+                else if (token === 37) {
+                    token = scanner.scan();
+                    if (token === 133) {
                         token = scanner.scan();
-                        if (token === 69 || ts.isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === 56) {
-                                token = scanner.scan();
-                                if (token === 127) {
-                                    token = scanner.scan();
-                                    if (token === 17) {
-                                        token = scanner.scan();
-                                        if (token === 9) {
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
+                        if (token === 9) {
+                            recordModuleName();
+                        }
+                    }
+                }
+                else if (token === 89) {
+                    token = scanner.scan();
+                    if (token === 69 || ts.isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === 56) {
+                            if (tryConsumeRequireCall(true)) {
+                                return true;
                             }
                         }
                     }
                 }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeRequireCall(skipCurrentToken) {
+            var token = skipCurrentToken ? scanner.scan() : scanner.getToken();
+            if (token === 127) {
                 token = scanner.scan();
+                if (token === 17) {
+                    token = scanner.scan();
+                    if (token === 9) {
+                        recordModuleName();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeDefine() {
+            var token = scanner.getToken();
+            if (token === 69 && scanner.getTokenValue() === "define") {
+                token = scanner.scan();
+                if (token !== 17) {
+                    return true;
+                }
+                token = scanner.scan();
+                if (token === 9) {
+                    token = scanner.scan();
+                    if (token === 24) {
+                        token = scanner.scan();
+                    }
+                    else {
+                        return true;
+                    }
+                }
+                if (token !== 19) {
+                    return true;
+                }
+                token = scanner.scan();
+                var i = 0;
+                while (token !== 20 && token !== 1) {
+                    if (token === 9) {
+                        recordModuleName();
+                        i++;
+                    }
+                    token = scanner.scan();
+                }
+                return true;
+            }
+            return false;
+        }
+        function processImports() {
+            scanner.setText(sourceText);
+            scanner.scan();
+            while (true) {
+                if (scanner.getToken() === 1) {
+                    break;
+                }
+                if (tryConsumeDeclare() ||
+                    tryConsumeImport() ||
+                    tryConsumeExport() ||
+                    (detectJavaScriptImports && (tryConsumeRequireCall(false) || tryConsumeDefine()))) {
+                    continue;
+                }
+                else {
+                    scanner.scan();
+                }
             }
             scanner.setText(undefined);
         }
         if (readImportFiles) {
-            processImport();
+            processImports();
         }
         processTripleSlashDirectives();
         return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules };
@@ -37293,7 +38571,7 @@ var ts;
             case 144: return ScriptElementKind.constructorImplementationElement;
             case 137: return ScriptElementKind.typeParameterElement;
             case 247: return ScriptElementKind.variableElement;
-            case 138: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 138: return (node.flags & 56) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
             case 221:
             case 226:
             case 223:
@@ -37319,13 +38597,14 @@ var ts;
         return CancellationTokenObject;
     })();
     function createLanguageService(host, documentRegistry) {
-        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(); }
+        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var ruleProvider;
         var program;
         var lastProjectVersion;
         var useCaseSensitivefileNames = false;
         var cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
+        var currentDirectory = host.getCurrentDirectory();
         if (!ts.localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
             ts.localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
         }
@@ -37336,8 +38615,7 @@ var ts;
         }
         var getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames);
         function getValidSourceFile(fileName) {
-            fileName = ts.normalizeSlashes(fileName);
-            var sourceFile = program.getSourceFile(getCanonicalFileName(fileName));
+            var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
@@ -37379,7 +38657,7 @@ var ts;
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
                 writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     ts.Debug.assert(!host.resolveModuleNames);
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
@@ -37395,11 +38673,10 @@ var ts;
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
-                for (var _i = 0; _i < oldSourceFiles.length; _i++) {
-                    var oldSourceFile = oldSourceFiles[_i];
-                    var fileName = oldSourceFile.fileName;
-                    if (!newProgram.getSourceFile(fileName) || changesInCompilationSettingsAffectSyntax) {
-                        documentRegistry.releaseDocument(fileName, oldSettings);
+                for (var _i = 0, oldSourceFiles_1 = oldSourceFiles; _i < oldSourceFiles_1.length; _i++) {
+                    var oldSourceFile = oldSourceFiles_1[_i];
+                    if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) {
+                        documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings);
                     }
                 }
             }
@@ -37422,7 +38699,8 @@ var ts;
                 return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
             }
             function sourceFileUpToDate(sourceFile) {
-                return sourceFile && sourceFile.version === hostCache.getVersion(sourceFile.fileName);
+                var path = sourceFile.path || ts.toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName);
+                return sourceFile && sourceFile.version === hostCache.getVersion(path);
             }
             function programUpToDate() {
                 if (!program) {
@@ -37432,8 +38710,8 @@ var ts;
                 if (program.getSourceFiles().length !== rootFileNames.length) {
                     return false;
                 }
-                for (var _i = 0; _i < rootFileNames.length; _i++) {
-                    var fileName = rootFileNames[_i];
+                for (var _i = 0, rootFileNames_2 = rootFileNames; _i < rootFileNames_2.length; _i++) {
+                    var fileName = rootFileNames_2[_i];
                     if (!sourceFileUpToDate(program.getSourceFile(fileName))) {
                         return false;
                     }
@@ -37461,7 +38739,7 @@ var ts;
         function getSemanticDiagnostics(fileName) {
             synchronizeHostData();
             var targetSourceFile = getValidSourceFile(fileName);
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(targetSourceFile)) {
                 return getJavaScriptSemanticDiagnostics(targetSourceFile);
             }
             var semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken);
@@ -37595,8 +38873,8 @@ var ts;
             }
             function checkModifiers(modifiers) {
                 if (modifiers) {
-                    for (var _i = 0; _i < modifiers.length; _i++) {
-                        var modifier = modifiers[_i];
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
                             case 112:
                             case 110:
@@ -37653,7 +38931,7 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var syntacticStart = new Date().getTime();
             var sourceFile = getValidSourceFile(fileName);
-            var isJavaScriptFile = ts.isJavaScript(fileName);
+            var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile);
             var isJsDocTagName = false;
             var start = new Date().getTime();
             var currentToken = ts.getTokenAtPosition(sourceFile, position);
@@ -37695,9 +38973,9 @@ var ts;
             log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start));
             var contextToken = previousToken;
             if (contextToken && position <= contextToken.end && ts.isWord(contextToken.kind)) {
-                var start_4 = new Date().getTime();
+                var start_3 = new Date().getTime();
                 contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile);
-                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_4));
+                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_3));
             }
             var node = currentToken;
             var isRightOfDot = false;
@@ -37919,9 +39197,9 @@ var ts;
                 if (contextToken.kind === 9
                     || contextToken.kind === 10
                     || ts.isTemplateLiteralKind(contextToken.kind)) {
-                    var start_5 = contextToken.getStart();
+                    var start_4 = contextToken.getStart();
                     var end = contextToken.getEnd();
-                    if (start_5 < position && position < end) {
+                    if (start_4 < position && position < end) {
                         return true;
                     }
                     if (position === end) {
@@ -38159,13 +39437,13 @@ var ts;
             }
             function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
                 var exisingImportsOrExports = {};
-                for (var _i = 0; _i < namedImportsOrExports.length; _i++) {
-                    var element = namedImportsOrExports[_i];
+                for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
+                    var element = namedImportsOrExports_1[_i];
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_32 = element.propertyName || element.name;
-                    exisingImportsOrExports[name_32.text] = true;
+                    var name_35 = element.propertyName || element.name;
+                    exisingImportsOrExports[name_35.text] = true;
                 }
                 if (ts.isEmpty(exisingImportsOrExports)) {
                     return exportsOfModule;
@@ -38177,8 +39455,8 @@ var ts;
                     return contextualMemberSymbols;
                 }
                 var existingMemberNames = {};
-                for (var _i = 0; _i < existingMembers.length; _i++) {
-                    var m = existingMembers[_i];
+                for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
+                    var m = existingMembers_1[_i];
                     if (m.kind !== 245 &&
                         m.kind !== 246 &&
                         m.kind !== 163) {
@@ -38189,7 +39467,9 @@ var ts;
                     }
                     var existingName = void 0;
                     if (m.kind === 163 && m.propertyName) {
-                        existingName = m.propertyName.text;
+                        if (m.propertyName.kind === 69) {
+                            existingName = m.propertyName.text;
+                        }
                     }
                     else {
                         existingName = m.name.text;
@@ -38200,8 +39480,8 @@ var ts;
             }
             function filterJsxAttributes(symbols, attributes) {
                 var seenNames = {};
-                for (var _i = 0; _i < attributes.length; _i++) {
-                    var attr = attributes[_i];
+                for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
+                    var attr = attributes_1[_i];
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
@@ -38219,44 +39499,41 @@ var ts;
                 return undefined;
             }
             var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName;
-            var entries;
             if (isJsDocTagName) {
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
-            if (isRightOfDot && ts.isJavaScript(fileName)) {
-                entries = getCompletionEntriesFromSymbols(symbols);
-                ts.addRange(entries, getJavaScriptCompletionEntries());
+            var sourceFile = getValidSourceFile(fileName);
+            var entries = [];
+            if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) {
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
+                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     return undefined;
                 }
-                entries = getCompletionEntriesFromSymbols(symbols);
+                getCompletionEntriesFromSymbols(symbols, entries);
             }
             if (!isMemberCompletion && !isJsDocTagName) {
                 ts.addRange(entries, keywordCompletions);
             }
             return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries() {
+            function getJavaScriptCompletionEntries(sourceFile, uniqueNames) {
                 var entries = [];
-                var allNames = {};
                 var target = program.getCompilerOptions().target;
-                for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
-                    var sourceFile = _a[_i];
-                    var nameTable = getNameTable(sourceFile);
-                    for (var name_33 in nameTable) {
-                        if (!allNames[name_33]) {
-                            allNames[name_33] = name_33;
-                            var displayName = getCompletionEntryDisplayName(name_33, target, true);
-                            if (displayName) {
-                                var entry = {
-                                    name: displayName,
-                                    kind: ScriptElementKind.warning,
-                                    kindModifiers: "",
-                                    sortText: "1"
-                                };
-                                entries.push(entry);
-                            }
+                var nameTable = getNameTable(sourceFile);
+                for (var name_36 in nameTable) {
+                    if (!uniqueNames[name_36]) {
+                        uniqueNames[name_36] = name_36;
+                        var displayName = getCompletionEntryDisplayName(name_36, target, true);
+                        if (displayName) {
+                            var entry = {
+                                name: displayName,
+                                kind: ScriptElementKind.warning,
+                                kindModifiers: "",
+                                sortText: "1"
+                            };
+                            entries.push(entry);
                         }
                     }
                 }
@@ -38284,25 +39561,24 @@ var ts;
                     sortText: "0"
                 };
             }
-            function getCompletionEntriesFromSymbols(symbols) {
+            function getCompletionEntriesFromSymbols(symbols, entries) {
                 var start = new Date().getTime();
-                var entries = [];
+                var uniqueNames = {};
                 if (symbols) {
-                    var nameToSymbol = {};
-                    for (var _i = 0; _i < symbols.length; _i++) {
-                        var symbol = symbols[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var symbol = symbols_3[_i];
                         var entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             var id = ts.escapeIdentifier(entry.name);
-                            if (!ts.lookUp(nameToSymbol, id)) {
+                            if (!ts.lookUp(uniqueNames, id)) {
                                 entries.push(entry);
-                                nameToSymbol[id] = symbol;
+                                uniqueNames[id] = id;
                             }
                         }
                     }
                 }
                 log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
-                return entries;
+                return uniqueNames;
             }
         }
         function getCompletionEntryDetails(fileName, position, entryName) {
@@ -38483,16 +39759,16 @@ var ts;
                                 case ScriptElementKind.letElement:
                                 case ScriptElementKind.parameterElement:
                                 case ScriptElementKind.localVariableElement:
-                                    displayParts.push(ts.punctuationPart(54));
+                                    displayParts.push(ts.punctuationPart(ts.SyntaxKind.ColonToken));
                                     displayParts.push(ts.spacePart());
                                     if (useConstructSignatures) {
-                                        displayParts.push(ts.keywordPart(92));
+                                        displayParts.push(ts.keywordPart(ts.SyntaxKind.NewKeyword));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 65536)) {
-                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, undefined, 1));
+                                    if (!(type.flags & ts.TypeFlags.Anonymous)) {
+                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, undefined, ts.SymbolFormatFlags.WriteTypeParametersOrArguments));
                                     }
-                                    addSignatureDisplayParts(signature, allSignatures, 8);
+                                    addSignatureDisplayParts(signature, allSignatures, ts.TypeFormatFlags.WriteArrowStyleSignature);
                                     break;
                                 default:
                                     addSignatureDisplayParts(signature, allSignatures);
@@ -38973,8 +40249,8 @@ var ts;
                     }
                     var fileNameToDocumentHighlights = {};
                     var result = [];
-                    for (var _i = 0; _i < referencedSymbols.length; _i++) {
-                        var referencedSymbol = referencedSymbols[_i];
+                    for (var _i = 0, referencedSymbols_1 = referencedSymbols; _i < referencedSymbols_1.length; _i++) {
+                        var referencedSymbol = referencedSymbols_1[_i];
                         for (var _a = 0, _b = referencedSymbol.references; _a < _b.length; _a++) {
                             var referenceEntry = _b[_a];
                             var fileName_1 = referenceEntry.fileName;
@@ -39110,7 +40386,6 @@ var ts;
                             ts.forEachChild(node, aggregate);
                         }
                     }
-                    ;
                 }
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
@@ -39141,7 +40416,6 @@ var ts;
                             ts.forEachChild(node, aggregate);
                         }
                     }
-                    ;
                 }
                 function ownsBreakOrContinueStatement(owner, statement) {
                     var actualOwner = getBreakOrContinueOwner(statement);
@@ -39205,7 +40479,7 @@ var ts;
                     switch (container.kind) {
                         case 219:
                         case 248:
-                            if (modifierFlag & 256) {
+                            if (modifierFlag & 128) {
                                 nodes = declaration.members.concat(declaration);
                             }
                             else {
@@ -39218,7 +40492,7 @@ var ts;
                         case 214:
                         case 186:
                             nodes = container.members;
-                            if (modifierFlag & 112) {
+                            if (modifierFlag & 56) {
                                 var constructor = ts.forEach(container.members, function (member) {
                                     return member.kind === 144 && member;
                                 });
@@ -39226,7 +40500,7 @@ var ts;
                                     nodes = nodes.concat(constructor.parameters);
                                 }
                             }
-                            else if (modifierFlag & 256) {
+                            else if (modifierFlag & 128) {
                                 nodes = nodes.concat(container);
                             }
                             break;
@@ -39242,19 +40516,19 @@ var ts;
                     function getFlagFromModifier(modifier) {
                         switch (modifier) {
                             case 112:
-                                return 16;
+                                return 8;
                             case 110:
-                                return 32;
+                                return 16;
                             case 111:
-                                return 64;
+                                return 32;
                             case 113:
-                                return 128;
+                                return 64;
                             case 82:
-                                return 1;
-                            case 122:
                                 return 2;
+                            case 122:
+                                return 4;
                             case 115:
-                                return 256;
+                                return 128;
                             default:
                                 ts.Debug.fail();
                         }
@@ -39439,8 +40713,8 @@ var ts;
                     return undefined;
                 }
                 var result = [];
-                for (var _i = 0; _i < documentHighlights.length; _i++) {
-                    var entry = documentHighlights[_i];
+                for (var _i = 0, documentHighlights_1 = documentHighlights; _i < documentHighlights_1.length; _i++) {
+                    var entry = documentHighlights_1[_i];
                     for (var _a = 0, _b = entry.highlightSpans; _a < _b.length; _a++) {
                         var highlightSpan = _b[_a];
                         result.push({
@@ -39458,8 +40732,8 @@ var ts;
                 return undefined;
             }
             var referenceEntries = [];
-            for (var _i = 0; _i < referenceSymbols.length; _i++) {
-                var referenceSymbol = referenceSymbols[_i];
+            for (var _i = 0, referenceSymbols_1 = referenceSymbols; _i < referenceSymbols_1.length; _i++) {
+                var referenceSymbol = referenceSymbols_1[_i];
                 ts.addRange(referenceEntries, referenceSymbol.references);
             }
             return referenceEntries;
@@ -39527,8 +40801,8 @@ var ts;
             }
             else {
                 var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                    var sourceFile = sourceFiles_2[_i];
                     cancellationToken.throwIfCancellationRequested();
                     var nameTable = getNameTable(sourceFile);
                     if (ts.lookUp(nameTable, internedName)) {
@@ -39573,7 +40847,7 @@ var ts;
                     return valueDeclaration;
                 }
                 if (symbol.flags & (4 | 8192)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 16) ? d : undefined; });
                     if (privateDeclaration) {
                         return ts.getAncestor(privateDeclaration, 214);
                     }
@@ -39587,8 +40861,8 @@ var ts;
                 var scope = undefined;
                 var declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var _i = 0; _i < declarations.length; _i++) {
-                        var declaration = declarations[_i];
+                    for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                        var declaration = declarations_8[_i];
                         var container = getContainerNode(declaration);
                         if (!container) {
                             return undefined;
@@ -39741,7 +41015,7 @@ var ts;
                 if (!searchSpaceNode) {
                     return undefined;
                 }
-                var staticFlag = 128;
+                var staticFlag = 64;
                 switch (searchSpaceNode.kind) {
                     case 141:
                     case 140:
@@ -39766,7 +41040,7 @@ var ts;
                         return;
                     }
                     var container = ts.getSuperContainer(node, false);
-                    if (container && (128 & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (64 & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -39775,7 +41049,7 @@ var ts;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, false);
-                var staticFlag = 128;
+                var staticFlag = 64;
                 switch (searchSpaceNode.kind) {
                     case 143:
                     case 142:
@@ -39847,7 +41121,7 @@ var ts;
                                 break;
                             case 186:
                             case 214:
-                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 128) === staticFlag) {
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 64) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -39941,17 +41215,17 @@ var ts;
                 if (isNameOfPropertyAssignment(node)) {
                     var objectLiteral = node.parent.parent;
                     var contextualType = typeChecker.getContextualType(objectLiteral);
-                    var name_34 = node.text;
+                    var name_37 = node.text;
                     if (contextualType) {
                         if (contextualType.flags & 16384) {
-                            var unionProperty = contextualType.getProperty(name_34);
+                            var unionProperty = contextualType.getProperty(name_37);
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
                                 var result_4 = [];
                                 ts.forEach(contextualType.types, function (t) {
-                                    var symbol = t.getProperty(name_34);
+                                    var symbol = t.getProperty(name_37);
                                     if (symbol) {
                                         result_4.push(symbol);
                                     }
@@ -39960,7 +41234,7 @@ var ts;
                             }
                         }
                         else {
-                            var symbol_1 = contextualType.getProperty(name_34);
+                            var symbol_1 = contextualType.getProperty(name_37);
                             if (symbol_1) {
                                 return [symbol_1];
                             }
@@ -39974,8 +41248,8 @@ var ts;
                     var lastIterationMeaning;
                     do {
                         lastIterationMeaning = meaning;
-                        for (var _i = 0; _i < declarations.length; _i++) {
-                            var declaration = declarations[_i];
+                        for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                            var declaration = declarations_9[_i];
                             var declarationMeaning = getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -40088,7 +41362,6 @@ var ts;
                     return 4 | 1;
             }
             return 1 | 2 | 4;
-            ts.Debug.fail("Unknown declaration type");
         }
         function isTypeReference(node) {
             if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
@@ -40319,6 +41592,9 @@ var ts;
                 case 16: return ClassificationTypeNames.typeAliasName;
                 case 17: return ClassificationTypeNames.parameterName;
                 case 18: return ClassificationTypeNames.docCommentTagName;
+                case 19: return ClassificationTypeNames.jsxOpenTagName;
+                case 20: return ClassificationTypeNames.jsxCloseTagName;
+                case 21: return ClassificationTypeNames.jsxSelfClosingTagName;
             }
         }
         function convertClassifications(classifications) {
@@ -40558,6 +41834,21 @@ var ts;
                                     return 17;
                                 }
                                 return;
+                            case 235:
+                                if (token.parent.tagName === token) {
+                                    return 19;
+                                }
+                                return;
+                            case 237:
+                                if (token.parent.tagName === token) {
+                                    return 20;
+                                }
+                                return;
+                            case 234:
+                                if (token.parent.tagName === token) {
+                                    return 21;
+                                }
+                                return;
                         }
                     }
                     return 2;
@@ -40595,8 +41886,8 @@ var ts;
                 if (matchKind) {
                     var parentElement = token.parent;
                     var childNodes = parentElement.getChildren(sourceFile);
-                    for (var _i = 0; _i < childNodes.length; _i++) {
-                        var current = childNodes[_i];
+                    for (var _i = 0, childNodes_1 = childNodes; _i < childNodes_1.length; _i++) {
+                        var current = childNodes_1[_i];
                         if (current.kind === matchKind) {
                             var range1 = ts.createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile));
                             var range2 = ts.createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile));
@@ -40812,12 +42103,12 @@ var ts;
                     if (declarations && declarations.length > 0) {
                         var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         if (defaultLibFileName) {
-                            for (var _i = 0; _i < declarations.length; _i++) {
-                                var current = declarations[_i];
+                            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                                var current = declarations_10[_i];
                                 var sourceFile_2 = current.getSourceFile();
                                 var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
                                 if (sourceFile_2 && getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) {
-                                    return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                                    return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
                             }
                         }
@@ -40837,7 +42128,7 @@ var ts;
                     }
                 }
             }
-            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element.key));
+            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element));
             function getRenameInfoError(localizedErrorMessage) {
                 return {
                     canRename: false,
@@ -41267,18 +42558,8 @@ var ts;
     ts.getDefaultLibFilePath = getDefaultLibFilePath;
     function initializeServices() {
         ts.objectAllocator = {
-            getNodeConstructor: function (kind) {
-                function Node() {
-                }
-                var proto = kind === 248 ? new SourceFileObject() : new NodeObject();
-                proto.kind = kind;
-                proto.pos = -1;
-                proto.end = -1;
-                proto.flags = 0;
-                proto.parent = undefined;
-                Node.prototype = proto;
-                return Node;
-            },
+            getNodeConstructor: function () { return NodeObject; },
+            getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
             getSignatureConstructor: function () { return SignatureObject; }
@@ -41550,8 +42831,8 @@ var ts;
                 if (this.logger.isVerbose()) {
                     this.logger.info(msg.type + ": " + json);
                 }
-                this.sendLineToClient('Content-Length: ' + (1 + this.byteLength(json, 'utf8')) +
-                    '\r\n\r\n' + json);
+                this.sendLineToClient("Content-Length: " + (1 + this.byteLength(json, "utf8")) +
+                    "\r\n\r\n" + json);
             };
             Session.prototype.event = function (info, eventName) {
                 var ev = {
@@ -41934,7 +43215,8 @@ var ts;
                                 };
                                 var preferredIndent = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
                                 var hasIndent = 0;
-                                for (var i = 0, len = lineText.length; i < len; i++) {
+                                var i, len;
+                                for (i = 0, len = lineText.length; i < len; i++) {
                                     if (lineText.charAt(i) == " ") {
                                         hasIndent++;
                                     }
@@ -42141,7 +43423,7 @@ var ts;
                     if (navItem.kindModifiers && (navItem.kindModifiers != "")) {
                         bakedItem.kindModifiers = navItem.kindModifiers;
                     }
-                    if (navItem.matchKind != 'none') {
+                    if (navItem.matchKind !== "none") {
                         bakedItem.matchKind = navItem.matchKind;
                     }
                     if (navItem.containerName && (navItem.containerName.length > 0)) {
@@ -42172,16 +43454,16 @@ var ts;
             };
             Session.prototype.getDiagnosticsForProject = function (delay, fileName) {
                 var _this = this;
-                var _a = this.getProjectInfo(fileName, true), configFileName = _a.configFileName, fileNamesInProject = _a.fileNames;
-                fileNamesInProject = fileNamesInProject.filter(function (value, index, array) { return value.indexOf("lib.d.ts") < 0; });
+                var _a = this.getProjectInfo(fileName, true), configFileName = _a.configFileName, fileNames = _a.fileNames;
+                var fileNamesInProject = fileNames.filter(function (value, index, array) { return value.indexOf("lib.d.ts") < 0; });
                 var highPriorityFiles = [];
                 var mediumPriorityFiles = [];
                 var lowPriorityFiles = [];
                 var veryLowPriorityFiles = [];
                 var normalizedFileName = ts.normalizePath(fileName);
                 var project = this.projectService.getProjectForFile(normalizedFileName);
-                for (var _i = 0; _i < fileNamesInProject.length; _i++) {
-                    var fileNameInProject = fileNamesInProject[_i];
+                for (var _i = 0, fileNamesInProject_1 = fileNamesInProject; _i < fileNamesInProject_1.length; _i++) {
+                    var fileNameInProject = fileNamesInProject_1[_i];
                     if (this.getCanonicalFileName(fileNameInProject) == this.getCanonicalFileName(fileName))
                         highPriorityFiles.push(fileNameInProject);
                     else {
@@ -42229,12 +43511,14 @@ var ts;
                 }
             };
             Session.prototype.onMessage = function (message) {
+                var start;
                 if (this.logger.isVerbose()) {
                     this.logger.info("request: " + message);
-                    var start = this.hrtime();
+                    start = this.hrtime();
                 }
+                var request;
                 try {
-                    var request = JSON.parse(message);
+                    request = JSON.parse(message);
                     var _a = this.executeCommand(request), response = _a.response, responseRequired = _a.responseRequired;
                     if (this.logger.isVerbose()) {
                         var elapsed = this.hrtime(start);
@@ -42289,6 +43573,7 @@ var ts;
                 this.isOpen = isOpen;
                 this.children = [];
                 this.formatCodeOptions = ts.clone(CompilerService.defaultFormatCodeOptions);
+                this.path = ts.toPath(fileName, host.getCurrentDirectory(), ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
                 this.svc = ScriptVersionCache.fromString(host, content);
             }
             ScriptInfo.prototype.setFormatOptions = function (formatOptions) {
@@ -42330,22 +43615,23 @@ var ts;
                 var _this = this;
                 this.host = host;
                 this.project = project;
-                this.ls = null;
-                this.filenameToScript = {};
                 this.roots = [];
-                this.resolvedModuleNames = ts.createFileMap(ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
+                this.getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
+                this.resolvedModuleNames = ts.createFileMap();
+                this.filenameToScript = ts.createFileMap();
                 this.moduleResolutionHost = {
                     fileExists: function (fileName) { return _this.fileExists(fileName); },
                     readFile: function (fileName) { return _this.host.readFile(fileName); }
                 };
             }
             LSHost.prototype.resolveModuleNames = function (moduleNames, containingFile) {
-                var currentResolutionsInFile = this.resolvedModuleNames.get(containingFile);
+                var path = ts.toPath(containingFile, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+                var currentResolutionsInFile = this.resolvedModuleNames.get(path);
                 var newResolutions = {};
                 var resolvedModules = [];
                 var compilerOptions = this.getCompilationSettings();
-                for (var _i = 0; _i < moduleNames.length; _i++) {
-                    var moduleName = moduleNames[_i];
+                for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
+                    var moduleName = moduleNames_1[_i];
                     var resolution = ts.lookUp(newResolutions, moduleName);
                     if (!resolution) {
                         var existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, moduleName);
@@ -42361,7 +43647,7 @@ var ts;
                     ts.Debug.assert(resolution !== undefined);
                     resolvedModules.push(resolution.resolvedModule);
                 }
-                this.resolvedModuleNames.set(containingFile, newResolutions);
+                this.resolvedModuleNames.set(path, newResolutions);
                 return resolvedModules;
                 function moduleResolutionIsValid(resolution) {
                     if (!resolution) {
@@ -42412,35 +43698,32 @@ var ts;
             };
             LSHost.prototype.removeReferencedFile = function (info) {
                 if (!info.isOpen) {
-                    this.filenameToScript[info.fileName] = undefined;
-                    this.resolvedModuleNames.remove(info.fileName);
+                    this.filenameToScript.remove(info.path);
+                    this.resolvedModuleNames.remove(info.path);
                 }
             };
             LSHost.prototype.getScriptInfo = function (filename) {
-                var scriptInfo = ts.lookUp(this.filenameToScript, filename);
+                var path = ts.toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+                var scriptInfo = this.filenameToScript.get(path);
                 if (!scriptInfo) {
                     scriptInfo = this.project.openReferencedFile(filename);
                     if (scriptInfo) {
-                        this.filenameToScript[scriptInfo.fileName] = scriptInfo;
+                        this.filenameToScript.set(path, scriptInfo);
                     }
                 }
-                else {
-                }
                 return scriptInfo;
             };
             LSHost.prototype.addRoot = function (info) {
-                var scriptInfo = ts.lookUp(this.filenameToScript, info.fileName);
-                if (!scriptInfo) {
-                    this.filenameToScript[info.fileName] = info;
+                if (!this.filenameToScript.contains(info.path)) {
+                    this.filenameToScript.set(info.path, info);
                     this.roots.push(info);
                 }
             };
             LSHost.prototype.removeRoot = function (info) {
-                var scriptInfo = ts.lookUp(this.filenameToScript, info.fileName);
-                if (scriptInfo) {
-                    this.filenameToScript[info.fileName] = undefined;
+                if (!this.filenameToScript.contains(info.path)) {
+                    this.filenameToScript.remove(info.path);
                     this.roots = copyListRemovingItem(info, this.roots);
-                    this.resolvedModuleNames.remove(info.fileName);
+                    this.resolvedModuleNames.remove(info.path);
                 }
             };
             LSHost.prototype.saveTo = function (filename, tmpfilename) {
@@ -42478,7 +43761,8 @@ var ts;
                 return this.host.directoryExists(path);
             };
             LSHost.prototype.lineToTextSpan = function (filename, line) {
-                var script = this.filenameToScript[filename];
+                var path = ts.toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+                var script = this.filenameToScript.get(path);
                 var index = script.snap().index;
                 var lineInfo = index.lineNumberToInfo(line + 1);
                 var len;
@@ -42492,13 +43776,15 @@ var ts;
                 return ts.createTextSpan(lineInfo.offset, len);
             };
             LSHost.prototype.lineOffsetToPosition = function (filename, line, offset) {
-                var script = this.filenameToScript[filename];
+                var path = ts.toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+                var script = this.filenameToScript.get(path);
                 var index = script.snap().index;
                 var lineInfo = index.lineNumberToInfo(line);
                 return (lineInfo.offset + offset - 1);
             };
             LSHost.prototype.positionToLineOffset = function (filename, position) {
-                var script = this.filenameToScript[filename];
+                var path = ts.toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+                var script = this.filenameToScript.get(path);
                 var index = script.snap().index;
                 var lineOffset = index.charOffsetToLineNumberAndPos(position);
                 return { line: lineOffset.line, offset: lineOffset.offset + 1 };
@@ -42512,22 +43798,22 @@ var ts;
                 return filename;
             }
             else {
-                var splitFilename = filename.split('/');
-                var splitDir = directory.split('/');
+                var splitFilename = filename.split("/");
+                var splitDir = directory.split("/");
                 var i = 0;
                 var dirTail = 0;
                 var sflen = splitFilename.length;
-                while ((i < sflen) && (splitFilename[i].charAt(0) == '.')) {
+                while ((i < sflen) && (splitFilename[i].charAt(0) == ".")) {
                     var dots = splitFilename[i];
-                    if (dots == '..') {
+                    if (dots == "..") {
                         dirTail++;
                     }
-                    else if (dots != '.') {
+                    else if (dots != ".") {
                         return undefined;
                     }
                     i++;
                 }
-                return splitDir.slice(0, splitDir.length - dirTail).concat(splitFilename.slice(i)).join('/');
+                return splitDir.slice(0, splitDir.length - dirTail).concat(splitFilename.slice(i)).join("/");
             }
         }
         var Project = (function () {
@@ -42538,6 +43824,9 @@ var ts;
                 this.filenameToSourceFile = {};
                 this.updateGraphSeq = 0;
                 this.openRefCount = 0;
+                if (projectOptions && projectOptions.files) {
+                    projectOptions.compilerOptions.allowNonTsExtensions = true;
+                }
                 this.compilerService = new CompilerService(this, projectOptions && projectOptions.compilerOptions);
             }
             Project.prototype.addOpenRef = function () {
@@ -42608,6 +43897,7 @@ var ts;
             Project.prototype.setProjectOptions = function (projectOptions) {
                 this.projectOptions = projectOptions;
                 if (projectOptions.compilerOptions) {
+                    projectOptions.compilerOptions.allowNonTsExtensions = true;
                     this.compilerService.setCompilerOptions(projectOptions.compilerOptions);
                 }
             };
@@ -42687,7 +43977,7 @@ var ts;
                 var _a = this.configFileToProjectOptions(project.projectFilename), succeeded = _a.succeeded, projectOptions = _a.projectOptions, error = _a.error;
                 var newRootFiles = projectOptions.files.map((function (f) { return _this.getCanonicalFileName(f); }));
                 var currentRootFiles = project.getRootFiles().map((function (f) { return _this.getCanonicalFileName(f); }));
-                if (!ts.arrayStructurallyIsEqualTo(currentRootFiles, newRootFiles)) {
+                if (!ts.arrayIsEqualTo(currentRootFiles && currentRootFiles.sort(), newRootFiles && newRootFiles.sort())) {
                     this.updateConfiguredProject(project);
                     this.updateProjectStructure();
                 }
@@ -42702,8 +43992,8 @@ var ts;
                 var _a = this.configFileToProjectOptions(fileName), succeeded = _a.succeeded, projectOptions = _a.projectOptions, error = _a.error;
                 var rootFilesInTsconfig = projectOptions.files.map(function (f) { return _this.getCanonicalFileName(f); });
                 var openFileRoots = this.openFileRoots.map(function (s) { return _this.getCanonicalFileName(s.fileName); });
-                for (var _i = 0; _i < openFileRoots.length; _i++) {
-                    var openFileRoot = openFileRoots[_i];
+                for (var _i = 0, openFileRoots_1 = openFileRoots; _i < openFileRoots_1.length; _i++) {
+                    var openFileRoot = openFileRoots_1[_i];
                     if (rootFilesInTsconfig.indexOf(openFileRoot) >= 0) {
                         this.reloadProjects();
                         return;
@@ -42827,8 +44117,8 @@ var ts;
                     this.inferredProjects = copyListRemovingItem(project, this.inferredProjects);
                 }
                 var fileNames = project.getFileNames();
-                for (var _b = 0; _b < fileNames.length; _b++) {
-                    var fileName = fileNames[_b];
+                for (var _b = 0, fileNames_1 = fileNames; _b < fileNames_1.length; _b++) {
+                    var fileName = fileNames_1[_b];
                     var info = this.getScriptInfo(fileName);
                     if (info.defaultProject == project) {
                         info.defaultProject = undefined;
@@ -43033,7 +44323,6 @@ var ts;
                         }
                     }
                     if (content !== undefined) {
-                        var indentSize;
                         info = new ScriptInfo(this.host, fileName, content, openedByClient);
                         info.setFormatOptions(this.getFormatCodeOptions());
                         this.filenameToScriptInfo[fileName] = info;
@@ -43182,10 +44471,11 @@ var ts;
                 }
                 else {
                     var parsedCommandLine = ts.parseJsonConfigFileContent(rawConfig.config, this.host, dirPath);
+                    ts.Debug.assert(!!parsedCommandLine.fileNames);
                     if (parsedCommandLine.errors && (parsedCommandLine.errors.length > 0)) {
                         return { succeeded: false, error: { errorMsg: "tsconfig option errors" } };
                     }
-                    else if (parsedCommandLine.fileNames == null) {
+                    else if (parsedCommandLine.fileNames.length === 0) {
                         return { succeeded: false, error: { errorMsg: "no files found" } };
                     }
                     else {
@@ -43237,15 +44527,15 @@ var ts;
                         var newFileNames = projectOptions.files;
                         var fileNamesToRemove = oldFileNames.filter(function (f) { return newFileNames.indexOf(f) < 0; });
                         var fileNamesToAdd = newFileNames.filter(function (f) { return oldFileNames.indexOf(f) < 0; });
-                        for (var _i = 0; _i < fileNamesToRemove.length; _i++) {
-                            var fileName = fileNamesToRemove[_i];
+                        for (var _i = 0, fileNamesToRemove_1 = fileNamesToRemove; _i < fileNamesToRemove_1.length; _i++) {
+                            var fileName = fileNamesToRemove_1[_i];
                             var info = this.getScriptInfo(fileName);
                             if (info) {
                                 project.removeRoot(info);
                             }
                         }
-                        for (var _b = 0; _b < fileNamesToAdd.length; _b++) {
-                            var fileName = fileNamesToAdd[_b];
+                        for (var _b = 0, fileNamesToAdd_1 = fileNamesToAdd; _b < fileNamesToAdd_1.length; _b++) {
+                            var fileName = fileNamesToAdd_1[_b];
                             var info = this.getScriptInfo(fileName);
                             if (!info) {
                                 info = this.openFile(fileName, false);
@@ -43254,11 +44544,15 @@ var ts;
                                 if (info.isOpen) {
                                     if (this.openFileRoots.indexOf(info) >= 0) {
                                         this.openFileRoots = copyListRemovingItem(info, this.openFileRoots);
+                                        if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {
+                                            this.removeProject(info.defaultProject);
+                                        }
                                     }
                                     if (this.openFilesReferenced.indexOf(info) >= 0) {
                                         this.openFilesReferenced = copyListRemovingItem(info, this.openFilesReferenced);
                                     }
                                     this.openFileRootsConfigured.push(info);
+                                    info.defaultProject = project;
                                 }
                             }
                             project.addRoot(info);
@@ -43285,7 +44579,9 @@ var ts;
                     this.setCompilerOptions(opt);
                 }
                 else {
-                    this.setCompilerOptions(ts.getDefaultCompilerOptions());
+                    var defaultOpts = ts.getDefaultCompilerOptions();
+                    defaultOpts.allowNonTsExtensions = true;
+                    this.setCompilerOptions(defaultOpts);
                 }
                 this.languageService = ts.createLanguageService(this.host, this.documentRegistry);
                 this.classifier = ts.createClassifier();
@@ -43301,7 +44597,7 @@ var ts;
             CompilerService.defaultFormatCodeOptions = {
                 IndentSize: 4,
                 TabSize: 4,
-                NewLineCharacter: ts.sys ? ts.sys.newLine : '\n',
+                NewLineCharacter: ts.sys ? ts.sys.newLine : "\n",
                 ConvertTabsToSpaces: true,
                 IndentStyle: ts.IndentStyle.Smart,
                 InsertSpaceAfterCommaDelimiter: true,
@@ -43391,7 +44687,7 @@ var ts;
                     if (len > 1) {
                         var insertedNodes = new Array(len - 1);
                         var startNode = leafNode;
-                        for (var i = 1, len = lines.length; i < len; i++) {
+                        for (var i = 1, len_1 = lines.length; i < len_1; i++) {
                             insertedNodes[i - 1] = new LineLeaf(lines[i]);
                         }
                         var pathIndex = this.startPath.length - 2;
@@ -43759,8 +45055,9 @@ var ts;
                     }
                 }
                 else {
+                    var checkText;
                     if (this.checkEdits) {
-                        var checkText = editFlat(this.getText(0, this.root.charCount()), pos, deleteLength, newText);
+                        checkText = editFlat(this.getText(0, this.root.charCount()), pos, deleteLength, newText);
                     }
                     var walker = new EditWalker();
                     if (pos >= this.root.charCount()) {
@@ -43986,7 +45283,9 @@ var ts;
             LineNode.prototype.childFromLineNumber = function (lineNumber, charOffset) {
                 var child;
                 var relativeLineNumber = lineNumber;
-                for (var i = 0, len = this.children.length; i < len; i++) {
+                var i;
+                var len;
+                for (i = 0, len = this.children.length; i < len; i++) {
                     child = this.children[i];
                     var childLineCount = child.lineCount();
                     if (childLineCount >= relativeLineNumber) {
@@ -44006,7 +45305,9 @@ var ts;
             };
             LineNode.prototype.childFromCharOffset = function (lineNumber, charOffset) {
                 var child;
-                for (var i = 0, len = this.children.length; i < len; i++) {
+                var i;
+                var len;
+                for (i = 0, len = this.children.length; i < len; i++) {
                     child = this.children[i];
                     if (child.charCount() > charOffset) {
                         break;
@@ -44088,7 +45389,7 @@ var ts;
                                 splitNode = splitNodes[splitNodeIndex];
                             }
                         }
-                        for (i = splitNodes.length - 1; i >= 0; i--) {
+                        for (var i = splitNodes.length - 1; i >= 0; i--) {
                             if (splitNodes[i].children.length === 0) {
                                 splitNodes.length--;
                             }
@@ -44098,7 +45399,7 @@ var ts;
                         splitNodes[splitNodes.length] = shiftNode;
                     }
                     this.updateCounts();
-                    for (i = 0; i < splitNodeCount; i++) {
+                    for (var i = 0; i < splitNodeCount; i++) {
                         splitNodes[i].updateCounts();
                     }
                     return splitNodes;
@@ -44148,10 +45449,10 @@ var ts;
 (function (ts) {
     var server;
     (function (server) {
-        var nodeproto = require('_debugger');
-        var readline = require('readline');
-        var path = require('path');
-        var fs = require('fs');
+        var nodeproto = require("_debugger");
+        var readline = require("readline");
+        var path = require("path");
+        var fs = require("fs");
         var rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
@@ -44231,11 +45532,11 @@ var ts;
             };
             IOSession.prototype.listen = function () {
                 var _this = this;
-                rl.on('line', function (input) {
+                rl.on("line", function (input) {
                     var message = input.trim();
                     _this.onMessage(message);
                 });
-                rl.on('close', function () {
+                rl.on("close", function () {
                     _this.exit();
                 });
             };
@@ -44243,7 +45544,7 @@ var ts;
         })(server.Session);
         function parseLoggingEnvironmentString(logEnvStr) {
             var logEnv = {};
-            var args = logEnvStr.split(' ');
+            var args = logEnvStr.split(" ");
             for (var i = 0, len = args.length; i < (len - 1); i += 2) {
                 var option = args[i];
                 var value = args[i + 1];
@@ -44279,8 +45580,26 @@ var ts;
             return new Logger(fileName, detailLevel);
         }
         var logger = createLoggerFromEnv();
+        var pending = [];
+        var canWrite = true;
+        function writeMessage(s) {
+            if (!canWrite) {
+                pending.push(s);
+            }
+            else {
+                canWrite = false;
+                process.stdout.write(new Buffer(s, "utf8"), setCanWriteFlagAndWriteMessageIfNecessary);
+            }
+        }
+        function setCanWriteFlagAndWriteMessageIfNecessary() {
+            canWrite = true;
+            if (pending.length) {
+                writeMessage(pending.shift());
+            }
+        }
+        ts.sys.write = function (s) { return writeMessage(s); };
         var ioSession = new IOSession(ts.sys, logger);
-        process.on('uncaughtException', function (err) {
+        process.on("uncaughtException", function (err) {
             ioSession.logError(err, "unknown");
         });
         ioSession.listen();
@@ -44363,7 +45682,6 @@ var ts;
             var settingsJson = this.shimHost.getCompilationSettings();
             if (settingsJson == null || settingsJson == "") {
                 throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-                return null;
             }
             return JSON.parse(settingsJson);
         };
@@ -44817,7 +46135,7 @@ var ts;
         };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
             return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
-                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()));
+                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true);
                 var convertResult = {
                     referencedFiles: [],
                     importedFiles: [],
@@ -44878,7 +46196,7 @@ var ts;
         TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
             try {
                 if (this.documentRegistry === undefined) {
-                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
                 }
                 var hostAdapter = new LanguageServiceShimHostAdapter(host);
                 var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
@@ -44910,7 +46228,7 @@ var ts;
         };
         TypeScriptServicesFactory.prototype.close = function () {
             this._shims = [];
-            this.documentRegistry = ts.createDocumentRegistry();
+            this.documentRegistry = undefined;
         };
         TypeScriptServicesFactory.prototype.registerShim = function (shim) {
             this._shims.push(shim);
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 5998cd26ad5..32a6dee4623 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -17,19 +17,22 @@ declare namespace ts {
     interface Map<T> {
         [index: string]: T;
     }
+    type Path = string & {
+        __pathBrand: any;
+    };
     interface FileMap<T> {
-        get(fileName: string): T;
-        set(fileName: string, value: T): void;
-        contains(fileName: string): boolean;
-        remove(fileName: string): void;
-        forEachValue(f: (v: T) => void): void;
+        get(fileName: Path): T;
+        set(fileName: Path, value: T): void;
+        contains(fileName: Path): boolean;
+        remove(fileName: Path): void;
+        forEachValue(f: (key: Path, v: T) => void): void;
         clear(): void;
     }
     interface TextRange {
         pos: number;
         end: number;
     }
-    const enum SyntaxKind {
+    enum SyntaxKind {
         Unknown = 0,
         EndOfFileToken = 1,
         SingleLineCommentTrivia = 2,
@@ -327,30 +330,34 @@ declare namespace ts {
         LastBinaryOperator = 68,
         FirstNode = 135,
     }
-    const enum NodeFlags {
-        Export = 1,
-        Ambient = 2,
-        Public = 16,
-        Private = 32,
-        Protected = 64,
-        Static = 128,
-        Abstract = 256,
-        Async = 512,
-        Default = 1024,
-        MultiLine = 2048,
-        Synthetic = 4096,
-        DeclarationFile = 8192,
-        Let = 16384,
-        Const = 32768,
-        OctalLiteral = 65536,
-        Namespace = 131072,
-        ExportContext = 262144,
-        ContainsThis = 524288,
-        Modifier = 2035,
-        AccessibilityModifier = 112,
-        BlockScoped = 49152,
+    enum NodeFlags {
+        None = 0,
+        Export = 2,
+        Ambient = 4,
+        Public = 8,
+        Private = 16,
+        Protected = 32,
+        Static = 64,
+        Abstract = 128,
+        Async = 256,
+        Default = 512,
+        MultiLine = 1024,
+        Synthetic = 2048,
+        DeclarationFile = 4096,
+        Let = 8192,
+        Const = 16384,
+        OctalLiteral = 32768,
+        Namespace = 65536,
+        ExportContext = 131072,
+        ContainsThis = 262144,
+        HasImplicitReturn = 524288,
+        HasExplicitReturn = 1048576,
+        Modifier = 1022,
+        AccessibilityModifier = 56,
+        BlockScoped = 24576,
+        ReachabilityCheckFlags = 1572864,
     }
-    const enum JsxFlags {
+    enum JsxFlags {
         None = 0,
         IntrinsicNamedElement = 1,
         IntrinsicIndexedElement = 2,
@@ -380,6 +387,7 @@ declare namespace ts {
         right: Identifier;
     }
     type EntityName = Identifier | QualifiedName;
+    type PropertyName = Identifier | LiteralExpression | ComputedPropertyName;
     type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern;
     interface Declaration extends Node {
         _declarationBrand: any;
@@ -418,7 +426,7 @@ declare namespace ts {
         initializer?: Expression;
     }
     interface BindingElement extends Declaration {
-        propertyName?: Identifier;
+        propertyName?: PropertyName;
         dotDotDotToken?: Node;
         name: Identifier | BindingPattern;
         initializer?: Expression;
@@ -445,7 +453,7 @@ declare namespace ts {
         objectAssignmentInitializer?: Expression;
     }
     interface VariableLikeDeclaration extends Declaration {
-        propertyName?: Identifier;
+        propertyName?: PropertyName;
         dotDotDotToken?: Node;
         name: DeclarationName;
         questionToken?: Node;
@@ -574,7 +582,7 @@ declare namespace ts {
         asteriskToken?: Node;
         expression?: Expression;
     }
-    interface BinaryExpression extends Expression {
+    interface BinaryExpression extends Expression, Declaration {
         left: Expression;
         operatorToken: Node;
         right: Expression;
@@ -618,7 +626,7 @@ declare namespace ts {
     interface ObjectLiteralExpression extends PrimaryExpression, Declaration {
         properties: NodeArray<ObjectLiteralElement>;
     }
-    interface PropertyAccessExpression extends MemberExpression {
+    interface PropertyAccessExpression extends MemberExpression, Declaration {
         expression: LeftHandSideExpression;
         dotToken: Node;
         name: Identifier;
@@ -930,6 +938,7 @@ declare namespace ts {
         statements: NodeArray<Statement>;
         endOfFileToken: Node;
         fileName: string;
+        path: Path;
         text: string;
         amdDependencies: {
             path: string;
@@ -954,7 +963,7 @@ declare namespace ts {
         getSourceFile(fileName: string): SourceFile;
         getCurrentDirectory(): string;
     }
-    interface ParseConfigHost extends ModuleResolutionHost {
+    interface ParseConfigHost {
         readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
     }
     interface WriteFileCallback {
@@ -1092,7 +1101,7 @@ declare namespace ts {
         trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
         reportInaccessibleThisError(): void;
     }
-    const enum TypeFormatFlags {
+    enum TypeFormatFlags {
         None = 0,
         WriteArrayAsGenericType = 1,
         UseTypeOfFunction = 2,
@@ -1103,7 +1112,7 @@ declare namespace ts {
         InElementType = 64,
         UseFullyQualifiedType = 128,
     }
-    const enum SymbolFormatFlags {
+    enum SymbolFormatFlags {
         None = 0,
         WriteTypeParametersOrArguments = 1,
         UseOnlyExternalAliasing = 2,
@@ -1113,7 +1122,7 @@ declare namespace ts {
         parameterIndex: number;
         type: Type;
     }
-    const enum SymbolFlags {
+    enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
         BlockScopedVariable = 2,
@@ -1190,7 +1199,7 @@ declare namespace ts {
     interface SymbolTable {
         [index: string]: Symbol;
     }
-    const enum TypeFlags {
+    enum TypeFlags {
         Any = 1,
         String = 2,
         Number = 4,
@@ -1212,6 +1221,7 @@ declare namespace ts {
         ObjectLiteral = 524288,
         ESSymbol = 16777216,
         ThisType = 33554432,
+        ObjectLiteralPatternWithComputedProperties = 67108864,
         StringLike = 258,
         NumberLike = 132,
         ObjectType = 80896,
@@ -1261,7 +1271,7 @@ declare namespace ts {
     interface TypeParameter extends Type {
         constraint: Type;
     }
-    const enum SignatureKind {
+    enum SignatureKind {
         Call = 0,
         Construct = 1,
     }
@@ -1271,7 +1281,7 @@ declare namespace ts {
         parameters: Symbol[];
         typePredicate?: TypePredicate;
     }
-    const enum IndexKind {
+    enum IndexKind {
         String = 0,
         Number = 1,
     }
@@ -1279,6 +1289,7 @@ declare namespace ts {
         key: string;
         category: DiagnosticCategory;
         code: number;
+        message: string;
     }
     /**
      * A linked list of formatted diagnostic messages to be used as part of a multiline message.
@@ -1305,7 +1316,7 @@ declare namespace ts {
         Error = 1,
         Message = 2,
     }
-    const enum ModuleResolutionKind {
+    enum ModuleResolutionKind {
         Classic = 1,
         NodeJs = 2,
     }
@@ -1350,9 +1361,14 @@ declare namespace ts {
         experimentalDecorators?: boolean;
         emitDecoratorMetadata?: boolean;
         moduleResolution?: ModuleResolutionKind;
+        allowUnusedLabels?: boolean;
+        allowUnreachableCode?: boolean;
+        noImplicitReturns?: boolean;
+        noFallthroughCasesInSwitch?: boolean;
+        forceConsistentCasingInFileNames?: boolean;
         [option: string]: string | number | boolean;
     }
-    const enum ModuleKind {
+    enum ModuleKind {
         None = 0,
         CommonJS = 1,
         AMD = 2,
@@ -1361,12 +1377,12 @@ declare namespace ts {
         ES6 = 5,
         ES2015 = 5,
     }
-    const enum JsxEmit {
+    enum JsxEmit {
         None = 0,
         Preserve = 1,
         React = 2,
     }
-    const enum NewLineKind {
+    enum NewLineKind {
         CarriageReturnLineFeed = 0,
         LineFeed = 1,
     }
@@ -1374,14 +1390,14 @@ declare namespace ts {
         line: number;
         character: number;
     }
-    const enum ScriptTarget {
+    enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
         ES6 = 2,
         ES2015 = 2,
         Latest = 2,
     }
-    const enum LanguageVariant {
+    enum LanguageVariant {
         Standard = 0,
         JSX = 1,
     }
@@ -1521,11 +1537,9 @@ declare namespace ts {
      */
     function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
-    function arrayStructurallyIsEqualTo<T>(array1: Array<T>, array2: Array<T>): boolean;
 }
 declare namespace ts {
-    function getNodeConstructor(kind: SyntaxKind): new () => Node;
-    function createNode(kind: SyntaxKind): Node;
+    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
     function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
@@ -1564,10 +1578,15 @@ declare namespace ts {
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
+      * @param host Instance of ParseConfigHost used to enumerate files in folder.
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
     function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine;
+    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string): {
+        options: CompilerOptions;
+        errors: Diagnostic[];
+    };
 }
 declare namespace ts {
     /** The version of the language service API */
@@ -1931,7 +1950,7 @@ declare namespace ts {
         outputFiles: OutputFile[];
         emitSkipped: boolean;
     }
-    const enum OutputFileType {
+    enum OutputFileType {
         JavaScript = 0,
         SourceMap = 1,
         Declaration = 2,
@@ -1941,7 +1960,7 @@ declare namespace ts {
         writeByteOrderMark: boolean;
         text: string;
     }
-    const enum EndOfLineState {
+    enum EndOfLineState {
         None = 0,
         InMultiLineCommentTrivia = 1,
         InSingleQuoteStringLiteral = 2,
@@ -2108,8 +2127,11 @@ declare namespace ts {
         static typeAliasName: string;
         static parameterName: string;
         static docCommentTagName: string;
+        static jsxOpenTagName: string;
+        static jsxCloseTagName: string;
+        static jsxSelfClosingTagName: string;
     }
-    const enum ClassificationType {
+    enum ClassificationType {
         comment = 1,
         identifier = 2,
         keyword = 3,
@@ -2128,6 +2150,9 @@ declare namespace ts {
         typeAliasName = 16,
         parameterName = 17,
         docCommentTagName = 18,
+        jsxOpenTagName = 19,
+        jsxCloseTagName = 20,
+        jsxSelfClosingTagName = 21,
     }
     interface DisplayPartsSymbolWriter extends SymbolWriter {
         displayParts(): SymbolDisplayPart[];
@@ -2152,8 +2177,8 @@ declare namespace ts {
     let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string;
-    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean): DocumentRegistry;
-    function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
+    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry;
+    function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo;
     function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService;
     function createClassifier(): Classifier;
     /**
diff --git a/lib/typescript.js b/lib/typescript.js
index 7f9c5c293ad..498ddc37860 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -349,27 +349,31 @@ var ts;
     })(ts.SyntaxKind || (ts.SyntaxKind = {}));
     var SyntaxKind = ts.SyntaxKind;
     (function (NodeFlags) {
-        NodeFlags[NodeFlags["Export"] = 1] = "Export";
-        NodeFlags[NodeFlags["Ambient"] = 2] = "Ambient";
-        NodeFlags[NodeFlags["Public"] = 16] = "Public";
-        NodeFlags[NodeFlags["Private"] = 32] = "Private";
-        NodeFlags[NodeFlags["Protected"] = 64] = "Protected";
-        NodeFlags[NodeFlags["Static"] = 128] = "Static";
-        NodeFlags[NodeFlags["Abstract"] = 256] = "Abstract";
-        NodeFlags[NodeFlags["Async"] = 512] = "Async";
-        NodeFlags[NodeFlags["Default"] = 1024] = "Default";
-        NodeFlags[NodeFlags["MultiLine"] = 2048] = "MultiLine";
-        NodeFlags[NodeFlags["Synthetic"] = 4096] = "Synthetic";
-        NodeFlags[NodeFlags["DeclarationFile"] = 8192] = "DeclarationFile";
-        NodeFlags[NodeFlags["Let"] = 16384] = "Let";
-        NodeFlags[NodeFlags["Const"] = 32768] = "Const";
-        NodeFlags[NodeFlags["OctalLiteral"] = 65536] = "OctalLiteral";
-        NodeFlags[NodeFlags["Namespace"] = 131072] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 262144] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 524288] = "ContainsThis";
-        NodeFlags[NodeFlags["Modifier"] = 2035] = "Modifier";
-        NodeFlags[NodeFlags["AccessibilityModifier"] = 112] = "AccessibilityModifier";
-        NodeFlags[NodeFlags["BlockScoped"] = 49152] = "BlockScoped";
+        NodeFlags[NodeFlags["None"] = 0] = "None";
+        NodeFlags[NodeFlags["Export"] = 2] = "Export";
+        NodeFlags[NodeFlags["Ambient"] = 4] = "Ambient";
+        NodeFlags[NodeFlags["Public"] = 8] = "Public";
+        NodeFlags[NodeFlags["Private"] = 16] = "Private";
+        NodeFlags[NodeFlags["Protected"] = 32] = "Protected";
+        NodeFlags[NodeFlags["Static"] = 64] = "Static";
+        NodeFlags[NodeFlags["Abstract"] = 128] = "Abstract";
+        NodeFlags[NodeFlags["Async"] = 256] = "Async";
+        NodeFlags[NodeFlags["Default"] = 512] = "Default";
+        NodeFlags[NodeFlags["MultiLine"] = 1024] = "MultiLine";
+        NodeFlags[NodeFlags["Synthetic"] = 2048] = "Synthetic";
+        NodeFlags[NodeFlags["DeclarationFile"] = 4096] = "DeclarationFile";
+        NodeFlags[NodeFlags["Let"] = 8192] = "Let";
+        NodeFlags[NodeFlags["Const"] = 16384] = "Const";
+        NodeFlags[NodeFlags["OctalLiteral"] = 32768] = "OctalLiteral";
+        NodeFlags[NodeFlags["Namespace"] = 65536] = "Namespace";
+        NodeFlags[NodeFlags["ExportContext"] = 131072] = "ExportContext";
+        NodeFlags[NodeFlags["ContainsThis"] = 262144] = "ContainsThis";
+        NodeFlags[NodeFlags["HasImplicitReturn"] = 524288] = "HasImplicitReturn";
+        NodeFlags[NodeFlags["HasExplicitReturn"] = 1048576] = "HasExplicitReturn";
+        NodeFlags[NodeFlags["Modifier"] = 1022] = "Modifier";
+        NodeFlags[NodeFlags["AccessibilityModifier"] = 56] = "AccessibilityModifier";
+        NodeFlags[NodeFlags["BlockScoped"] = 24576] = "BlockScoped";
+        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 1572864] = "ReachabilityCheckFlags";
     })(ts.NodeFlags || (ts.NodeFlags = {}));
     var NodeFlags = ts.NodeFlags;
     /* @internal */
@@ -583,6 +587,7 @@ var ts;
         NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 8192] = "EnumValuesComputed";
         NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 16384] = "BlockScopedBindingInLoop";
         NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
+        NodeCheckFlags[NodeCheckFlags["LoopWithBlockScopedBindingCapturedInFunction"] = 65536] = "LoopWithBlockScopedBindingCapturedInFunction";
     })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
     var NodeCheckFlags = ts.NodeCheckFlags;
     (function (TypeFlags) {
@@ -617,6 +622,7 @@ var ts;
         TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType";
         TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol";
         TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType";
+        TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties";
         /* @internal */
         TypeFlags[TypeFlags["Intrinsic"] = 16777343] = "Intrinsic";
         /* @internal */
@@ -688,6 +694,12 @@ var ts;
     })(ts.LanguageVariant || (ts.LanguageVariant = {}));
     var LanguageVariant = ts.LanguageVariant;
     /* @internal */
+    (function (DiagnosticStyle) {
+        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
+        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
+    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
+    var DiagnosticStyle = ts.DiagnosticStyle;
+    /* @internal */
     (function (CharacterCodes) {
         CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
         CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
@@ -836,40 +848,50 @@ var ts;
         Ternary[Ternary["True"] = -1] = "True";
     })(ts.Ternary || (ts.Ternary = {}));
     var Ternary = ts.Ternary;
-    function createFileMap(getCanonicalFileName) {
+    function createFileMap(keyMapper) {
         var files = {};
         return {
             get: get,
             set: set,
             contains: contains,
             remove: remove,
-            clear: clear,
-            forEachValue: forEachValueInMap
+            forEachValue: forEachValueInMap,
+            clear: clear
         };
-        function set(fileName, value) {
-            files[normalizeKey(fileName)] = value;
-        }
-        function get(fileName) {
-            return files[normalizeKey(fileName)];
-        }
-        function contains(fileName) {
-            return hasProperty(files, normalizeKey(fileName));
-        }
-        function remove(fileName) {
-            var key = normalizeKey(fileName);
-            delete files[key];
-        }
         function forEachValueInMap(f) {
-            forEachValue(files, f);
+            for (var key in files) {
+                f(key, files[key]);
+            }
         }
-        function normalizeKey(key) {
-            return getCanonicalFileName(normalizeSlashes(key));
+        // path should already be well-formed so it does not need to be normalized
+        function get(path) {
+            return files[toKey(path)];
+        }
+        function set(path, value) {
+            files[toKey(path)] = value;
+        }
+        function contains(path) {
+            return hasProperty(files, toKey(path));
+        }
+        function remove(path) {
+            var key = toKey(path);
+            delete files[key];
         }
         function clear() {
             files = {};
         }
+        function toKey(path) {
+            return keyMapper ? keyMapper(path) : path;
+        }
     }
     ts.createFileMap = createFileMap;
+    function toPath(fileName, basePath, getCanonicalFileName) {
+        var nonCanonicalizedPath = isRootedDiskPath(fileName)
+            ? normalizePath(fileName)
+            : getNormalizedAbsolutePath(fileName, basePath);
+        return getCanonicalFileName(nonCanonicalizedPath);
+    }
+    ts.toPath = toPath;
     (function (Comparison) {
         Comparison[Comparison["LessThan"] = -1] = "LessThan";
         Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
@@ -895,8 +917,8 @@ var ts;
     ts.forEach = forEach;
     function contains(array, value) {
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
+                var v = array_1[_i];
                 if (v === value) {
                     return true;
                 }
@@ -919,8 +941,8 @@ var ts;
     function countWhere(array, predicate) {
         var count = 0;
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+                var v = array_2[_i];
                 if (predicate(v)) {
                     count++;
                 }
@@ -933,8 +955,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_3 = array; _i < array_3.length; _i++) {
+                var item = array_3[_i];
                 if (f(item)) {
                     result.push(item);
                 }
@@ -947,8 +969,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_4 = array; _i < array_4.length; _i++) {
+                var v = array_4[_i];
                 result.push(f(v));
             }
         }
@@ -967,8 +989,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                var item = array_5[_i];
                 if (!contains(result, item)) {
                     result.push(item);
                 }
@@ -979,8 +1001,8 @@ var ts;
     ts.deduplicate = deduplicate;
     function sum(array, prop) {
         var result = 0;
-        for (var _i = 0; _i < array.length; _i++) {
-            var v = array[_i];
+        for (var _i = 0, array_6 = array; _i < array_6.length; _i++) {
+            var v = array_6[_i];
             result += v[prop];
         }
         return result;
@@ -988,8 +1010,8 @@ var ts;
     ts.sum = sum;
     function addRange(to, from) {
         if (to && from) {
-            for (var _i = 0; _i < from.length; _i++) {
-                var v = from[_i];
+            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+                var v = from_1[_i];
                 to.push(v);
             }
         }
@@ -1172,9 +1194,9 @@ var ts;
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key]
+            ? ts.localizedDiagnosticMessages[message.key]
+            : message.message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
@@ -1185,7 +1207,7 @@ var ts;
             Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
             Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         }
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
         }
@@ -1200,7 +1222,7 @@ var ts;
     }
     ts.createFileDiagnostic = createFileDiagnostic;
     function createCompilerDiagnostic(message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
             text = formatStringFromArgs(text, arguments, 1);
         }
@@ -1215,7 +1237,7 @@ var ts;
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
     function chainDiagnosticMessages(details, message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
             text = formatStringFromArgs(text, arguments, 2);
         }
@@ -1339,8 +1361,8 @@ var ts;
     function getNormalizedParts(normalizedSlashedPath, rootLength) {
         var parts = normalizedSlashedPath.substr(rootLength).split(ts.directorySeparator);
         var normalized = [];
-        for (var _i = 0; _i < parts.length; _i++) {
-            var part = parts[_i];
+        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+            var part = parts_1[_i];
             if (part !== ".") {
                 if (part === ".." && normalized.length > 0 && lastOrUndefined(normalized) !== "..") {
                     normalized.pop();
@@ -1509,18 +1531,13 @@ var ts;
      *  List of supported extensions in order of file resolution precedence.
      */
     ts.supportedExtensions = [".ts", ".tsx", ".d.ts"];
-    /**
-     *  List of extensions that will be used to look for external modules.
-     *  This list is kept separate from supportedExtensions to for cases when we'll allow to include .js files in compilation,
-     *  but still would like to load only TypeScript files as modules
-     */
-    ts.moduleFileExtensions = ts.supportedExtensions;
+    ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx");
     function isSupportedSourceFileName(fileName) {
         if (!fileName) {
             return false;
         }
-        for (var _i = 0; _i < ts.supportedExtensions.length; _i++) {
-            var extension = ts.supportedExtensions[_i];
+        for (var _i = 0, supportedExtensions_1 = ts.supportedExtensions; _i < supportedExtensions_1.length; _i++) {
+            var extension = supportedExtensions_1[_i];
             if (fileExtensionIs(fileName, extension)) {
                 return true;
             }
@@ -1530,8 +1547,8 @@ var ts;
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
     var extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
     function removeFileExtension(path) {
-        for (var _i = 0; _i < extensionsToRemove.length; _i++) {
-            var ext = extensionsToRemove[_i];
+        for (var _i = 0, extensionsToRemove_1 = extensionsToRemove; _i < extensionsToRemove_1.length; _i++) {
+            var ext = extensionsToRemove_1[_i];
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
             }
@@ -1565,19 +1582,16 @@ var ts;
     }
     function Signature(checker) {
     }
+    function Node(kind, pos, end) {
+        this.kind = kind;
+        this.pos = pos;
+        this.end = end;
+        this.flags = 0 /* None */;
+        this.parent = undefined;
+    }
     ts.objectAllocator = {
-        getNodeConstructor: function (kind) {
-            function Node() {
-            }
-            Node.prototype = {
-                kind: kind,
-                pos: -1,
-                end: -1,
-                flags: 0,
-                parent: undefined
-            };
-            return Node;
-        },
+        getNodeConstructor: function () { return Node; },
+        getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
@@ -1602,6 +1616,7 @@ var ts;
                 if (verboseDebugInfo) {
                     verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
                 }
+                debugger;
                 throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
             }
         }
@@ -1613,9 +1628,10 @@ var ts;
     })(Debug = ts.Debug || (ts.Debug = {}));
     function copyListRemovingItem(item, list) {
         var copiedList = [];
-        for (var i = 0, len = list.length; i < len; i++) {
-            if (list[i] !== item) {
-                copiedList.push(list[i]);
+        for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
+            var e = list_1[_i];
+            if (e !== item) {
+                copiedList.push(e);
             }
         }
         return copiedList;
@@ -1707,16 +1723,16 @@ var ts;
                 function visitDirectory(path) {
                     var folder = fso.GetFolder(path || ".");
                     var files = getNames(folder.files);
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+                        var current = files_1[_i];
                         var name_1 = ts.combinePaths(path, current);
                         if ((!extension || ts.fileExtensionIs(name_1, extension)) && !ts.contains(exclude, getCanonicalPath(name_1))) {
                             result.push(name_1);
                         }
                     }
                     var subfolders = getNames(folder.subfolders);
-                    for (var _a = 0; _a < subfolders.length; _a++) {
-                        var current = subfolders[_a];
+                    for (var _a = 0, subfolders_1 = subfolders; _a < subfolders_1.length; _a++) {
+                        var current = subfolders_1[_a];
                         var name_2 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_2))) {
                             visitDirectory(name_2);
@@ -1767,6 +1783,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _tty = require("tty");
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
             function createWatchedFileSet(interval, chunkSize) {
@@ -1891,7 +1908,16 @@ var ts;
                 if (writeByteOrderMark) {
                     data = "\uFEFF" + data;
                 }
-                _fs.writeFileSync(fileName, data, "utf8");
+                var fd;
+                try {
+                    fd = _fs.openSync(fileName, "w");
+                    _fs.writeSync(fd, data, undefined, "utf8");
+                }
+                finally {
+                    if (fd !== undefined) {
+                        _fs.closeSync(fd);
+                    }
+                }
             }
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path.toLowerCase() : path;
@@ -1904,8 +1930,8 @@ var ts;
                 function visitDirectory(path) {
                     var files = _fs.readdirSync(path || ".").sort();
                     var directories = [];
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
+                        var current = files_2[_i];
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -1919,8 +1945,8 @@ var ts;
                             }
                         }
                     }
-                    for (var _a = 0; _a < directories.length; _a++) {
-                        var current = directories[_a];
+                    for (var _a = 0, directories_1 = directories; _a < directories_1.length; _a++) {
+                        var current = directories_1[_a];
                         visitDirectory(current);
                     }
                 }
@@ -1930,15 +1956,7 @@ var ts;
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 write: function (s) {
-                    var buffer = new Buffer(s, "utf8");
-                    var offset = 0;
-                    var toWrite = buffer.length;
-                    var written = 0;
-                    // 1 is a standard descriptor for stdout
-                    while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
-                        offset += written;
-                        toWrite -= written;
-                    }
+                    process.stdout.write(s);
                 },
                 readFile: readFile,
                 writeFile: writeFile,
@@ -1959,7 +1977,7 @@ var ts;
                 watchDirectory: function (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)
-                    return _fs.watch(path, { persisten: true, recursive: !!recursive }, function (eventName, relativeFileName) {
+                    return _fs.watch(path, { persistent: true, recursive: !!recursive }, function (eventName, relativeFileName) {
                         // 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")
@@ -2021,624 +2039,634 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An index signature parameter type must be 'string' or 'number'." },
-        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a class element." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used in an ambient context." },
-        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with a class declaration." },
-        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used here." },
-        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a module element." },
-        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a valid async function return type." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An async function or method must have a valid awaitable return type." },
-        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand for 'await' does not have a valid callable 'then' member." },
-        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return expression in async function does not have a valid callable 'then' member." },
-        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression body for async arrow function does not have a valid callable 'then' member." },
-        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum member must have initializer." },
-        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
-        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a namespace." },
-        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In ambient enum declarations member initializer must be constant expression." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression expected." },
-        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum member expected." },
-        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration expected." },
-        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An object member cannot be declared optional." },
-        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A 'yield' expression is only allowed in a generator body." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A destructuring declaration must have an initializer." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An import declaration cannot have modifiers." },
-        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no default export." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
-        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line terminator not permitted before arrow." },
-        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
-        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
-        Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules into 'es6' when targeting 'ES5' or lower." },
-        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators are not valid here." },
-        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
-        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
-        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
-        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A class declaration without the 'default' modifier must have a name" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
-        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Modules are automatically in strict mode." },
-        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
-        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators are only available when targeting ECMAScript 6 or higher." },
-        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators are not allowed in an ambient context." },
-        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An overload signature cannot be declared as a generator." },
-        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "'{0}' tag already specified." },
-        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature '{0}' must have a type predicate." },
-        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot find parameter '{0}'." },
-        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type predicate '{0}' is not assignable to '{1}'." },
-        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' is not in the same position as parameter '{1}'." },
-        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A type predicate is only allowed in return type position for functions and methods." },
-        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference a rest parameter." },
-        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference element '{0}' in a binding pattern." },
-        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An export assignment can only be used in a module." },
-        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An import declaration can only be used in a namespace or module." },
-        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An export declaration can only be used in a module." },
-        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An ambient module declaration is only allowed at the top level in a file." },
-        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A namespace declaration is only allowed in a namespace or module." },
-        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The return type of a property decorator function must be either 'void' or 'any'." },
-        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The return type of a parameter decorator function must be either 'void' or 'any'." },
-        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of class decorator when called as an expression." },
-        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of parameter decorator when called as an expression." },
-        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of property decorator when called as an expression." },
-        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "'abstract' modifier can only appear on a class or method declaration." },
-        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with '{1}' modifier." },
-        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract methods can only appear within an abstract class." },
-        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method '{0}' cannot have an implementation because it is marked abstract." },
-        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in an async function block." },
-        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "'await' expression is only allowed within an async function." },
-        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async functions are only available when targeting ECMAScript 6 and higher." },
-        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "'=' can only be used in an object literal property inside a destructuring assignment." },
-        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
-        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not a module." },
-        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot find module '{0}'." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a module or namespace body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
-        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient modules cannot be nested in other modules or namespaces." },
-        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...of' statement." },
-        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
-        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An iterator must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
-        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
-        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type or a string type." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
-        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
-        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
-        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An interface can only extend an identifier/qualified-name with optional type arguments." },
-        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A class can only implement an identifier/qualified-name with optional type arguments." },
-        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A rest element cannot contain a binding pattern." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own type annotation." },
-        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot find namespace '{0}'." },
-        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No best common type exists among yield expressions." },
-        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A generator cannot have a 'void' type annotation." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own base expression." },
-        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a constructor function type." },
-        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No base constructor has the specified number of type arguments." },
-        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base constructor return type '{0}' is not a class or interface type." },
-        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base constructors must all have the same return type." },
-        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be abstract or not abstract." },
-        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
-        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes containing abstract methods must be marked abstract." },
-        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
-        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All declarations of an abstract method must be consecutive." },
-        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
-        Only_an_ambient_class_can_be_merged_with_an_interface: { code: 2518, category: ts.DiagnosticCategory.Error, key: "Only an ambient class can be merged with an interface." },
-        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
-        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
-        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
-        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "'yield' expressions cannot be used in a parameter initializer." },
-        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "'await' expressions cannot be used in a parameter initializer." },
-        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer provides no value for this binding element and the binding element has no default value." },
-        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A 'this' type is available only in a non-static member of a class or interface." },
-        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
-        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A module cannot have multiple default exports." },
-        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX element attributes type '{0}' must be an object type." },
-        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The return type of a JSX element constructor must return an object type." },
-        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
-        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
-        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' does not have any construct or call signatures." },
-        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' is not a constructor function for JSX elements." },
-        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of JSX spread attribute is not assignable to target property." },
-        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX element class does not support attributes because it does not have a '{0}' property" },
-        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The global type 'JSX.{0}' may not have more than one property" },
-        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot emit namespaced JSX elements in React" },
-        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
-        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
-        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
-        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition: { code: 2655, category: ts.DiagnosticCategory.Error, key: "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: ts.DiagnosticCategory.Error, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported file encoding." },
-        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed to parse file '{0}': {1}." },
-        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could not write file '{0}': {1}" },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher." },
-        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
-        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified without specifying option '{1}'." },
-        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified with option '{1}'." },
-        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A 'tsconfig.json' file is already defined at: '{0}'." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs if any errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es6'" },
-        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax: {0}" },
-        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options" },
-        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file" },
-        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options:" },
-        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND" },
-        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE" },
-        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION" },
-        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es6'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES6: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File '{0}' not found." },
-        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
-        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
-        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
-        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument for '--jsx' must be 'preserve' or 'react'." },
-        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 decorators." },
-        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for emitting type metadata for decorators." },
-        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
-        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes a TypeScript project and creates a tsconfig.json file." },
-        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully created a tsconfig.json file." },
-        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress excess property checks for object literals." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
-        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
-        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "'import ... =' can only be used in a .ts file." },
-        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "'export=' can only be used in a .ts file." },
-        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "'type parameter declarations' can only be used in a .ts file." },
-        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "'implements clauses' can only be used in a .ts file." },
-        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "'interface declarations' can only be used in a .ts file." },
-        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "'module declarations' can only be used in a .ts file." },
-        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "'type aliases' can only be used in a .ts file." },
-        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "'{0}' can only be used in a .ts file." },
-        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "'types' can only be used in a .ts file." },
-        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "'type arguments' can only be used in a .ts file." },
-        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "'parameter modifiers' can only be used in a .ts file." },
-        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "'property declarations' can only be used in a .ts file." },
-        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "'enum declarations' can only be used in a .ts file." },
-        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "'decorators' can only be used in a .ts file." },
-        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
-        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "'class' expressions are not currently supported." },
-        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX attributes must only be assigned a non-empty 'expression'." },
-        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX elements cannot have multiple attributes with the same name." },
-        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." },
-        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX attribute expected." },
-        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." },
-        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A constructor cannot contain a 'super' call when its class extends 'null'" },
-        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
+        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated_string_literal_1002", message: "Unterminated string literal." },
+        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_1003", message: "Identifier expected." },
+        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "_0_expected_1005", message: "'{0}' expected." },
+        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A_file_cannot_have_a_reference_to_itself_1006", message: "A file cannot have a reference to itself." },
+        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing_comma_not_allowed_1009", message: "Trailing comma not allowed." },
+        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "Asterisk_Slash_expected_1010", message: "'*/' expected." },
+        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_1012", message: "Unexpected token." },
+        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_last_in_a_parameter_list_1014", message: "A rest parameter must be last in a parameter list." },
+        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter_cannot_have_question_mark_and_initializer_1015", message: "Parameter cannot have question mark and initializer." },
+        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A_required_parameter_cannot_follow_an_optional_parameter_1016", message: "A required parameter cannot follow an optional parameter." },
+        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An_index_signature_cannot_have_a_rest_parameter_1017", message: "An index signature cannot have a rest parameter." },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018", message: "An index signature parameter cannot have an accessibility modifier." },
+        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_a_question_mark_1019", message: "An index signature parameter cannot have a question mark." },
+        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_initializer_1020", message: "An index signature parameter cannot have an initializer." },
+        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
+        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
+        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
+        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
+        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
+        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_class_element_1031", message: "'{0}' modifier cannot appear on a class element." },
+        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "super_must_be_followed_by_an_argument_list_or_member_access_1034", message: "'super' must be followed by an argument list or member access." },
+        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only_ambient_modules_can_use_quoted_names_1035", message: "Only ambient modules can use quoted names." },
+        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements_are_not_allowed_in_ambient_contexts_1036", message: "Statements are not allowed in ambient contexts." },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038", message: "A 'declare' modifier cannot be used in an already ambient context." },
+        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers_are_not_allowed_in_ambient_contexts_1039", message: "Initializers are not allowed in ambient contexts." },
+        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_in_an_ambient_context_1040", message: "'{0}' modifier cannot be used in an ambient context." },
+        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
+        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
+        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
+        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
+        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
+        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_have_an_initializer_1048", message: "A rest parameter cannot have an initializer." },
+        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_must_have_exactly_one_parameter_1049", message: "A 'set' accessor must have exactly one parameter." },
+        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_an_optional_parameter_1051", message: "A 'set' accessor cannot have an optional parameter." },
+        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
+        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
+        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
+        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
+        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
+        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
+        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return_expression_in_async_function_does_not_have_a_valid_callable_then_member_1059", message: "Return expression in async function does not have a valid callable 'then' member." },
+        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member_1060", message: "Expression body for async arrow function does not have a valid callable 'then' member." },
+        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
+        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
+        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
+        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
+        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_be_declared_in_an_ambient_context_1086", message: "An accessor cannot be declared in an ambient context." },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_constructor_declaration_1089", message: "'{0}' modifier cannot appear on a constructor declaration." },
+        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_parameter_1090", message: "'{0}' modifier cannot appear on a parameter." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091", message: "Only a single variable declaration is allowed in a 'for...in' statement." },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type_parameters_cannot_appear_on_a_constructor_declaration_1092", message: "Type parameters cannot appear on a constructor declaration." },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type_annotation_cannot_appear_on_a_constructor_declaration_1093", message: "Type annotation cannot appear on a constructor declaration." },
+        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_have_type_parameters_1094", message: "An accessor cannot have type parameters." },
+        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_a_return_type_annotation_1095", message: "A 'set' accessor cannot have a return type annotation." },
+        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_exactly_one_parameter_1096", message: "An index signature must have exactly one parameter." },
+        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "_0_list_cannot_be_empty_1097", message: "'{0}' list cannot be empty." },
+        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type_parameter_list_cannot_be_empty_1098", message: "Type parameter list cannot be empty." },
+        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type_argument_list_cannot_be_empty_1099", message: "Type argument list cannot be empty." },
+        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_in_strict_mode_1100", message: "Invalid use of '{0}' in strict mode." },
+        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_strict_mode_1101", message: "'with' statements are not allowed in strict mode." },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "delete_cannot_be_called_on_an_identifier_in_strict_mode_1102", message: "'delete' cannot be called on an identifier in strict mode." },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104", message: "A 'continue' statement can only be used within an enclosing iteration statement." },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105", message: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
+        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump_target_cannot_cross_function_boundary_1107", message: "Jump target cannot cross function boundary." },
+        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A_return_statement_can_only_be_used_within_a_function_body_1108", message: "A 'return' statement can only be used within a function body." },
+        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression_expected_1109", message: "Expression expected." },
+        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type_expected_1110", message: "Type expected." },
+        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A_class_member_cannot_be_declared_optional_1112", message: "A class member cannot be declared optional." },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", message: "A 'default' clause cannot appear more than once in a 'switch' statement." },
+        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate_label_0_1114", message: "Duplicate label '{0}'" },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", message: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116", message: "A 'break' statement can only jump to a label of an enclosing statement." },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117", message: "An object literal cannot have multiple properties with the same name in strict mode." },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118", message: "An object literal cannot have multiple get/set accessors with the same name." },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119", message: "An object literal cannot have property and accessor with the same name." },
+        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_have_modifiers_1120", message: "An export assignment cannot have modifiers." },
+        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_allowed_in_strict_mode_1121", message: "Octal literals are not allowed in strict mode." },
+        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A_tuple_type_element_list_cannot_be_empty_1122", message: "A tuple type element list cannot be empty." },
+        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_list_cannot_be_empty_1123", message: "Variable declaration list cannot be empty." },
+        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit_expected_1124", message: "Digit expected." },
+        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal_digit_expected_1125", message: "Hexadecimal digit expected." },
+        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected_end_of_text_1126", message: "Unexpected end of text." },
+        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid_character_1127", message: "Invalid character." },
+        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration_or_statement_expected_1128", message: "Declaration or statement expected." },
+        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement_expected_1129", message: "Statement expected." },
+        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "case_or_default_expected_1130", message: "'case' or 'default' expected." },
+        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property_or_signature_expected_1131", message: "Property or signature expected." },
+        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum_member_expected_1132", message: "Enum member expected." },
+        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_expected_1134", message: "Variable declaration expected." },
+        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument_expression_expected_1135", message: "Argument expression expected." },
+        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property_assignment_expected_1136", message: "Property assignment expected." },
+        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression_or_comma_expected_1137", message: "Expression or comma expected." },
+        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter_declaration_expected_1138", message: "Parameter declaration expected." },
+        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type_parameter_declaration_expected_1139", message: "Type parameter declaration expected." },
+        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type_argument_expected_1140", message: "Type argument expected." },
+        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
+        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
+        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
+        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
+        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
+        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_1148", message: "Cannot compile modules unless the '--module' flag is provided." },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
+        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
+        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "const_declarations_can_only_be_declared_inside_a_block_1156", message: "'const' declarations can only be declared inside a block." },
+        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "let_declarations_can_only_be_declared_inside_a_block_1157", message: "'let' declarations can only be declared inside a block." },
+        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated_template_literal_1160", message: "Unterminated template literal." },
+        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated_regular_expression_literal_1161", message: "Unterminated regular expression literal." },
+        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An_object_member_cannot_be_declared_optional_1162", message: "An object member cannot be declared optional." },
+        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A_yield_expression_is_only_allowed_in_a_generator_body_1163", message: "A 'yield' expression is only allowed in a generator body." },
+        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed_property_names_are_not_allowed_in_enums_1164", message: "Computed property names are not allowed in enums." },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol_1165", message: "A computed property name in an ambient context must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol_1166", message: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol_1168", message: "A computed property name in a method overload must directly refer to a built-in symbol." },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol_1169", message: "A computed property name in an interface must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol_1170", message: "A computed property name in a type literal must directly refer to a built-in symbol." },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A_comma_expression_is_not_allowed_in_a_computed_property_name_1171", message: "A comma expression is not allowed in a computed property name." },
+        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "extends_clause_already_seen_1172", message: "'extends' clause already seen." },
+        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "extends_clause_must_precede_implements_clause_1173", message: "'extends' clause must precede 'implements' clause." },
+        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes_can_only_extend_a_single_class_1174", message: "Classes can only extend a single class." },
+        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "implements_clause_already_seen_1175", message: "'implements' clause already seen." },
+        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface_declaration_cannot_have_implements_clause_1176", message: "Interface declaration cannot have 'implements' clause." },
+        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary_digit_expected_1177", message: "Binary digit expected." },
+        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal_digit_expected_1178", message: "Octal digit expected." },
+        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_expected_1179", message: "Unexpected token. '{' expected." },
+        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property_destructuring_pattern_expected_1180", message: "Property destructuring pattern expected." },
+        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array_element_destructuring_pattern_expected_1181", message: "Array element destructuring pattern expected." },
+        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A_destructuring_declaration_must_have_an_initializer_1182", message: "A destructuring declaration must have an initializer." },
+        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An_implementation_cannot_be_declared_in_ambient_contexts_1183", message: "An implementation cannot be declared in ambient contexts." },
+        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers_cannot_appear_here_1184", message: "Modifiers cannot appear here." },
+        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge_conflict_marker_encountered_1185", message: "Merge conflict marker encountered." },
+        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_have_an_initializer_1186", message: "A rest element cannot have an initializer." },
+        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_may_not_be_a_binding_pattern_1187", message: "A parameter property may not be a binding pattern." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188", message: "Only a single variable declaration is allowed in a 'for...of' statement." },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189", message: "The variable declaration of a 'for...in' statement cannot have an initializer." },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190", message: "The variable declaration of a 'for...of' statement cannot have an initializer." },
+        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_cannot_have_modifiers_1191", message: "An import declaration cannot have modifiers." },
+        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
+        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
+        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
+        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
+        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
+        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
+        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated_Unicode_escape_sequence_1199", message: "Unterminated Unicode escape sequence." },
+        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line_terminator_not_permitted_before_arrow_1200", message: "Line terminator not permitted before arrow." },
+        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk__1202", message: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
+        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_o_1203", message: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
+        Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower_1204", message: "Cannot compile modules into 'es2015' when targeting 'ES5' or lower." },
+        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators_are_not_valid_here_1206", message: "Decorators are not valid here." },
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", message: "Decorators cannot be applied to multiple get/set accessors of the same name." },
+        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", message: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
+        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", message: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
+        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", message: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
+        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", message: "A class declaration without the 'default' modifier must have a name" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", message: "Identifier expected. '{0}' is a reserved word in strict mode" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213", message: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
+        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
+        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
+        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
+        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
+        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "_0_tag_already_specified_1223", message: "'{0}' tag already specified." },
+        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature_0_must_have_a_type_predicate_1224", message: "Signature '{0}' must have a type predicate." },
+        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
+        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
+        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
+        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
+        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
+        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
+        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", message: "An import declaration can only be used in a namespace or module." },
+        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_can_only_be_used_in_a_module_1233", message: "An export declaration can only be used in a module." },
+        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", message: "An ambient module declaration is only allowed at the top level in a file." },
+        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235", message: "A namespace declaration is only allowed in a namespace or module." },
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236", message: "The return type of a property decorator function must be either 'void' or 'any'." },
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237", message: "The return type of a parameter decorator function must be either 'void' or 'any'." },
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238", message: "Unable to resolve signature of class decorator when called as an expression." },
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
+        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
+        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
+        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
+        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_an_async_function_block_1300", message: "'with' statements are not allowed in an async function block." },
+        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "await_expression_is_only_allowed_within_an_async_function_1308", message: "'await' expression is only allowed within an async function." },
+        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
+        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
+        The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
+        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
+        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular_definition_of_import_alias_0_2303", message: "Circular definition of import alias '{0}'." },
+        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_2304", message: "Cannot find name '{0}'." },
+        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_exported_member_1_2305", message: "Module '{0}' has no exported member '{1}'." },
+        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_a_module_2306", message: "File '{0}' is not a module." },
+        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot_find_module_0_2307", message: "Cannot find module '{0}'." },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", message: "An export assignment cannot be used in a module with other exported elements." },
+        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type_0_recursively_references_itself_as_a_base_type_2310", message: "Type '{0}' recursively references itself as a base type." },
+        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_extend_another_class_2311", message: "A class may only extend another class." },
+        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An_interface_may_only_extend_a_class_or_another_interface_2312", message: "An interface may only extend a class or another interface." },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list_2313", message: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
+        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic_type_0_requires_1_type_argument_s_2314", message: "Generic type '{0}' requires {1} type argument(s)." },
+        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_generic_2315", message: "Type '{0}' is not generic." },
+        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_be_a_class_or_interface_type_2316", message: "Global type '{0}' must be a class or interface type." },
+        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_have_1_type_parameter_s_2317", message: "Global type '{0}' must have {1} type parameter(s)." },
+        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_type_0_2318", message: "Cannot find global type '{0}'." },
+        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named_property_0_of_types_1_and_2_are_not_identical_2319", message: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface_0_cannot_simultaneously_extend_types_1_and_2_2320", message: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
+        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive_stack_depth_comparing_types_0_and_1_2321", message: "Excessive stack depth comparing types '{0}' and '{1}'." },
+        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_2322", message: "Type '{0}' is not assignable to type '{1}'." },
+        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property_0_is_missing_in_type_1_2324", message: "Property '{0}' is missing in type '{1}'." },
+        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_in_type_1_but_not_in_type_2_2325", message: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
+        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types_of_property_0_are_incompatible_2326", message: "Types of property '{0}' are incompatible." },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property_0_is_optional_in_type_1_but_required_in_type_2_2327", message: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
+        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types_of_parameters_0_and_1_are_incompatible_2328", message: "Types of parameters '{0}' and '{1}' are incompatible." },
+        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index_signature_is_missing_in_type_0_2329", message: "Index signature is missing in type '{0}'." },
+        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index_signatures_are_incompatible_2330", message: "Index signatures are incompatible." },
+        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_module_or_namespace_body_2331", message: "'this' cannot be referenced in a module or namespace body." },
+        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_current_location_2332", message: "'this' cannot be referenced in current location." },
+        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_constructor_arguments_2333", message: "'this' cannot be referenced in constructor arguments." },
+        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_static_property_initializer_2334", message: "'this' cannot be referenced in a static property initializer." },
+        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "super_can_only_be_referenced_in_a_derived_class_2335", message: "'super' can only be referenced in a derived class." },
+        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_constructor_arguments_2336", message: "'super' cannot be referenced in constructor arguments." },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337", message: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338", message: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
+        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_type_1_2339", message: "Property '{0}' does not exist on type '{1}'." },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340", message: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
+        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_and_only_accessible_within_class_1_2341", message: "Property '{0}' is private and only accessible within class '{1}'." },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342", message: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
+        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type_0_does_not_satisfy_the_constraint_1_2344", message: "Type '{0}' does not satisfy the constraint '{1}'." },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", message: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied_parameters_do_not_match_any_signature_of_call_target_2346", message: "Supplied parameters do not match any signature of call target." },
+        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped_function_calls_may_not_accept_type_arguments_2347", message: "Untyped function calls may not accept type arguments." },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", message: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
+        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
+        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
+        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371", message: "A parameter initializer is only allowed in a function or constructor implementation." },
+        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter_0_cannot_be_referenced_in_its_initializer_2372", message: "Parameter '{0}' cannot be referenced in its initializer." },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373", message: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
+        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate_string_index_signature_2374", message: "Duplicate string index signature." },
+        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate_number_index_signature_2375", message: "Duplicate number index signature." },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", message: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
+        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors_for_derived_classes_must_contain_a_super_call_2377", message: "Constructors for derived classes must contain a 'super' call." },
+        A_get_accessor_must_return_a_value: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_must_return_a_value_2378", message: "A 'get' accessor must return a value." },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", message: "Getter and setter accessors do not agree in visibility." },
+        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
+        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
+        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
+        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
+        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_be_static_2387", message: "Function overload must be static." },
+        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_not_be_static_2388", message: "Function overload must not be static." },
+        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function_implementation_name_must_be_0_2389", message: "Function implementation name must be '{0}'." },
+        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor_implementation_is_missing_2390", message: "Constructor implementation is missing." },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", message: "Function implementation is missing or not immediately following the declaration." },
+        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple_constructor_implementations_are_not_allowed_2392", message: "Multiple constructor implementations are not allowed." },
+        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate_function_implementation_2393", message: "Duplicate function implementation." },
+        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload_signature_is_not_compatible_with_function_implementation_2394", message: "Overload signature is not compatible with function implementation." },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", message: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", message: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", message: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", message: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", message: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402", message: "Expression resolves to '_super' that compiler uses to capture base class reference." },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
+        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
+        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All_symbols_within_a_with_block_will_be_resolved_to_any_2410", message: "All symbols within a 'with' block will be resolved to 'any'." },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411", message: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412", message: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413", message: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
+        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
+        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
+        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
+        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
+        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
+        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
+        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433", message: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
+        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434", message: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
+        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435", message: "Ambient modules cannot be nested in other modules or namespaces." },
+        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient_module_declaration_cannot_specify_relative_module_name_2436", message: "Ambient module declaration cannot specify relative module name." },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437", message: "Module '{0}' is hidden by a local declaration with the same name" },
+        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import_name_cannot_be_0_2438", message: "Import name cannot be '{0}'" },
+        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439", message: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
+        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import_declaration_conflicts_with_local_declaration_of_0_2440", message: "Import declaration conflicts with local declaration of '{0}'" },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
+        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types_have_separate_declarations_of_a_private_property_0_2442", message: "Types have separate declarations of a private property '{0}'." },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", message: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", message: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", message: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
+        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
+        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
+        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
+        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
+        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An_AMD_module_cannot_have_multiple_name_assignments_2458", message: "An AMD module cannot have multiple name assignments." },
+        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
+        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
+        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
+        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
+        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_a_computed_property_name_2466", message: "'super' cannot be referenced in a computed property name." },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467", message: "A computed property name cannot reference a type parameter from its containing type." },
+        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_value_0_2468", message: "Cannot find global value '{0}'." },
+        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The_0_operator_cannot_be_applied_to_type_symbol_2469", message: "The '{0}' operator cannot be applied to type 'symbol'." },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470", message: "'Symbol' reference does not refer to the global Symbol constructor object." },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471", message: "A computed property name of the form '{0}' must be of type 'symbol'." },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472", message: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
+        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum_declarations_must_all_be_const_or_non_const_2473", message: "Enum declarations must all be const or non-const." },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In_const_enum_declarations_member_initializer_must_be_constant_expression_2474", message: "In 'const' enum declarations member initializer must be constant expression." },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475", message: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476", message: "A const enum member can only be accessed using a string literal." },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477", message: "'const' enum member initializer was evaluated to a non-finite value." },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478", message: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
+        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_const_enum_1_2479", message: "Property '{0}' does not exist on 'const' enum '{1}'." },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480", message: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
+        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
+        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", message: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
+        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_identifier_0_in_catch_clause_2492", message: "Cannot redeclare identifier '{0}' in catch clause" },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2_2493", message: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494", message: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
+        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_or_a_string_type_2495", message: "Type '{0}' is not an array type or a string type." },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496", message: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
+        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct_2497", message: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
+        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498", message: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499", message: "An interface can only extend an identifier/qualified-name with optional type arguments." },
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500", message: "A class can only implement an identifier/qualified-name with optional type arguments." },
+        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_contain_a_binding_pattern_2501", message: "A rest element cannot contain a binding pattern." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502", message: "'{0}' is referenced directly or indirectly in its own type annotation." },
+        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot_find_namespace_0_2503", message: "Cannot find namespace '{0}'." },
+        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_yield_expressions_2504", message: "No best common type exists among yield expressions." },
+        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A_generator_cannot_have_a_void_type_annotation_2505", message: "A generator cannot have a 'void' type annotation." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506", message: "'{0}' is referenced directly or indirectly in its own base expression." },
+        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_constructor_function_type_2507", message: "Type '{0}' is not a constructor function type." },
+        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No_base_constructor_has_the_specified_number_of_type_arguments_2508", message: "No base constructor has the specified number of type arguments." },
+        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
+        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
+        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
+        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
+        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
+        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
+        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_abstract_method_must_be_consecutive_2516", message: "All declarations of an abstract method must be consecutive." },
+        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", message: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
+        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520", message: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
+        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521", message: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
+        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_2522", message: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
+        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523", message: "'yield' expressions cannot be used in a parameter initializer." },
+        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "await_expressions_cannot_be_used_in_a_parameter_initializer_2524", message: "'await' expressions cannot be used in a parameter initializer." },
+        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525", message: "Initializer provides no value for this binding element and the binding element has no default value." },
+        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
+        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
+        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_must_be_an_object_type_2600", message: "JSX element attributes type '{0}' must be an object type." },
+        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
+        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
+        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property_0_in_type_1_is_not_assignable_to_type_2_2603", message: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
+        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604", message: "JSX element type '{0}' does not have any construct or call signatures." },
+        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605", message: "JSX element type '{0}' is not a constructor function for JSX elements." },
+        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606", message: "Property '{0}' of JSX spread attribute is not assignable to target property." },
+        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607", message: "JSX element class does not support attributes because it does not have a '{0}' property" },
+        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The_global_type_JSX_0_may_not_have_more_than_one_property_2608", message: "The global type 'JSX.{0}' may not have more than one property" },
+        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot_emit_namespaced_JSX_elements_in_React_2650", message: "Cannot emit namespaced JSX elements in React" },
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", message: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
+        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", message: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
+        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653", message: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
+        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654", message: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
+        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656", message: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
+        JSX_expressions_must_have_one_parent_element: { code: 2657, category: ts.DiagnosticCategory.Error, key: "JSX_expressions_must_have_one_parent_element_2657", message: "JSX expressions must have one parent element" },
+        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006", message: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008", message: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010", message: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012", message: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014", message: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", message: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", message: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", message: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", message: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", message: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", message: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
+        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_private_name_1_4025", message: "Exported variable '{0}' has or is using private name '{1}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026", message: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027", message: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028", message: "Public static property '{0}' of exported class has or is using private name '{1}'." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029", message: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030", message: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031", message: "Public property '{0}' of exported class has or is using private name '{1}'." },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032", message: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033", message: "Property '{0}' of exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_4034", message: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1_4035", message: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_4036", message: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1_4037", message: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_externa_4038", message: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_4039", message: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0_4040", message: "Return type of public static property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_modul_4041", message: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_4042", message: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0_4043", message: "Return type of public property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044", message: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045", message: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046", message: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047", message: "Return type of call signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048", message: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049", message: "Return type of index signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050", message: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051", message: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052", message: "Return type of public static method from exported class has or is using private name '{0}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053", message: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054", message: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055", message: "Return type of public method from exported class has or is using private name '{0}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056", message: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057", message: "Return type of method from exported interface has or is using private name '{0}'." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058", message: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059", message: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_private_name_0_4060", message: "Return type of exported function has or is using private name '{0}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063", message: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064", message: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065", message: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066", message: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067", message: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070", message: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073", message: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074", message: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075", message: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076", message: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077", message: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
+        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
+        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
+        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
+        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported_file_encoding_5013", message: "Unsupported file encoding." },
+        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed_to_parse_file_0_Colon_1_5014", message: "Failed to parse file '{0}': {1}." },
+        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown_compiler_option_0_5023", message: "Unknown compiler option '{0}'." },
+        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_requires_a_value_of_type_1_5024", message: "Compiler option '{0}' requires a value of type {1}." },
+        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could_not_write_file_0_Colon_1_5033", message: "Could not write file '{0}': {1}" },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042", message: "Option 'project' cannot be mixed with source files on a command line." },
+        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047", message: "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher." },
+        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_prov_5051", message: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
+        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_without_specifying_option_1_5052", message: "Option '{0}' cannot be specified without specifying option '{1}'." },
+        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_with_option_1_5053", message: "Option '{0}' cannot be specified with option '{1}'." },
+        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054", message: "A 'tsconfig.json' file is already defined at: '{0}'." },
+        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
+        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
+        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
+        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
+        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_if_any_errors_were_reported_6008", message: "Do not emit outputs if any errors were reported." },
+        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
+        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
+        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
+        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
+        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile_the_project_in_the_given_directory_6020", message: "Compile the project in the given directory." },
+        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax_Colon_0_6023", message: "Syntax: {0}" },
+        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options_6024", message: "options" },
+        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file_6025", message: "file" },
+        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples_Colon_0_6026", message: "Examples: {0}" },
+        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options_Colon_6027", message: "Options:" },
+        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version_0_6029", message: "Version {0}" },
+        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert_command_line_options_and_files_from_a_file_6030", message: "Insert command line options and files from a file." },
+        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File_change_detected_Starting_incremental_compilation_6032", message: "File change detected. Starting incremental compilation..." },
+        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND_6034", message: "KIND" },
+        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE_6035", message: "FILE" },
+        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION_6036", message: "VERSION" },
+        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION_6037", message: "LOCATION" },
+        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY_6038", message: "DIRECTORY" },
+        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation_complete_Watching_for_file_changes_6042", message: "Compilation complete. Watching for file changes." },
+        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
+        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
+        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
+        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
+        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
+        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
+        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
+        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted_locale_file_0_6051", message: "Corrupted locale file {0}." },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052", message: "Raise error on expressions and declarations with an implied 'any' type." },
+        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File_0_not_found_6053", message: "File '{0}' not found." },
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
+        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
+        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
+        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
+        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
+        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
+        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
+        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
+        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
+        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
+        Stylize_errors_and_messages_using_color_and_context_experimental: { code: 6073, category: ts.DiagnosticCategory.Message, key: "Stylize_errors_and_messages_using_color_and_context_experimental_6073", message: "Stylize errors and messages using color and context. (experimental)" },
+        Do_not_report_errors_on_unused_labels: { code: 6074, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unused_labels_6074", message: "Do not report errors on unused labels." },
+        Report_error_when_not_all_code_paths_in_function_return_a_value: { code: 6075, category: ts.DiagnosticCategory.Message, key: "Report_error_when_not_all_code_paths_in_function_return_a_value_6075", message: "Report error when not all code paths in function return a value." },
+        Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
+        Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
+        Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
+        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
+        Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
+        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
+        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
+        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009", message: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010", message: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation_7016", message: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
+        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
+        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", message: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", message: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", message: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", message: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
+        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", message: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
+        Unreachable_code_detected: { code: 7027, category: ts.DiagnosticCategory.Error, key: "Unreachable_code_detected_7027", message: "Unreachable code detected." },
+        Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
+        Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
+        Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
+        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
+        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "export_can_only_be_used_in_a_ts_file_8003", message: "'export=' can only be used in a .ts file." },
+        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "type_parameter_declarations_can_only_be_used_in_a_ts_file_8004", message: "'type parameter declarations' can only be used in a .ts file." },
+        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "implements_clauses_can_only_be_used_in_a_ts_file_8005", message: "'implements clauses' can only be used in a .ts file." },
+        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "interface_declarations_can_only_be_used_in_a_ts_file_8006", message: "'interface declarations' can only be used in a .ts file." },
+        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "module_declarations_can_only_be_used_in_a_ts_file_8007", message: "'module declarations' can only be used in a .ts file." },
+        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "type_aliases_can_only_be_used_in_a_ts_file_8008", message: "'type aliases' can only be used in a .ts file." },
+        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "_0_can_only_be_used_in_a_ts_file_8009", message: "'{0}' can only be used in a .ts file." },
+        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "types_can_only_be_used_in_a_ts_file_8010", message: "'types' can only be used in a .ts file." },
+        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "type_arguments_can_only_be_used_in_a_ts_file_8011", message: "'type arguments' can only be used in a .ts file." },
+        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "parameter_modifiers_can_only_be_used_in_a_ts_file_8012", message: "'parameter modifiers' can only be used in a .ts file." },
+        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
+        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
+        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
+        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
+        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
+        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
+        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", message: "JSX elements cannot have multiple attributes with the same name." },
+        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected_corresponding_JSX_closing_tag_for_0_17002", message: "Expected corresponding JSX closing tag for '{0}'." },
+        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX_attribute_expected_17003", message: "JSX attribute expected." },
+        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004", message: "Cannot use JSX unless the '--jsx' flag is provided." },
+        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
+        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
+        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
     };
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
@@ -3150,7 +3178,7 @@ var ts;
     function getCommentRanges(text, pos, trailing) {
         var result;
         var collecting = trailing || pos === 0;
-        while (true) {
+        while (pos < text.length) {
             var ch = text.charCodeAt(pos);
             switch (ch) {
                 case 13 /* carriageReturn */:
@@ -3219,6 +3247,7 @@ var ts;
             }
             return result;
         }
+        return result;
     }
     function getLeadingCommentRanges(text, pos) {
         return getCommentRanges(text, pos, /*trailing*/ false);
@@ -3320,7 +3349,7 @@ var ts;
                     error(ts.Diagnostics.Digit_expected);
                 }
             }
-            return +(text.substring(start, end));
+            return "" + +(text.substring(start, end));
         }
         function scanOctalDigits() {
             var start = pos;
@@ -3747,7 +3776,7 @@ var ts;
                         return pos++, token = 36 /* MinusToken */;
                     case 46 /* dot */:
                         if (isDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = "" + scanNumber();
+                            tokenValue = scanNumber();
                             return token = 8 /* NumericLiteral */;
                         }
                         if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) {
@@ -3850,7 +3879,7 @@ var ts;
                     case 55 /* _7 */:
                     case 56 /* _8 */:
                     case 57 /* _9 */:
-                        tokenValue = "" + scanNumber();
+                        tokenValue = scanNumber();
                         return token = 8 /* NumericLiteral */;
                     case 58 /* colon */:
                         return pos++, token = 54 /* ColonToken */;
@@ -4154,971 +4183,6 @@ var ts;
     }
     ts.createScanner = createScanner;
 })(ts || (ts = {}));
-/// <reference path="parser.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    ts.bindTime = 0;
-    (function (ModuleInstanceState) {
-        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
-        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
-        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
-    function getModuleInstanceState(node) {
-        // A module is uninstantiated if it contains only
-        // 1. interface declarations, type alias declarations
-        if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) {
-            return 0 /* NonInstantiated */;
-        }
-        else if (ts.isConstEnumDeclaration(node)) {
-            return 2 /* ConstEnumOnly */;
-        }
-        else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 1 /* Export */)) {
-            return 0 /* NonInstantiated */;
-        }
-        else if (node.kind === 219 /* ModuleBlock */) {
-            var state = 0 /* NonInstantiated */;
-            ts.forEachChild(node, function (n) {
-                switch (getModuleInstanceState(n)) {
-                    case 0 /* NonInstantiated */:
-                        // child is non-instantiated - continue searching
-                        return false;
-                    case 2 /* ConstEnumOnly */:
-                        // child is const enum only - record state and continue searching
-                        state = 2 /* ConstEnumOnly */;
-                        return false;
-                    case 1 /* Instantiated */:
-                        // child is instantiated - record state and stop
-                        state = 1 /* Instantiated */;
-                        return true;
-                }
-            });
-            return state;
-        }
-        else if (node.kind === 218 /* ModuleDeclaration */) {
-            return getModuleInstanceState(node.body);
-        }
-        else {
-            return 1 /* Instantiated */;
-        }
-    }
-    ts.getModuleInstanceState = getModuleInstanceState;
-    var ContainerFlags;
-    (function (ContainerFlags) {
-        // The current node is not a container, and no container manipulation should happen before
-        // recursing into it.
-        ContainerFlags[ContainerFlags["None"] = 0] = "None";
-        // The current node is a container.  It should be set as the current container (and block-
-        // container) before recursing into it.  The current node does not have locals.  Examples:
-        //
-        //      Classes, ObjectLiterals, TypeLiterals, Interfaces...
-        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
-        // The current node is a block-scoped-container.  It should be set as the current block-
-        // container before recursing into it.  Examples:
-        //
-        //      Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements...
-        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
-        ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals";
-        // If the current node is a container that also container that also contains locals.  Examples:
-        //
-        //      Functions, Methods, Modules, Source-files.
-        ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals";
-    })(ContainerFlags || (ContainerFlags = {}));
-    function bindSourceFile(file) {
-        var start = new Date().getTime();
-        bindSourceFileWorker(file);
-        ts.bindTime += new Date().getTime() - start;
-    }
-    ts.bindSourceFile = bindSourceFile;
-    function bindSourceFileWorker(file) {
-        var parent;
-        var container;
-        var blockScopeContainer;
-        var lastContainer;
-        var seenThisKeyword;
-        // If this file is an external module, then it is automatically in strict-mode according to
-        // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
-        // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
-        var inStrictMode = !!file.externalModuleIndicator;
-        var symbolCount = 0;
-        var Symbol = ts.objectAllocator.getSymbolConstructor();
-        var classifiableNames = {};
-        if (!file.locals) {
-            bind(file);
-            file.symbolCount = symbolCount;
-            file.classifiableNames = classifiableNames;
-        }
-        return;
-        function createSymbol(flags, name) {
-            symbolCount++;
-            return new Symbol(flags, name);
-        }
-        function addDeclarationToSymbol(symbol, node, symbolFlags) {
-            symbol.flags |= symbolFlags;
-            node.symbol = symbol;
-            if (!symbol.declarations) {
-                symbol.declarations = [];
-            }
-            symbol.declarations.push(node);
-            if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) {
-                symbol.exports = {};
-            }
-            if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) {
-                symbol.members = {};
-            }
-            if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) {
-                symbol.valueDeclaration = node;
-            }
-        }
-        // Should not be called on a declaration with a computed property name,
-        // unless it is a well known Symbol.
-        function getDeclarationName(node) {
-            if (node.name) {
-                if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
-                    return "\"" + node.name.text + "\"";
-                }
-                if (node.name.kind === 136 /* ComputedPropertyName */) {
-                    var nameExpression = node.name.expression;
-                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
-                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
-                }
-                return node.name.text;
-            }
-            switch (node.kind) {
-                case 144 /* Constructor */:
-                    return "__constructor";
-                case 152 /* FunctionType */:
-                case 147 /* CallSignature */:
-                    return "__call";
-                case 153 /* ConstructorType */:
-                case 148 /* ConstructSignature */:
-                    return "__new";
-                case 149 /* IndexSignature */:
-                    return "__index";
-                case 228 /* ExportDeclaration */:
-                    return "__export";
-                case 227 /* ExportAssignment */:
-                    return node.isExportEquals ? "export=" : "default";
-                case 213 /* FunctionDeclaration */:
-                case 214 /* ClassDeclaration */:
-                    return node.flags & 1024 /* Default */ ? "default" : undefined;
-            }
-        }
-        function getDisplayName(node) {
-            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
-        }
-        /**
-         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
-         * @param symbolTable - The symbol table which node will be added to.
-         * @param parent - node's parent declaration.
-         * @param node - The declaration to be added to the symbol table
-         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
-         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations.
-         */
-        function declareSymbol(symbolTable, parent, node, includes, excludes) {
-            ts.Debug.assert(!ts.hasDynamicName(node));
-            var isDefaultExport = node.flags & 1024 /* Default */;
-            // The exported symbol for an export default function/class node is always named "default"
-            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
-            var symbol;
-            if (name !== undefined) {
-                // Check and see if the symbol table already has a symbol with this name.  If not,
-                // create a new symbol with this name and add it to the table.  Note that we don't
-                // give the new symbol any flags *yet*.  This ensures that it will not conflict
-                // with the 'excludes' flags we pass in.
-                //
-                // If we do get an existing symbol, see if it conflicts with the new symbol we're
-                // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
-                // the same symbol table.  If we have a conflict, report the issue on each
-                // declaration we have for this symbol, and then create a new symbol for this
-                // declaration.
-                //
-                // If we created a new symbol, either because we didn't have a symbol with this name
-                // in the symbol table, or we conflicted with an existing symbol, then just add this
-                // node as the sole declaration of the new symbol.
-                //
-                // Otherwise, we'll be merging into a compatible existing symbol (for example when
-                // you have multiple 'vars' with the same name in the same container).  In this case
-                // just add this node into the declarations list of the symbol.
-                symbol = ts.hasProperty(symbolTable, name)
-                    ? symbolTable[name]
-                    : (symbolTable[name] = createSymbol(0 /* None */, name));
-                if (name && (includes & 788448 /* Classifiable */)) {
-                    classifiableNames[name] = name;
-                }
-                if (symbol.flags & excludes) {
-                    if (node.name) {
-                        node.name.parent = node;
-                    }
-                    // Report errors every position with duplicate declaration
-                    // Report errors on previous encountered declarations
-                    var message = symbol.flags & 2 /* BlockScopedVariable */
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        if (declaration.flags & 1024 /* Default */) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
-                        }
-                    });
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
-                    });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
-                    symbol = createSymbol(0 /* None */, name);
-                }
-            }
-            else {
-                symbol = createSymbol(0 /* None */, "__missing");
-            }
-            addDeclarationToSymbol(symbol, node, includes);
-            symbol.parent = parent;
-            return symbol;
-        }
-        function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1 /* Export */;
-            if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 230 /* ExportSpecifier */ || (node.kind === 221 /* ImportEqualsDeclaration */ && hasExportModifier)) {
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-            else {
-                // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue,
-                // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set
-                // on it. There are 2 main reasons:
-                //
-                //   1. We treat locals and exports of the same name as mutually exclusive within a container.
-                //      That means the binder will issue a Duplicate Identifier error if you mix locals and exports
-                //      with the same name in the same container.
-                //      TODO: Make this a more specific error and decouple it from the exclusion logic.
-                //   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 & 262144 /* ExportContext */) {
-                    var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
-                        (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
-                        (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
-                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
-                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                    node.localSymbol = local;
-                    return local;
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-        }
-        // All container nodes are kept on a linked list in declaration order. This list is used by
-        // the getLocalNameOfContainer function in the type checker to validate that the local name
-        // used for a container is unique.
-        function bindChildren(node) {
-            // Before we recurse into a node's chilren, we first save the existing parent, container
-            // and block-container.  Then after we pop out of processing the children, we restore
-            // these saved values.
-            var saveParent = parent;
-            var saveContainer = container;
-            var savedBlockScopeContainer = blockScopeContainer;
-            // This node will now be set as the parent of all of its children as we recurse into them.
-            parent = node;
-            // Depending on what kind of node this is, we may have to adjust the current container
-            // and block-container.   If the current node is a container, then it is automatically
-            // considered the current block-container as well.  Also, for containers that we know
-            // may contain locals, we proactively initialize the .locals field. We do this because
-            // it's highly likely that the .locals will be needed to place some child in (for example,
-            // a parameter, or variable declaration).
-            //
-            // However, we do not proactively create the .locals for block-containers because it's
-            // totally normal and common for block-containers to never actually have a block-scoped
-            // variable in them.  We don't want to end up allocating an object for every 'block' we
-            // run into when most of them won't be necessary.
-            //
-            // Finally, if this is a block-container, then we clear out any existing .locals object
-            // it may contain within it.  This happens in incremental scenarios.  Because we can be
-            // reusing a node from a previous compilation, that node may have had 'locals' created
-            // for it.  We must clear this so we don't accidently move any stale data forward from
-            // a previous compilation.
-            var containerFlags = getContainerFlags(node);
-            if (containerFlags & 1 /* IsContainer */) {
-                container = blockScopeContainer = node;
-                if (containerFlags & 4 /* HasLocals */) {
-                    container.locals = {};
-                }
-                addToContainerChain(container);
-            }
-            else if (containerFlags & 2 /* IsBlockScopedContainer */) {
-                blockScopeContainer = node;
-                blockScopeContainer.locals = undefined;
-            }
-            if (node.kind === 215 /* InterfaceDeclaration */) {
-                seenThisKeyword = false;
-                ts.forEachChild(node, bind);
-                node.flags = seenThisKeyword ? node.flags | 524288 /* ContainsThis */ : node.flags & ~524288 /* ContainsThis */;
-            }
-            else {
-                ts.forEachChild(node, bind);
-            }
-            container = saveContainer;
-            parent = saveParent;
-            blockScopeContainer = savedBlockScopeContainer;
-        }
-        function getContainerFlags(node) {
-            switch (node.kind) {
-                case 186 /* ClassExpression */:
-                case 214 /* ClassDeclaration */:
-                case 215 /* InterfaceDeclaration */:
-                case 217 /* EnumDeclaration */:
-                case 155 /* TypeLiteral */:
-                case 165 /* ObjectLiteralExpression */:
-                    return 1 /* IsContainer */;
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                case 213 /* FunctionDeclaration */:
-                case 144 /* Constructor */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                case 173 /* FunctionExpression */:
-                case 174 /* ArrowFunction */:
-                case 218 /* ModuleDeclaration */:
-                case 248 /* SourceFile */:
-                case 216 /* TypeAliasDeclaration */:
-                    return 5 /* IsContainerWithLocals */;
-                case 244 /* CatchClause */:
-                case 199 /* ForStatement */:
-                case 200 /* ForInStatement */:
-                case 201 /* ForOfStatement */:
-                case 220 /* CaseBlock */:
-                    return 2 /* IsBlockScopedContainer */;
-                case 192 /* Block */:
-                    // do not treat blocks directly inside a function as a block-scoped-container.
-                    // Locals that reside in this block should go to the function locals. Othewise 'x'
-                    // would not appear to be a redeclaration of a block scoped local in the following
-                    // example:
-                    //
-                    //      function foo() {
-                    //          var x;
-                    //          let x;
-                    //      }
-                    //
-                    // If we placed 'var x' into the function locals and 'let x' into the locals of
-                    // the block, then there would be no collision.
-                    //
-                    // By not creating a new block-scoped-container here, we ensure that both 'var x'
-                    // and 'let x' go into the Function-container's locals, and we do get a collision
-                    // conflict.
-                    return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */;
-            }
-            return 0 /* None */;
-        }
-        function addToContainerChain(next) {
-            if (lastContainer) {
-                lastContainer.nextContainer = next;
-            }
-            lastContainer = next;
-        }
-        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
-            // Just call this directly so that the return type of this function stays "void".
-            declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
-        }
-        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
-            switch (container.kind) {
-                // Modules, source files, and classes need specialized handling for how their
-                // members are declared (for example, a member of a class will go into a specific
-                // symbol table depending on if it is static or not). We defer to specialized
-                // handlers to take care of declaring these child members.
-                case 218 /* ModuleDeclaration */:
-                    return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 248 /* SourceFile */:
-                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 186 /* ClassExpression */:
-                case 214 /* ClassDeclaration */:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 217 /* EnumDeclaration */:
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 155 /* TypeLiteral */:
-                case 165 /* ObjectLiteralExpression */:
-                case 215 /* InterfaceDeclaration */:
-                    // Interface/Object-types always have their children added to the 'members' of
-                    // their container. They are only accessible through an instance of their
-                    // container, and are never in scope otherwise (even inside the body of the
-                    // object / type / interface declaring them). An exception is type parameters,
-                    // which are in scope without qualification (similar to 'locals').
-                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                case 144 /* Constructor */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                case 213 /* FunctionDeclaration */:
-                case 173 /* FunctionExpression */:
-                case 174 /* ArrowFunction */:
-                case 216 /* TypeAliasDeclaration */:
-                    // All the children of these container types are never visible through another
-                    // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
-                    // they're only accessed 'lexically' (i.e. from code that exists underneath
-                    // their container in the tree.  To accomplish this, we simply add their declared
-                    // symbol to the 'locals' of the container.  These symbols can then be found as
-                    // the type checker walks up the containers, checking them for matching names.
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 128 /* Static */
-                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
-                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-        }
-        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
-            return ts.isExternalModule(file)
-                ? declareModuleMember(node, symbolFlags, symbolExcludes)
-                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
-        }
-        function isAmbientContext(node) {
-            while (node) {
-                if (node.flags & 2 /* Ambient */) {
-                    return true;
-                }
-                node = node.parent;
-            }
-            return false;
-        }
-        function hasExportDeclarations(node) {
-            var body = node.kind === 248 /* SourceFile */ ? node : node.body;
-            if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function setExportContextFlag(node) {
-            // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
-            // declarations with export modifiers) is an export context in which declarations are implicitly exported.
-            if (isAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 262144 /* ExportContext */;
-            }
-            else {
-                node.flags &= ~262144 /* ExportContext */;
-            }
-        }
-        function bindModuleDeclaration(node) {
-            setExportContextFlag(node);
-            if (node.name.kind === 9 /* StringLiteral */) {
-                declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
-            }
-            else {
-                var state = getModuleInstanceState(node);
-                if (state === 0 /* NonInstantiated */) {
-                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
-                    if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) {
-                        // if module was already merged with some function, class or non-const enum
-                        // treat is a non-const-enum-only
-                        node.symbol.constEnumOnlyModule = false;
-                    }
-                    else {
-                        var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */;
-                        if (node.symbol.constEnumOnlyModule === undefined) {
-                            // non-merged case - use the current state
-                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
-                        }
-                        else {
-                            // merged case: module is const enum only if all its pieces are non-instantiated or const enum
-                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
-                        }
-                    }
-                }
-            }
-        }
-        function bindFunctionOrConstructorType(node) {
-            // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
-            // to the one we would get for: { <...>(...): T }
-            //
-            // We do that by making an anonymous type literal symbol, and then setting the function
-            // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable
-            // from an actual type literal symbol you would have gotten had you used the long form.
-            var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node));
-            addDeclarationToSymbol(symbol, node, 131072 /* Signature */);
-            var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type");
-            addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */);
-            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
-            var _a;
-        }
-        function bindObjectLiteralExpression(node) {
-            var ElementKind;
-            (function (ElementKind) {
-                ElementKind[ElementKind["Property"] = 1] = "Property";
-                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
-            })(ElementKind || (ElementKind = {}));
-            if (inStrictMode) {
-                var seen = {};
-                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (prop.name.kind !== 69 /* Identifier */) {
-                        continue;
-                    }
-                    var identifier = prop.name;
-                    // ECMA-262 11.1.5 Object Initialiser
-                    // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
-                    // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
-                    // IsDataDescriptor(propId.descriptor) is true.
-                    //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
-                    //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
-                    //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
-                    // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */
-                        ? 1 /* Property */
-                        : 2 /* Accessor */;
-                    var existingKind = seen[identifier.text];
-                    if (!existingKind) {
-                        seen[identifier.text] = currentKind;
-                        continue;
-                    }
-                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
-                        var span = ts.getErrorSpanForNode(file, identifier);
-                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
-                    }
-                }
-            }
-            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object");
-        }
-        function bindAnonymousDeclaration(node, symbolFlags, name) {
-            var symbol = createSymbol(symbolFlags, name);
-            addDeclarationToSymbol(symbol, node, symbolFlags);
-        }
-        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
-            switch (blockScopeContainer.kind) {
-                case 218 /* ModuleDeclaration */:
-                    declareModuleMember(node, symbolFlags, symbolExcludes);
-                    break;
-                case 248 /* SourceFile */:
-                    if (ts.isExternalModule(container)) {
-                        declareModuleMember(node, symbolFlags, symbolExcludes);
-                        break;
-                    }
-                // fall through.
-                default:
-                    if (!blockScopeContainer.locals) {
-                        blockScopeContainer.locals = {};
-                        addToContainerChain(blockScopeContainer);
-                    }
-                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function bindBlockScopedVariableDeclaration(node) {
-            bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */);
-        }
-        // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized
-        // check for reserved words used as identifiers in strict mode code.
-        function checkStrictModeIdentifier(node) {
-            if (inStrictMode &&
-                node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 114 /* LastFutureReservedWord */ &&
-                !ts.isIdentifierName(node)) {
-                // Report error only if there are no parse errors in file
-                if (!file.parseDiagnostics.length) {
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
-                }
-            }
-        }
-        function getStrictModeIdentifierMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
-        }
-        function checkStrictModeBinaryExpression(node) {
-            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
-                // Assignment operator(11.13) or of a PostfixExpression(11.3)
-                checkStrictModeEvalOrArguments(node, node.left);
-            }
-        }
-        function checkStrictModeCatchClause(node) {
-            // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the
-            // Catch production is eval or arguments
-            if (inStrictMode && node.variableDeclaration) {
-                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
-            }
-        }
-        function checkStrictModeDeleteExpression(node) {
-            // Grammar checking
-            if (inStrictMode && node.expression.kind === 69 /* Identifier */) {
-                // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
-                // UnaryExpression is a direct reference to a variable, function argument, or function name
-                var span = ts.getErrorSpanForNode(file, node.expression);
-                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
-            }
-        }
-        function isEvalOrArgumentsIdentifier(node) {
-            return node.kind === 69 /* Identifier */ &&
-                (node.text === "eval" || node.text === "arguments");
-        }
-        function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 69 /* Identifier */) {
-                var identifier = name;
-                if (isEvalOrArgumentsIdentifier(identifier)) {
-                    // We check first if the name is inside class declaration or class expression; if so give explicit message
-                    // otherwise report generic error message.
-                    var span = ts.getErrorSpanForNode(file, name);
-                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
-                }
-            }
-        }
-        function getStrictModeEvalOrArgumentsMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
-        }
-        function checkStrictModeFunctionName(node) {
-            if (inStrictMode) {
-                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1))
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-        }
-        function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 65536 /* OctalLiteral */) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
-            }
-        }
-        function checkStrictModePostfixUnaryExpression(node) {
-            // Grammar checking
-            // The identifier eval or arguments may not appear as the LeftHandSideExpression of an
-            // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression
-            // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.operand);
-            }
-        }
-        function checkStrictModePrefixUnaryExpression(node) {
-            // Grammar checking
-            if (inStrictMode) {
-                if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) {
-                    checkStrictModeEvalOrArguments(node, node.operand);
-                }
-            }
-        }
-        function checkStrictModeWithStatement(node) {
-            // Grammar checking for withStatement
-            if (inStrictMode) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
-            }
-        }
-        function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) {
-            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
-            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
-        }
-        function getDestructuringParameterName(node) {
-            return "__" + ts.indexOf(node.parent.parameters, node);
-        }
-        function bind(node) {
-            node.parent = parent;
-            var savedInStrictMode = inStrictMode;
-            if (!savedInStrictMode) {
-                updateStrictMode(node);
-            }
-            // First we bind declaration nodes to a symbol if possible.  We'll both create a symbol
-            // and then potentially add the symbol to an appropriate symbol table. Possible
-            // destination symbol tables are:
-            //
-            //  1) The 'exports' table of the current container's symbol.
-            //  2) The 'members' table of the current container's symbol.
-            //  3) The 'locals' table of the current container.
-            //
-            // However, not all symbols will end up in any of these tables.  'Anonymous' symbols
-            // (like TypeLiterals for example) will not be put in any table.
-            bindWorker(node);
-            // Then we recurse into the children of the node to bind them as well.  For certain
-            // symbols we do specialized work when we recurse.  For example, we'll keep track of
-            // the current 'container' node when it changes.  This helps us know which symbol table
-            // a local should go into for example.
-            bindChildren(node);
-            inStrictMode = savedInStrictMode;
-        }
-        function updateStrictMode(node) {
-            switch (node.kind) {
-                case 248 /* SourceFile */:
-                case 219 /* ModuleBlock */:
-                    updateStrictModeStatementList(node.statements);
-                    return;
-                case 192 /* Block */:
-                    if (ts.isFunctionLike(node.parent)) {
-                        updateStrictModeStatementList(node.statements);
-                    }
-                    return;
-                case 214 /* ClassDeclaration */:
-                case 186 /* ClassExpression */:
-                    // All classes are automatically in strict mode in ES6.
-                    inStrictMode = true;
-                    return;
-            }
-        }
-        function updateStrictModeStatementList(statements) {
-            for (var _i = 0; _i < statements.length; _i++) {
-                var statement = statements[_i];
-                if (!ts.isPrologueDirective(statement)) {
-                    return;
-                }
-                if (isUseStrictPrologueDirective(statement)) {
-                    inStrictMode = true;
-                    return;
-                }
-            }
-        }
-        /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
-        function isUseStrictPrologueDirective(node) {
-            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
-            // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
-            // string to contain unicode escapes (as per ES5).
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
-        }
-        function bindWorker(node) {
-            switch (node.kind) {
-                case 69 /* Identifier */:
-                    return checkStrictModeIdentifier(node);
-                case 181 /* BinaryExpression */:
-                    return checkStrictModeBinaryExpression(node);
-                case 244 /* CatchClause */:
-                    return checkStrictModeCatchClause(node);
-                case 175 /* DeleteExpression */:
-                    return checkStrictModeDeleteExpression(node);
-                case 8 /* NumericLiteral */:
-                    return checkStrictModeNumericLiteral(node);
-                case 180 /* PostfixUnaryExpression */:
-                    return checkStrictModePostfixUnaryExpression(node);
-                case 179 /* PrefixUnaryExpression */:
-                    return checkStrictModePrefixUnaryExpression(node);
-                case 205 /* WithStatement */:
-                    return checkStrictModeWithStatement(node);
-                case 97 /* ThisKeyword */:
-                    seenThisKeyword = true;
-                    return;
-                case 137 /* TypeParameter */:
-                    return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
-                case 138 /* Parameter */:
-                    return bindParameter(node);
-                case 211 /* VariableDeclaration */:
-                case 163 /* BindingElement */:
-                    return bindVariableDeclarationOrBindingElement(node);
-                case 141 /* PropertyDeclaration */:
-                case 140 /* PropertySignature */:
-                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */);
-                case 245 /* PropertyAssignment */:
-                case 246 /* ShorthandPropertyAssignment */:
-                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */);
-                case 247 /* EnumMember */:
-                    return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                    return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                    // If this is an ObjectLiteralExpression method, then it sits in the same space
-                    // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
-                    // so that it will conflict with any other object literal members with the same
-                    // name.
-                    return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 213 /* FunctionDeclaration */:
-                    checkStrictModeFunctionName(node);
-                    return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */);
-                case 144 /* Constructor */:
-                    return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 145 /* GetAccessor */:
-                    return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 146 /* SetAccessor */:
-                    return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                    return bindFunctionOrConstructorType(node);
-                case 155 /* TypeLiteral */:
-                    return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 165 /* ObjectLiteralExpression */:
-                    return bindObjectLiteralExpression(node);
-                case 173 /* FunctionExpression */:
-                case 174 /* ArrowFunction */:
-                    checkStrictModeFunctionName(node);
-                    var bindingName = node.name ? node.name.text : "__function";
-                    return bindAnonymousDeclaration(node, 16 /* Function */, bindingName);
-                case 186 /* ClassExpression */:
-                case 214 /* ClassDeclaration */:
-                    return bindClassLikeDeclaration(node);
-                case 215 /* InterfaceDeclaration */:
-                    return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
-                case 216 /* TypeAliasDeclaration */:
-                    return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
-                case 217 /* EnumDeclaration */:
-                    return bindEnumDeclaration(node);
-                case 218 /* ModuleDeclaration */:
-                    return bindModuleDeclaration(node);
-                case 221 /* ImportEqualsDeclaration */:
-                case 224 /* NamespaceImport */:
-                case 226 /* ImportSpecifier */:
-                case 230 /* ExportSpecifier */:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 223 /* ImportClause */:
-                    return bindImportClause(node);
-                case 228 /* ExportDeclaration */:
-                    return bindExportDeclaration(node);
-                case 227 /* ExportAssignment */:
-                    return bindExportAssignment(node);
-                case 248 /* SourceFile */:
-                    return bindSourceFileIfExternalModule();
-            }
-        }
-        function bindSourceFileIfExternalModule() {
-            setExportContextFlag(file);
-            if (ts.isExternalModule(file)) {
-                bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
-            }
-        }
-        function bindExportAssignment(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                // Export assignment in some sort of block construct
-                bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
-            }
-            else if (node.expression.kind === 69 /* Identifier */) {
-                // An export default clause with an identifier exports all meanings of that identifier
-                declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
-            }
-            else {
-                // An export default clause with an expression exports a value
-                declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
-            }
-        }
-        function bindExportDeclaration(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                // Export * in some sort of block construct
-                bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node));
-            }
-            else if (!node.exportClause) {
-                // All export * declarations are collected in an __export symbol
-                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */);
-            }
-        }
-        function bindImportClause(node) {
-            if (node.name) {
-                declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-            }
-        }
-        function bindClassLikeDeclaration(node) {
-            if (node.kind === 214 /* ClassDeclaration */) {
-                bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
-            }
-            else {
-                var bindingName = node.name ? node.name.text : "__class";
-                bindAnonymousDeclaration(node, 32 /* Class */, bindingName);
-                // Add name of class expression into the map for semantic classifier
-                if (node.name) {
-                    classifiableNames[node.name.text] = node.name.text;
-                }
-            }
-            var symbol = node.symbol;
-            // TypeScript 1.0 spec (April 2014): 8.4
-            // Every class automatically contains a static property member named 'prototype', the
-            // type of which is an instantiation of the class type with type Any supplied as a type
-            // argument for each type parameter. It is an error to explicitly declare a static
-            // property member with the name 'prototype'.
-            //
-            // Note: we check for this here because this class may be merging into a module.  The
-            // module might have an exported variable called 'prototype'.  We can't allow that as
-            // that would clash with the built-in 'prototype' for the class.
-            var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype");
-            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
-                if (node.name) {
-                    node.name.parent = node;
-                }
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
-            }
-            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
-            prototypeSymbol.parent = symbol;
-        }
-        function bindEnumDeclaration(node) {
-            return ts.isConst(node)
-                ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */)
-                : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */);
-        }
-        function bindVariableDeclarationOrBindingElement(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (!ts.isBindingPattern(node.name)) {
-                if (ts.isBlockOrCatchScoped(node)) {
-                    bindBlockScopedVariableDeclaration(node);
-                }
-                else if (ts.isParameterDeclaration(node)) {
-                    // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration
-                    // because its parent chain has already been set up, since parents are set before descending into children.
-                    //
-                    // If node is a binding element in parameter declaration, we need to use ParameterExcludes.
-                    // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration
-                    // For example:
-                    //      function foo([a,a]) {} // Duplicate Identifier error
-                    //      function bar(a,a) {}   // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter
-                    //                             // which correctly set excluded symbols
-                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */);
-                }
-            }
-        }
-        function bindParameter(node) {
-            if (inStrictMode) {
-                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
-                // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (ts.isBindingPattern(node.name)) {
-                bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node));
-            }
-            else {
-                declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
-            }
-            // If this is a property-parameter, then also declare the property symbol into the
-            // containing class.
-            if (node.flags & 112 /* AccessibilityModifier */ &&
-                node.parent.kind === 144 /* Constructor */ &&
-                ts.isClassLike(node.parent.parent)) {
-                var classDeclaration = node.parent.parent;
-                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */);
-            }
-        }
-        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
-            return ts.hasDynamicName(node)
-                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
-                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
-        }
-    }
-})(ts || (ts = {}));
-/// <reference path="binder.ts" />
 /// <reference path="sys.ts" />
 /* @internal */
 var ts;
@@ -5126,8 +4190,8 @@ var ts;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
                 if (declaration.kind === kind) {
                     return declaration;
                 }
@@ -5173,15 +4237,15 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(arr1, arr2, comparer) {
-        if (!arr1 || !arr2) {
-            return arr1 === arr2;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
         }
-        if (arr1.length !== arr2.length) {
+        if (array1.length !== array2.length) {
             return false;
         }
-        for (var i = 0; i < arr1.length; ++i) {
-            var equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];
+        for (var i = 0; i < array1.length; ++i) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
             if (!equals) {
                 return false;
             }
@@ -5327,7 +4391,7 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 49152 /* BlockScoped */) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
@@ -5439,8 +4503,12 @@ var ts;
         return file.externalModuleIndicator !== undefined;
     }
     ts.isExternalModule = isExternalModule;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 8192 /* DeclarationFile */) !== 0;
+        return (file.flags & 4096 /* DeclarationFile */) !== 0;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
@@ -5477,11 +4545,11 @@ var ts;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 32768 /* Const */);
+        return !!(getCombinedNodeFlags(node) & 16384 /* Const */);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 16384 /* Let */);
+        return !!(getCombinedNodeFlags(node) & 8192 /* Let */);
     }
     ts.isLet = isLet;
     function isPrologueDirective(node) {
@@ -5492,19 +4560,27 @@ var ts;
         return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getLeadingCommentRangesOfNodeFromText(node, text) {
+        return ts.getLeadingCommentRanges(text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
     function getJsDocComments(node, sourceFileOfNode) {
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
+    }
+    ts.getJsDocComments = getJsDocComments;
+    function getJsDocCommentsFromText(node, text) {
         var commentRanges = (node.kind === 138 /* Parameter */ || node.kind === 137 /* TypeParameter */) ?
-            ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) :
-            getLeadingCommentRangesOfNode(node, sourceFileOfNode);
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
         function isJsDocComment(comment) {
             // True if the comment starts with '/**' but not if it is '/**/'
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47 /* slash */;
+            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 3) !== 47 /* slash */;
         }
     }
-    ts.getJsDocComments = getJsDocComments;
+    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
@@ -5682,27 +4758,28 @@ var ts;
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 144 /* Constructor */:
-                case 173 /* FunctionExpression */:
-                case 213 /* FunctionDeclaration */:
-                case 174 /* ArrowFunction */:
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                    return true;
-            }
-        }
-        return false;
+        return node && isFunctionLikeKind(node.kind);
     }
     ts.isFunctionLike = isFunctionLike;
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 144 /* Constructor */:
+            case 173 /* FunctionExpression */:
+            case 213 /* FunctionDeclaration */:
+            case 174 /* ArrowFunction */:
+            case 143 /* MethodDeclaration */:
+            case 142 /* MethodSignature */:
+            case 145 /* GetAccessor */:
+            case 146 /* SetAccessor */:
+            case 147 /* CallSignature */:
+            case 148 /* ConstructSignature */:
+            case 149 /* IndexSignature */:
+            case 152 /* FunctionType */:
+            case 153 /* ConstructorType */:
+                return true;
+        }
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
             case 143 /* MethodDeclaration */:
@@ -5717,6 +4794,20 @@ var ts;
         return false;
     }
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 199 /* ForStatement */:
+            case 200 /* ForInStatement */:
+            case 201 /* ForOfStatement */:
+            case 197 /* DoStatement */:
+            case 198 /* WhileStatement */:
+                return true;
+            case 207 /* LabeledStatement */:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
         return node && node.kind === 192 /* Block */ && isFunctionLike(node.parent);
     }
@@ -6076,6 +5167,57 @@ var ts;
         return node.kind === 221 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 232 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJavaScript(file) {
+        return isInJavaScriptFile(file);
+    }
+    ts.isSourceFileJavaScript = isSourceFileJavaScript;
+    function isInJavaScriptFile(node) {
+        return node && !!(node.parserContextFlags & 32 /* JavaScriptFile */);
+    }
+    ts.isInJavaScriptFile = isInJavaScriptFile;
+    /**
+     * Returns true if the node is a CallExpression to the identifier 'require' with
+     * exactly one string literal argument.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    function isRequireCall(expression) {
+        // of the form 'require("name")'
+        return expression.kind === 168 /* CallExpression */ &&
+            expression.expression.kind === 69 /* Identifier */ &&
+            expression.expression.text === "require" &&
+            expression.arguments.length === 1 &&
+            expression.arguments[0].kind === 9 /* StringLiteral */;
+    }
+    ts.isRequireCall = isRequireCall;
+    /**
+     * Returns true if the node is an assignment to a property on the identifier 'exports'.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    function isExportsPropertyAssignment(expression) {
+        // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181 /* BinaryExpression */) &&
+            (expression.operatorToken.kind === 56 /* EqualsToken */) &&
+            (expression.left.kind === 166 /* PropertyAccessExpression */) &&
+            (expression.left.expression.kind === 69 /* Identifier */) &&
+            ((expression.left.expression).text === "exports");
+    }
+    ts.isExportsPropertyAssignment = isExportsPropertyAssignment;
+    /**
+     * Returns true if the node is an assignment to the property access expression 'module.exports'.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    function isModuleExportsAssignment(expression) {
+        // of the form 'module.exports = expr' where 'expr' is arbitrary
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181 /* BinaryExpression */) &&
+            (expression.operatorToken.kind === 56 /* EqualsToken */) &&
+            (expression.left.kind === 166 /* PropertyAccessExpression */) &&
+            (expression.left.expression.kind === 69 /* Identifier */) &&
+            ((expression.left.expression).text === "module") &&
+            (expression.left.name.text === "exports");
+    }
+    ts.isModuleExportsAssignment = isModuleExportsAssignment;
     function getExternalModuleName(node) {
         if (node.kind === 222 /* ImportDeclaration */) {
             return node.moduleSpecifier;
@@ -6191,9 +5333,18 @@ var ts;
         return !!node && (node.kind === 162 /* ArrayBindingPattern */ || node.kind === 161 /* ObjectBindingPattern */);
     }
     ts.isBindingPattern = isBindingPattern;
+    function isNodeDescendentOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (2 /* Ambient */ | 8192 /* DeclarationFile */)) {
+            if (node.flags & (4 /* Ambient */ | 4096 /* DeclarationFile */)) {
                 return true;
             }
             node = node.parent;
@@ -6251,7 +5402,7 @@ var ts;
             case 207 /* LabeledStatement */:
             case 204 /* ReturnStatement */:
             case 206 /* SwitchStatement */:
-            case 98 /* ThrowKeyword */:
+            case 208 /* ThrowStatement */:
             case 209 /* TryStatement */:
             case 193 /* VariableStatement */:
             case 198 /* WhileStatement */:
@@ -6364,8 +5515,8 @@ var ts;
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
     function getHeritageClause(clauses, kind) {
         if (clauses) {
-            for (var _i = 0; _i < clauses.length; _i++) {
-                var clause = clauses[_i];
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
                 if (clause.token === kind) {
                     return clause;
                 }
@@ -6377,7 +5528,6 @@ var ts;
     function tryResolveScriptReference(host, sourceFile, reference) {
         if (!host.getCompilerOptions().noResolve) {
             var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            referenceFileName = ts.getNormalizedAbsolutePath(referenceFileName, host.getCurrentDirectory());
             return host.getSourceFile(referenceFileName);
         }
     }
@@ -6395,8 +5545,8 @@ var ts;
     function getFileReferenceFromReferencePath(comment, commentRange) {
         var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
         var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.exec(comment)) {
-            if (isNoDefaultLibRegEx.exec(comment)) {
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
                 return {
                     isNoDefaultLib: true
                 };
@@ -6435,9 +5585,13 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && (node.flags & 512 /* Async */) !== 0 && !isAccessor(node);
+        return isFunctionLike(node) && (node.flags & 256 /* Async */) !== 0 && !isAccessor(node);
     }
     ts.isAsyncFunctionLike = isAsyncFunctionLike;
+    function isStringOrNumericLiteral(kind) {
+        return kind === 9 /* StringLiteral */ || kind === 8 /* NumericLiteral */;
+    }
+    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
     /**
      * A declaration has a dynamic name if both of the following are true:
      *   1. The declaration has a computed property name
@@ -6446,11 +5600,15 @@ var ts;
      *      Symbol.
      */
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 136 /* ComputedPropertyName */ &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && isDynamicName(declaration.name);
     }
     ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 136 /* ComputedPropertyName */ &&
+            !isStringOrNumericLiteral(name.expression.kind) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
     /**
      * Checks if the expression is of the form:
      *    Symbol.name
@@ -6539,7 +5697,7 @@ var ts;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
-        var node = ts.createNode(kind);
+        var node = ts.createNode(kind, /* pos */ -1, /* end */ -1);
         node.startsOnNewLine = startsOnNewLine;
         return node;
     }
@@ -6691,11 +5849,11 @@ var ts;
     }
     ts.getIndentSize = getIndentSize;
     function createTextWriter(newLine) {
-        var output = "";
-        var indent = 0;
-        var lineStart = true;
-        var lineCount = 0;
-        var linePos = 0;
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
         function write(s) {
             if (s && s.length) {
                 if (lineStart) {
@@ -6705,6 +5863,13 @@ var ts;
                 output += s;
             }
         }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
         function rawWrite(s) {
             if (s !== undefined) {
                 if (lineStart) {
@@ -6731,9 +5896,10 @@ var ts;
                 lineStart = true;
             }
         }
-        function writeTextOfNode(sourceFile, node) {
-            write(getSourceTextOfNodeFromSourceFile(sourceFile, node));
+        function writeTextOfNode(text, node) {
+            write(getTextOfNodeFromSourceText(text, node));
         }
+        reset();
         return {
             write: write,
             rawWrite: rawWrite,
@@ -6746,10 +5912,20 @@ var ts;
             getTextPos: function () { return output.length; },
             getLine: function () { return lineCount + 1; },
             getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            getText: function () { return output; },
+            reset: reset
         };
     }
     ts.createTextWriter = createTextWriter;
+    /**
+     * Resolves a local path to a path which is absolute to the base of the emit
+     */
+    function getExternalModuleNameFromPath(host, fileName) {
+        var dir = host.getCurrentDirectory();
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, /*isAbsolutePathAnUrl*/ false);
+        return ts.removeFileExtension(relativePath);
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
     function getOwnEmitOutputFilePath(sourceFile, host, extension) {
         var compilerOptions = host.getCompilerOptions();
         var emitOutputFilePathWithoutExtension;
@@ -6778,6 +5954,10 @@ var ts;
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
             if (member.kind === 144 /* Constructor */ && nodeIsPresent(member.body)) {
@@ -6822,7 +6002,7 @@ var ts;
         else {
             ts.forEach(declarations, function (member) {
                 if ((member.kind === 145 /* GetAccessor */ || member.kind === 146 /* SetAccessor */)
-                    && (member.flags & 128 /* Static */) === (accessor.flags & 128 /* Static */)) {
+                    && (member.flags & 64 /* Static */) === (accessor.flags & 64 /* Static */)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -6850,22 +6030,22 @@ var ts;
         };
     }
     ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
         // If the leading comments start on different line than the start of node, write new line
         if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
     ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) {
+    function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) {
         var emitLeadingSpace = !trailingSeparator;
         ts.forEach(comments, function (comment) {
             if (emitLeadingSpace) {
                 writer.write(" ");
                 emitLeadingSpace = false;
             }
-            writeComment(currentSourceFile, writer, comment, newLine);
+            writeComment(text, lineMap, writer, comment, newLine);
             if (comment.hasTrailingNewLine) {
                 writer.writeLine();
             }
@@ -6879,19 +6059,79 @@ var ts;
         });
     }
     ts.emitComments = emitComments;
-    function writeCommentRange(currentSourceFile, writer, comment, newLine) {
-        if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
-            var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
-            var lineCount = ts.getLineStarts(currentSourceFile).length;
+    /**
+     * Detached comment is a comment at the top of file or function body that is separated from
+     * the next statement by space.
+     */
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            // removeComments is true, only reserve pinned comment at the top of file
+            // For example:
+            //      /*! Pinned Comment */
+            //
+            //      var x = 10;
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            // removeComments is false, just get detached as normal and bypass the process to filter comment
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        // There was a blank line between the last comment and this comment.  This
+                        // comment is not part of the copyright comments.  Return what we have so
+                        // far.
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                // All comments look like they could have been part of the copyright header.  Make
+                // sure there is at least one blank line between it and the node.  If not, it's not
+                // a copyright header.
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    // Valid detachedComments
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 2) === 33 /* exclamation */;
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, comment, newLine) {
+        if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
+            var lineCount = lineMap.length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
                 if (pos !== comment.pos) {
                     // If we are not emitting first line, we need to write the spaces to adjust the alignment
                     if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
                     }
                     // These are number of spaces writer is going to write at current indent
                     var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
@@ -6909,7 +6149,7 @@ var ts;
                     //            More right indented comment */                  --4 = 8 - 4 + 11
                     //     class c { }
                     // }
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
                     if (spacesToEmit > 0) {
                         var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
                         var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
@@ -6927,57 +6167,57 @@ var ts;
                     }
                 }
                 // Write the comment line text
-                writeTrimmedCurrentLine(pos, nextLineStart);
+                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
                 pos = nextLineStart;
             }
         }
         else {
             // Single line comment of style //....
-            writer.write(currentSourceFile.text.substring(comment.pos, comment.end));
-        }
-        function writeTrimmedCurrentLine(pos, nextLineStart) {
-            var end = Math.min(comment.end, nextLineStart - 1);
-            var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-            if (currentLineText) {
-                // trimmed forward and ending spaces text
-                writer.write(currentLineText);
-                if (end !== comment.end) {
-                    writer.writeLine();
-                }
-            }
-            else {
-                // Empty string - make sure we write empty line
-                writer.writeLiteral(newLine);
-            }
-        }
-        function calculateIndent(pos, end) {
-            var currentLineIndent = 0;
-            for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) {
-                if (currentSourceFile.text.charCodeAt(pos) === 9 /* tab */) {
-                    // Tabs = TabSize = indent size and go to next tabStop
-                    currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-                }
-                else {
-                    // Single space
-                    currentLineIndent++;
-                }
-            }
-            return currentLineIndent;
+            writer.write(text.substring(comment.pos, comment.end));
         }
     }
     ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(comment.end, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            // trimmed forward and ending spaces text
+            writer.write(currentLineText);
+            if (end !== comment.end) {
+                writer.writeLine();
+            }
+        }
+        else {
+            // Empty string - make sure we write empty line
+            writer.writeLiteral(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9 /* tab */) {
+                // Tabs = TabSize = indent size and go to next tabStop
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                // Single space
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
     function modifierToFlag(token) {
         switch (token) {
-            case 113 /* StaticKeyword */: return 128 /* Static */;
-            case 112 /* PublicKeyword */: return 16 /* Public */;
-            case 111 /* ProtectedKeyword */: return 64 /* Protected */;
-            case 110 /* PrivateKeyword */: return 32 /* Private */;
-            case 115 /* AbstractKeyword */: return 256 /* Abstract */;
-            case 82 /* ExportKeyword */: return 1 /* Export */;
-            case 122 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 74 /* ConstKeyword */: return 32768 /* Const */;
-            case 77 /* DefaultKeyword */: return 1024 /* Default */;
-            case 118 /* AsyncKeyword */: return 512 /* Async */;
+            case 113 /* StaticKeyword */: return 64 /* Static */;
+            case 112 /* PublicKeyword */: return 8 /* Public */;
+            case 111 /* ProtectedKeyword */: return 32 /* Protected */;
+            case 110 /* PrivateKeyword */: return 16 /* Private */;
+            case 115 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 82 /* ExportKeyword */: return 2 /* Export */;
+            case 122 /* DeclareKeyword */: return 4 /* Ambient */;
+            case 74 /* ConstKeyword */: return 16384 /* Const */;
+            case 77 /* DefaultKeyword */: return 512 /* Default */;
+            case 118 /* AsyncKeyword */: return 256 /* Async */;
         }
         return 0;
     }
@@ -7058,17 +6298,17 @@ var ts;
     }
     ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
     function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 1024 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined;
+        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined;
     }
     ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function isJavaScript(fileName) {
-        return ts.fileExtensionIs(fileName, ".js");
+    function hasJavaScriptFileExtension(fileName) {
+        return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isJavaScript = isJavaScript;
-    function isTsx(fileName) {
-        return ts.fileExtensionIs(fileName, ".tsx");
+    ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension;
+    function allowsJsxExpressions(fileName) {
+        return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isTsx = isTsx;
+    ts.allowsJsxExpressions = allowsJsxExpressions;
     /**
      * Replace each instance of non-ascii characters by one, two, three, or four escape sequences
      * representing the UTF-8 encoding of the character, and return the expanded char code list.
@@ -7135,6 +6375,12 @@ var ts;
         return result;
     }
     ts.convertToBase64 = convertToBase64;
+    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
+        return !ts.isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /* isAbsolutePathAnUrl */ false);
+    }
+    ts.convertToRelativePath = convertToRelativePath;
     var carriageReturnLineFeed = "\r\n";
     var lineFeed = "\n";
     function getNewLineCharacter(options) {
@@ -7372,29 +6618,21 @@ var ts;
         }
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
-    function arrayStructurallyIsEqualTo(array1, array2) {
-        if (!array1 || !array2) {
-            return false;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        return ts.arrayIsEqualTo(array1.sort(), array2.sort());
-    }
-    ts.arrayStructurallyIsEqualTo = arrayStructurallyIsEqualTo;
 })(ts || (ts = {}));
-/// <reference path="scanner.ts"/>
 /// <reference path="utilities.ts"/>
+/// <reference path="scanner.ts"/>
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(272 /* Count */);
     /* @internal */ ts.parseTime = 0;
-    function getNodeConstructor(kind) {
-        return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
-    }
-    ts.getNodeConstructor = getNodeConstructor;
-    function createNode(kind) {
-        return new (getNodeConstructor(kind))();
+    var NodeConstructor;
+    var SourceFileConstructor;
+    function createNode(kind, pos, end) {
+        if (kind === 248 /* SourceFile */) {
+            return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
+        }
+        else {
+            return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
+        }
     }
     ts.createNode = createNode;
     function visitNode(cbNode, node) {
@@ -7409,8 +6647,8 @@ var ts;
     }
     function visitEachNode(cbNode, nodes) {
         if (nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                var node = nodes_1[_i];
                 var result = cbNode(node);
                 if (result) {
                     return result;
@@ -7817,6 +7055,9 @@ var ts;
         // up by avoiding the cost of creating/compiling scanners over and over again.
         var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 1 /* DisallowIn */ | 4 /* Decorator */;
+        // capture constructors in 'initializeState' to avoid null checks
+        var NodeConstructor;
+        var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
         var syntaxCursor;
@@ -7902,13 +7143,16 @@ var ts;
         // attached to the EOF token.
         var parseErrorBeforeNextFinishedNode = false;
         function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor);
+            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
+            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
             var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+            NodeConstructor = ts.objectAllocator.getNodeConstructor();
+            SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
             parseDiagnostics = [];
@@ -7916,13 +7160,13 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = ts.isJavaScript(fileName) ? 32 /* JavaScriptFile */ : 0 /* None */;
+            contextFlags = isJavaScriptFile ? 32 /* JavaScriptFile */ : 0 /* None */;
             parseErrorBeforeNextFinishedNode = false;
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 /* JSX */ : 0 /* Standard */);
+            scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 /* JSX */ : 0 /* Standard */);
         }
         function clearState() {
             // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily.
@@ -7937,6 +7181,9 @@ var ts;
         }
         function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
             sourceFile = createSourceFile(fileName, languageVersion);
+            if (contextFlags & 32 /* JavaScriptFile */) {
+                sourceFile.parserContextFlags = 32 /* JavaScriptFile */;
+            }
             // Prime the scanner.
             token = nextToken();
             processReferenceComments(sourceFile);
@@ -7954,7 +7201,7 @@ var ts;
             // If this is a javascript file, proactively see if we can get JSDoc comments for
             // relevant nodes in the file.  We'll use these to provide typing informaion if they're
             // available.
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 addJSDocComments();
             }
             return sourceFile;
@@ -7977,8 +7224,8 @@ var ts;
         function addJSDocComment(node) {
             var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
             if (comments) {
-                for (var _i = 0; _i < comments.length; _i++) {
-                    var comment = comments[_i];
+                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                    var comment = comments_1[_i];
                     var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
                     if (jsDocComment) {
                         node.jsDocComment = jsDocComment;
@@ -8009,15 +7256,16 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion) {
-            var sourceFile = createNode(248 /* SourceFile */, /*pos*/ 0);
-            sourceFile.pos = 0;
-            sourceFile.end = sourceText.length;
+            // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
+            // this is quite rare comparing to other nodes and createNode should be as fast as possible
+            var sourceFile = new SourceFileConstructor(248 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 8192 /* DeclarationFile */ : 0;
-            sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */;
+            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 /* DeclarationFile */ : 0;
+            sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -8282,15 +7530,13 @@ var ts;
                 return parseExpected(23 /* SemicolonToken */);
             }
         }
+        // note: this function creates only node
         function createNode(kind, pos) {
             nodeCount++;
-            var node = new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))();
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            node.pos = pos;
-            node.end = pos;
-            return node;
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -8455,7 +7701,7 @@ var ts;
                 case 12 /* ObjectLiteralMembers */:
                     return token === 19 /* OpenBracketToken */ || token === 37 /* AsteriskToken */ || isLiteralPropertyName();
                 case 9 /* ObjectBindingElements */:
-                    return isLiteralPropertyName();
+                    return token === 19 /* OpenBracketToken */ || isLiteralPropertyName();
                 case 7 /* HeritageClauseElement */:
                     // If we see { } then only consume it as an expression if it is followed by , or {
                     // That way we won't consume the body of a class in its heritage clause.
@@ -9077,7 +8323,7 @@ var ts;
             if (node.kind === 8 /* NumericLiteral */
                 && sourceText.charCodeAt(tokenPos) === 48 /* _0 */
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 65536 /* OctalLiteral */;
+                node.flags |= 32768 /* OctalLiteral */;
             }
             return node;
         }
@@ -9135,9 +8381,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(54 /* ColonToken */)) {
-                return token === 9 /* StringLiteral */
-                    ? parseLiteralNode(/*internName*/ true)
-                    : parseType();
+                return parseType();
             }
             return undefined;
         }
@@ -9468,6 +8712,8 @@ var ts;
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReferenceOrTypePredicate();
+                case 9 /* StringLiteral */:
+                    return parseLiteralNode(/*internName*/ true);
                 case 103 /* VoidKeyword */:
                 case 97 /* ThisKeyword */:
                     return parseTokenNode();
@@ -9497,6 +8743,7 @@ var ts;
                 case 19 /* OpenBracketToken */:
                 case 25 /* LessThanToken */:
                 case 92 /* NewKeyword */:
+                case 9 /* StringLiteral */:
                     return true;
                 case 17 /* OpenParenToken */:
                     // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier,
@@ -9830,7 +9077,7 @@ var ts;
                 // Didn't appear to actually be a parenthesized arrow function.  Just bail out.
                 return undefined;
             }
-            var isAsync = !!(arrowFunction.flags & 512 /* Async */);
+            var isAsync = !!(arrowFunction.flags & 256 /* Async */);
             // If we have an arrow, then try to parse the body. Even if not, try to parse if we
             // have an opening brace, just in case we're in an error state.
             var lastToken = token;
@@ -9913,7 +9160,7 @@ var ts;
                     return 1 /* True */;
                 }
                 // This *could* be a parenthesized arrow function.
-                // Return Unknown to let the caller know.
+                // Return Unknown to const the caller know.
                 return 2 /* Unknown */;
             }
             else {
@@ -9957,7 +9204,7 @@ var ts;
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
             var node = createNode(174 /* ArrowFunction */);
             setModifiers(node, parseModifiersForArrowFunction());
-            var isAsync = !!(node.flags & 512 /* Async */);
+            var isAsync = !!(node.flags & 256 /* Async */);
             // Arrow functions are never generators.
             //
             // If we're speculatively parsing a signature for a parenthesized arrow function, then
@@ -9999,7 +9246,7 @@ var ts;
                 // user meant to supply a block. For example, if the user wrote:
                 //
                 //  a =>
-                //      let v = 0;
+                //      const v = 0;
                 //  }
                 //
                 // they may be missing an open brace.  Check to see if that's the case so we can
@@ -10215,7 +9462,6 @@ var ts;
             var unaryOperator = token;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38 /* AsteriskAsteriskToken */) {
-                var diagnostic;
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 if (simpleUnaryExpression.kind === 171 /* TypeAssertionExpression */) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
@@ -10432,18 +9678,40 @@ var ts;
         }
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
+            var result;
             if (opening.kind === 235 /* JsxOpeningElement */) {
                 var node = createNode(233 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
-                return finishNode(node);
+                result = finishNode(node);
             }
             else {
                 ts.Debug.assert(opening.kind === 234 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
-                return opening;
+                result = opening;
             }
+            // If the user writes the invalid code '<div></div><div></div>' in an expression context (i.e. not wrapped in
+            // an enclosing tag), we'll naively try to parse   ^ this as a 'less than' operator and the remainder of the tag
+            // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX
+            // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter
+            // does less damage and we can report a better error.
+            // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios
+            // of one sort or another.
+            if (inExpressionContext && token === 25 /* LessThanToken */) {
+                var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
+                if (invalidElement) {
+                    parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
+                    var badNode = createNode(181 /* BinaryExpression */, result.pos);
+                    badNode.end = invalidElement.end;
+                    badNode.left = result;
+                    badNode.right = invalidElement;
+                    badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined);
+                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
+                    return badNode;
+                }
+            }
+            return result;
         }
         function parseJsxText() {
             var node = createNode(236 /* JsxText */, scanner.getStartPos());
@@ -10778,7 +10046,7 @@ var ts;
             var node = createNode(164 /* ArrayLiteralExpression */);
             parseExpected(19 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak())
-                node.flags |= 2048 /* MultiLine */;
+                node.flags |= 1024 /* MultiLine */;
             node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
             parseExpected(20 /* CloseBracketToken */);
             return finishNode(node);
@@ -10839,7 +10107,7 @@ var ts;
             var node = createNode(165 /* ObjectLiteralExpression */);
             parseExpected(15 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 2048 /* MultiLine */;
+                node.flags |= 1024 /* MultiLine */;
             }
             node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true);
             parseExpected(16 /* CloseBraceToken */);
@@ -10860,7 +10128,7 @@ var ts;
             parseExpected(87 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512 /* Async */);
+            var isAsync = !!(node.flags & 256 /* Async */);
             node.name =
                 isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
                     isGenerator ? doInYieldContext(parseOptionalIdentifier) :
@@ -11397,7 +10665,6 @@ var ts;
         }
         function parseObjectBindingElement() {
             var node = createNode(163 /* BindingElement */);
-            // TODO(andersh): Handle computed properties
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== 54 /* ColonToken */) {
@@ -11452,10 +10719,10 @@ var ts;
                 case 102 /* VarKeyword */:
                     break;
                 case 108 /* LetKeyword */:
-                    node.flags |= 16384 /* Let */;
+                    node.flags |= 8192 /* Let */;
                     break;
                 case 74 /* ConstKeyword */:
-                    node.flags |= 32768 /* Const */;
+                    node.flags |= 16384 /* Const */;
                     break;
                 default:
                     ts.Debug.fail();
@@ -11498,9 +10765,9 @@ var ts;
             setModifiers(node, modifiers);
             parseExpected(87 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-            node.name = node.flags & 1024 /* Default */ ? parseOptionalIdentifier() : parseIdentifier();
+            node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512 /* Async */);
+            var isAsync = !!(node.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
@@ -11522,7 +10789,7 @@ var ts;
             method.name = name;
             method.questionToken = questionToken;
             var isGenerator = !!asteriskToken;
-            var isAsync = !!(method.flags & 512 /* Async */);
+            var isAsync = !!(method.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
             return finishNode(method);
@@ -11543,7 +10810,7 @@ var ts;
             //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initialiser_opt[In, ?Yield];
             //
             // The checker may still error in the static case to explicitly disallow the yield expression.
-            property.initializer = modifiers && modifiers.flags & 128 /* Static */
+            property.initializer = modifiers && modifiers.flags & 64 /* Static */
                 ? allowInAnd(parseNonParameterInitializer)
                 : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer);
             parseSemicolon();
@@ -11876,13 +11143,13 @@ var ts;
             var node = createNode(218 /* ModuleDeclaration */, fullStart);
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
-            var namespaceFlag = flags & 131072 /* Namespace */;
+            var namespaceFlag = flags & 65536 /* Namespace */;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21 /* DotToken */)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 1 /* Export */ | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
@@ -11897,7 +11164,7 @@ var ts;
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
             if (parseOptional(126 /* NamespaceKeyword */)) {
-                flags |= 131072 /* Namespace */;
+                flags |= 65536 /* Namespace */;
             }
             else {
                 parseExpected(125 /* ModuleKeyword */);
@@ -12155,7 +11422,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1 /* Export */
+                return node.flags & 2 /* Export */
                     || node.kind === 221 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 232 /* ExternalModuleReference */
                     || node.kind === 222 /* ImportDeclaration */
                     || node.kind === 227 /* ExportAssignment */
@@ -12220,7 +11487,7 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined);
+                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
                 var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -12315,6 +11582,7 @@ var ts;
                     case 103 /* VoidKeyword */:
                         return parseTokenNode();
                 }
+                // TODO (drosen): Parse string literal types in JSDoc as well.
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
@@ -12486,7 +11754,7 @@ var ts;
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined);
+                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
                 var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -12844,8 +12112,8 @@ var ts;
                 array._children = undefined;
                 array.pos += delta;
                 array.end += delta;
-                for (var _i = 0; _i < array.length; _i++) {
-                    var node = array[_i];
+                for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
+                    var node = array_7[_i];
                     visitNode(node);
                 }
             }
@@ -12982,8 +12250,8 @@ var ts;
                     array._children = undefined;
                     // Adjust the pos or end (or both) of the intersecting array accordingly.
                     adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    for (var _i = 0; _i < array.length; _i++) {
-                        var node = array[_i];
+                    for (var _i = 0, array_8 = array; _i < array_8.length; _i++) {
+                        var node = array_8[_i];
                         visitNode(node);
                     }
                     return;
@@ -13211,6 +12479,1372 @@ var ts;
         })(InvalidPosition || (InvalidPosition = {}));
     })(IncrementalParser || (IncrementalParser = {}));
 })(ts || (ts = {}));
+/// <reference path="utilities.ts"/>
+/// <reference path="parser.ts"/>
+/* @internal */
+var ts;
+(function (ts) {
+    ts.bindTime = 0;
+    (function (ModuleInstanceState) {
+        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
+        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
+        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
+    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
+    var ModuleInstanceState = ts.ModuleInstanceState;
+    var Reachability;
+    (function (Reachability) {
+        Reachability[Reachability["Unintialized"] = 1] = "Unintialized";
+        Reachability[Reachability["Reachable"] = 2] = "Reachable";
+        Reachability[Reachability["Unreachable"] = 4] = "Unreachable";
+        Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable";
+    })(Reachability || (Reachability = {}));
+    function or(state1, state2) {
+        return (state1 | state2) & 2 /* Reachable */
+            ? 2 /* Reachable */
+            : (state1 & state2) & 8 /* ReportedUnreachable */
+                ? 8 /* ReportedUnreachable */
+                : 4 /* Unreachable */;
+    }
+    function getModuleInstanceState(node) {
+        // A module is uninstantiated if it contains only
+        // 1. interface declarations, type alias declarations
+        if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) {
+            return 0 /* NonInstantiated */;
+        }
+        else if (ts.isConstEnumDeclaration(node)) {
+            return 2 /* ConstEnumOnly */;
+        }
+        else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) {
+            return 0 /* NonInstantiated */;
+        }
+        else if (node.kind === 219 /* ModuleBlock */) {
+            var state = 0 /* NonInstantiated */;
+            ts.forEachChild(node, function (n) {
+                switch (getModuleInstanceState(n)) {
+                    case 0 /* NonInstantiated */:
+                        // child is non-instantiated - continue searching
+                        return false;
+                    case 2 /* ConstEnumOnly */:
+                        // child is const enum only - record state and continue searching
+                        state = 2 /* ConstEnumOnly */;
+                        return false;
+                    case 1 /* Instantiated */:
+                        // child is instantiated - record state and stop
+                        state = 1 /* Instantiated */;
+                        return true;
+                }
+            });
+            return state;
+        }
+        else if (node.kind === 218 /* ModuleDeclaration */) {
+            return getModuleInstanceState(node.body);
+        }
+        else {
+            return 1 /* Instantiated */;
+        }
+    }
+    ts.getModuleInstanceState = getModuleInstanceState;
+    var ContainerFlags;
+    (function (ContainerFlags) {
+        // The current node is not a container, and no container manipulation should happen before
+        // recursing into it.
+        ContainerFlags[ContainerFlags["None"] = 0] = "None";
+        // The current node is a container.  It should be set as the current container (and block-
+        // container) before recursing into it.  The current node does not have locals.  Examples:
+        //
+        //      Classes, ObjectLiterals, TypeLiterals, Interfaces...
+        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
+        // The current node is a block-scoped-container.  It should be set as the current block-
+        // container before recursing into it.  Examples:
+        //
+        //      Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements...
+        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
+        ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals";
+        // If the current node is a container that also container that also contains locals.  Examples:
+        //
+        //      Functions, Methods, Modules, Source-files.
+        ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals";
+    })(ContainerFlags || (ContainerFlags = {}));
+    var binder = createBinder();
+    function bindSourceFile(file, options) {
+        var start = new Date().getTime();
+        binder(file, options);
+        ts.bindTime += new Date().getTime() - start;
+    }
+    ts.bindSourceFile = bindSourceFile;
+    function createBinder() {
+        var file;
+        var options;
+        var parent;
+        var container;
+        var blockScopeContainer;
+        var lastContainer;
+        var seenThisKeyword;
+        // state used by reachability checks
+        var hasExplicitReturn;
+        var currentReachabilityState;
+        var labelStack;
+        var labelIndexMap;
+        var implicitLabels;
+        // If this file is an external module, then it is automatically in strict-mode according to
+        // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
+        // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
+        var inStrictMode;
+        var symbolCount = 0;
+        var Symbol;
+        var classifiableNames;
+        function bindSourceFile(f, opts) {
+            file = f;
+            options = opts;
+            inStrictMode = !!file.externalModuleIndicator;
+            classifiableNames = {};
+            Symbol = ts.objectAllocator.getSymbolConstructor();
+            if (!file.locals) {
+                bind(file);
+                file.symbolCount = symbolCount;
+                file.classifiableNames = classifiableNames;
+            }
+            parent = undefined;
+            container = undefined;
+            blockScopeContainer = undefined;
+            lastContainer = undefined;
+            seenThisKeyword = false;
+            hasExplicitReturn = false;
+            labelStack = undefined;
+            labelIndexMap = undefined;
+            implicitLabels = undefined;
+        }
+        return bindSourceFile;
+        function createSymbol(flags, name) {
+            symbolCount++;
+            return new Symbol(flags, name);
+        }
+        function addDeclarationToSymbol(symbol, node, symbolFlags) {
+            symbol.flags |= symbolFlags;
+            node.symbol = symbol;
+            if (!symbol.declarations) {
+                symbol.declarations = [];
+            }
+            symbol.declarations.push(node);
+            if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) {
+                symbol.exports = {};
+            }
+            if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) {
+                symbol.members = {};
+            }
+            if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) {
+                symbol.valueDeclaration = node;
+            }
+        }
+        // Should not be called on a declaration with a computed property name,
+        // unless it is a well known Symbol.
+        function getDeclarationName(node) {
+            if (node.name) {
+                if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
+                    return "\"" + node.name.text + "\"";
+                }
+                if (node.name.kind === 136 /* ComputedPropertyName */) {
+                    var nameExpression = node.name.expression;
+                    // treat computed property names where expression is string/numeric literal as just string/numeric literal 
+                    if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
+                        return nameExpression.text;
+                    }
+                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
+                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
+                }
+                return node.name.text;
+            }
+            switch (node.kind) {
+                case 144 /* Constructor */:
+                    return "__constructor";
+                case 152 /* FunctionType */:
+                case 147 /* CallSignature */:
+                    return "__call";
+                case 153 /* ConstructorType */:
+                case 148 /* ConstructSignature */:
+                    return "__new";
+                case 149 /* IndexSignature */:
+                    return "__index";
+                case 228 /* ExportDeclaration */:
+                    return "__export";
+                case 227 /* ExportAssignment */:
+                    return node.isExportEquals ? "export=" : "default";
+                case 181 /* BinaryExpression */:
+                    // Binary expression case is for JS module 'module.exports = expr'
+                    return "export=";
+                case 213 /* FunctionDeclaration */:
+                case 214 /* ClassDeclaration */:
+                    return node.flags & 512 /* Default */ ? "default" : undefined;
+            }
+        }
+        function getDisplayName(node) {
+            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
+        }
+        /**
+         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
+         * @param symbolTable - The symbol table which node will be added to.
+         * @param parent - node's parent declaration.
+         * @param node - The declaration to be added to the symbol table
+         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
+         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations.
+         */
+        function declareSymbol(symbolTable, parent, node, includes, excludes) {
+            ts.Debug.assert(!ts.hasDynamicName(node));
+            var isDefaultExport = node.flags & 512 /* Default */;
+            // The exported symbol for an export default function/class node is always named "default"
+            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
+            var symbol;
+            if (name !== undefined) {
+                // Check and see if the symbol table already has a symbol with this name.  If not,
+                // create a new symbol with this name and add it to the table.  Note that we don't
+                // give the new symbol any flags *yet*.  This ensures that it will not conflict
+                // with the 'excludes' flags we pass in.
+                //
+                // If we do get an existing symbol, see if it conflicts with the new symbol we're
+                // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
+                // the same symbol table.  If we have a conflict, report the issue on each
+                // declaration we have for this symbol, and then create a new symbol for this
+                // declaration.
+                //
+                // If we created a new symbol, either because we didn't have a symbol with this name
+                // in the symbol table, or we conflicted with an existing symbol, then just add this
+                // node as the sole declaration of the new symbol.
+                //
+                // Otherwise, we'll be merging into a compatible existing symbol (for example when
+                // you have multiple 'vars' with the same name in the same container).  In this case
+                // just add this node into the declarations list of the symbol.
+                symbol = ts.hasProperty(symbolTable, name)
+                    ? symbolTable[name]
+                    : (symbolTable[name] = createSymbol(0 /* None */, name));
+                if (name && (includes & 788448 /* Classifiable */)) {
+                    classifiableNames[name] = name;
+                }
+                if (symbol.flags & excludes) {
+                    if (node.name) {
+                        node.name.parent = node;
+                    }
+                    // Report errors every position with duplicate declaration
+                    // Report errors on previous encountered declarations
+                    var message = symbol.flags & 2 /* BlockScopedVariable */
+                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
+                        : ts.Diagnostics.Duplicate_identifier_0;
+                    ts.forEach(symbol.declarations, function (declaration) {
+                        if (declaration.flags & 512 /* Default */) {
+                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                        }
+                    });
+                    ts.forEach(symbol.declarations, function (declaration) {
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                    });
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    symbol = createSymbol(0 /* None */, name);
+                }
+            }
+            else {
+                symbol = createSymbol(0 /* None */, "__missing");
+            }
+            addDeclarationToSymbol(symbol, node, includes);
+            symbol.parent = parent;
+            return symbol;
+        }
+        function declareModuleMember(node, symbolFlags, symbolExcludes) {
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2 /* Export */;
+            if (symbolFlags & 8388608 /* Alias */) {
+                if (node.kind === 230 /* ExportSpecifier */ || (node.kind === 221 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                }
+                else {
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+            else {
+                // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue,
+                // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set
+                // on it. There are 2 main reasons:
+                //
+                //   1. We treat locals and exports of the same name as mutually exclusive within a container.
+                //      That means the binder will issue a Duplicate Identifier error if you mix locals and exports
+                //      with the same name in the same container.
+                //      TODO: Make this a more specific error and decouple it from the exclusion logic.
+                //   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 & 131072 /* ExportContext */) {
+                    var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
+                        (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
+                        (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
+                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
+                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                    node.localSymbol = local;
+                    return local;
+                }
+                else {
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+        }
+        // All container nodes are kept on a linked list in declaration order. This list is used by
+        // the getLocalNameOfContainer function in the type checker to validate that the local name
+        // used for a container is unique.
+        function bindChildren(node) {
+            // Before we recurse into a node's chilren, we first save the existing parent, container
+            // and block-container.  Then after we pop out of processing the children, we restore
+            // these saved values.
+            var saveParent = parent;
+            var saveContainer = container;
+            var savedBlockScopeContainer = blockScopeContainer;
+            // This node will now be set as the parent of all of its children as we recurse into them.
+            parent = node;
+            // Depending on what kind of node this is, we may have to adjust the current container
+            // and block-container.   If the current node is a container, then it is automatically
+            // considered the current block-container as well.  Also, for containers that we know
+            // may contain locals, we proactively initialize the .locals field. We do this because
+            // it's highly likely that the .locals will be needed to place some child in (for example,
+            // a parameter, or variable declaration).
+            //
+            // However, we do not proactively create the .locals for block-containers because it's
+            // totally normal and common for block-containers to never actually have a block-scoped
+            // variable in them.  We don't want to end up allocating an object for every 'block' we
+            // run into when most of them won't be necessary.
+            //
+            // Finally, if this is a block-container, then we clear out any existing .locals object
+            // it may contain within it.  This happens in incremental scenarios.  Because we can be
+            // reusing a node from a previous compilation, that node may have had 'locals' created
+            // for it.  We must clear this so we don't accidently move any stale data forward from
+            // a previous compilation.
+            var containerFlags = getContainerFlags(node);
+            if (containerFlags & 1 /* IsContainer */) {
+                container = blockScopeContainer = node;
+                if (containerFlags & 4 /* HasLocals */) {
+                    container.locals = {};
+                }
+                addToContainerChain(container);
+            }
+            else if (containerFlags & 2 /* IsBlockScopedContainer */) {
+                blockScopeContainer = node;
+                blockScopeContainer.locals = undefined;
+            }
+            var savedReachabilityState;
+            var savedLabelStack;
+            var savedLabels;
+            var savedImplicitLabels;
+            var savedHasExplicitReturn;
+            var kind = node.kind;
+            var flags = node.flags;
+            // reset all reachability check related flags on node (for incremental scenarios)
+            flags &= ~1572864 /* ReachabilityCheckFlags */;
+            if (kind === 215 /* InterfaceDeclaration */) {
+                seenThisKeyword = false;
+            }
+            var saveState = kind === 248 /* SourceFile */ || kind === 219 /* ModuleBlock */ || ts.isFunctionLikeKind(kind);
+            if (saveState) {
+                savedReachabilityState = currentReachabilityState;
+                savedLabelStack = labelStack;
+                savedLabels = labelIndexMap;
+                savedImplicitLabels = implicitLabels;
+                savedHasExplicitReturn = hasExplicitReturn;
+                currentReachabilityState = 2 /* Reachable */;
+                hasExplicitReturn = false;
+                labelStack = labelIndexMap = implicitLabels = undefined;
+            }
+            bindReachableStatement(node);
+            if (currentReachabilityState === 2 /* Reachable */ && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
+                flags |= 524288 /* HasImplicitReturn */;
+                if (hasExplicitReturn) {
+                    flags |= 1048576 /* HasExplicitReturn */;
+                }
+            }
+            if (kind === 215 /* InterfaceDeclaration */) {
+                flags = seenThisKeyword ? flags | 262144 /* ContainsThis */ : flags & ~262144 /* ContainsThis */;
+            }
+            node.flags = flags;
+            if (saveState) {
+                hasExplicitReturn = savedHasExplicitReturn;
+                currentReachabilityState = savedReachabilityState;
+                labelStack = savedLabelStack;
+                labelIndexMap = savedLabels;
+                implicitLabels = savedImplicitLabels;
+            }
+            container = saveContainer;
+            parent = saveParent;
+            blockScopeContainer = savedBlockScopeContainer;
+        }
+        /**
+         * Returns true if node and its subnodes were successfully traversed.
+         * Returning false means that node was not examined and caller needs to dive into the node himself.
+         */
+        function bindReachableStatement(node) {
+            if (checkUnreachable(node)) {
+                ts.forEachChild(node, bind);
+                return;
+            }
+            switch (node.kind) {
+                case 198 /* WhileStatement */:
+                    bindWhileStatement(node);
+                    break;
+                case 197 /* DoStatement */:
+                    bindDoStatement(node);
+                    break;
+                case 199 /* ForStatement */:
+                    bindForStatement(node);
+                    break;
+                case 200 /* ForInStatement */:
+                case 201 /* ForOfStatement */:
+                    bindForInOrForOfStatement(node);
+                    break;
+                case 196 /* IfStatement */:
+                    bindIfStatement(node);
+                    break;
+                case 204 /* ReturnStatement */:
+                case 208 /* ThrowStatement */:
+                    bindReturnOrThrow(node);
+                    break;
+                case 203 /* BreakStatement */:
+                case 202 /* ContinueStatement */:
+                    bindBreakOrContinueStatement(node);
+                    break;
+                case 209 /* TryStatement */:
+                    bindTryStatement(node);
+                    break;
+                case 206 /* SwitchStatement */:
+                    bindSwitchStatement(node);
+                    break;
+                case 220 /* CaseBlock */:
+                    bindCaseBlock(node);
+                    break;
+                case 207 /* LabeledStatement */:
+                    bindLabeledStatement(node);
+                    break;
+                default:
+                    ts.forEachChild(node, bind);
+                    break;
+            }
+        }
+        function bindWhileStatement(n) {
+            var preWhileState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            var postWhileState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            // bind expressions (don't affect reachability)
+            bind(n.expression);
+            currentReachabilityState = preWhileState;
+            var postWhileLabel = pushImplicitLabel();
+            bind(n.statement);
+            popImplicitLabel(postWhileLabel, postWhileState);
+        }
+        function bindDoStatement(n) {
+            var preDoState = currentReachabilityState;
+            var postDoLabel = pushImplicitLabel();
+            bind(n.statement);
+            var postDoState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : preDoState;
+            popImplicitLabel(postDoLabel, postDoState);
+            // bind expressions (don't affect reachability)
+            bind(n.expression);
+        }
+        function bindForStatement(n) {
+            var preForState = currentReachabilityState;
+            var postForLabel = pushImplicitLabel();
+            // bind expressions (don't affect reachability)
+            bind(n.initializer);
+            bind(n.condition);
+            bind(n.incrementor);
+            bind(n.statement);
+            // for statement is considered infinite when it condition is either omitted or is true keyword
+            // - for(..;;..)
+            // - for(..;true;..)
+            var isInfiniteLoop = (!n.condition || n.condition.kind === 99 /* TrueKeyword */);
+            var postForState = isInfiniteLoop ? 4 /* Unreachable */ : preForState;
+            popImplicitLabel(postForLabel, postForState);
+        }
+        function bindForInOrForOfStatement(n) {
+            var preStatementState = currentReachabilityState;
+            var postStatementLabel = pushImplicitLabel();
+            // bind expressions (don't affect reachability)
+            bind(n.initializer);
+            bind(n.expression);
+            bind(n.statement);
+            popImplicitLabel(postStatementLabel, preStatementState);
+        }
+        function bindIfStatement(n) {
+            // denotes reachability state when entering 'thenStatement' part of the if statement: 
+            // i.e. if condition is false then thenStatement is unreachable
+            var ifTrueState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            // denotes reachability state when entering 'elseStatement':
+            // i.e. if condition is true then elseStatement is unreachable
+            var ifFalseState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            currentReachabilityState = ifTrueState;
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            bind(n.thenStatement);
+            if (n.elseStatement) {
+                var preElseState = currentReachabilityState;
+                currentReachabilityState = ifFalseState;
+                bind(n.elseStatement);
+                currentReachabilityState = or(currentReachabilityState, preElseState);
+            }
+            else {
+                currentReachabilityState = or(currentReachabilityState, ifFalseState);
+            }
+        }
+        function bindReturnOrThrow(n) {
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            if (n.kind === 204 /* ReturnStatement */) {
+                hasExplicitReturn = true;
+            }
+            currentReachabilityState = 4 /* Unreachable */;
+        }
+        function bindBreakOrContinueStatement(n) {
+            // call bind on label (don't affect reachability)
+            bind(n.label);
+            // for continue case touch label so it will be marked a used
+            var isValidJump = jumpToLabel(n.label, n.kind === 203 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */);
+            if (isValidJump) {
+                currentReachabilityState = 4 /* Unreachable */;
+            }
+        }
+        function bindTryStatement(n) {
+            // catch\finally blocks has the same reachability as try block
+            var preTryState = currentReachabilityState;
+            bind(n.tryBlock);
+            var postTryState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.catchClause);
+            var postCatchState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.finallyBlock);
+            // post catch/finally state is reachable if
+            // - post try state is reachable - control flow can fall out of try block
+            // - post catch state is reachable - control flow can fall out of catch block
+            currentReachabilityState = or(postTryState, postCatchState);
+        }
+        function bindSwitchStatement(n) {
+            var preSwitchState = currentReachabilityState;
+            var postSwitchLabel = pushImplicitLabel();
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            bind(n.caseBlock);
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242 /* DefaultClause */; });
+            // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case
+            var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState;
+            popImplicitLabel(postSwitchLabel, postSwitchState);
+        }
+        function bindCaseBlock(n) {
+            var startState = currentReachabilityState;
+            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
+                var clause = _a[_i];
+                currentReachabilityState = startState;
+                bind(clause);
+                if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) {
+                    errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
+                }
+            }
+        }
+        function bindLabeledStatement(n) {
+            // call bind on label (don't affect reachability)
+            bind(n.label);
+            var ok = pushNamedLabel(n.label);
+            bind(n.statement);
+            if (ok) {
+                popNamedLabel(n.label, currentReachabilityState);
+            }
+        }
+        function getContainerFlags(node) {
+            switch (node.kind) {
+                case 186 /* ClassExpression */:
+                case 214 /* ClassDeclaration */:
+                case 215 /* InterfaceDeclaration */:
+                case 217 /* EnumDeclaration */:
+                case 155 /* TypeLiteral */:
+                case 165 /* ObjectLiteralExpression */:
+                    return 1 /* IsContainer */;
+                case 147 /* CallSignature */:
+                case 148 /* ConstructSignature */:
+                case 149 /* IndexSignature */:
+                case 143 /* MethodDeclaration */:
+                case 142 /* MethodSignature */:
+                case 213 /* FunctionDeclaration */:
+                case 144 /* Constructor */:
+                case 145 /* GetAccessor */:
+                case 146 /* SetAccessor */:
+                case 152 /* FunctionType */:
+                case 153 /* ConstructorType */:
+                case 173 /* FunctionExpression */:
+                case 174 /* ArrowFunction */:
+                case 218 /* ModuleDeclaration */:
+                case 248 /* SourceFile */:
+                case 216 /* TypeAliasDeclaration */:
+                    return 5 /* IsContainerWithLocals */;
+                case 244 /* CatchClause */:
+                case 199 /* ForStatement */:
+                case 200 /* ForInStatement */:
+                case 201 /* ForOfStatement */:
+                case 220 /* CaseBlock */:
+                    return 2 /* IsBlockScopedContainer */;
+                case 192 /* Block */:
+                    // do not treat blocks directly inside a function as a block-scoped-container.
+                    // Locals that reside in this block should go to the function locals. Othewise 'x'
+                    // would not appear to be a redeclaration of a block scoped local in the following
+                    // example:
+                    //
+                    //      function foo() {
+                    //          var x;
+                    //          let x;
+                    //      }
+                    //
+                    // If we placed 'var x' into the function locals and 'let x' into the locals of
+                    // the block, then there would be no collision.
+                    //
+                    // By not creating a new block-scoped-container here, we ensure that both 'var x'
+                    // and 'let x' go into the Function-container's locals, and we do get a collision
+                    // conflict.
+                    return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */;
+            }
+            return 0 /* None */;
+        }
+        function addToContainerChain(next) {
+            if (lastContainer) {
+                lastContainer.nextContainer = next;
+            }
+            lastContainer = next;
+        }
+        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
+            // Just call this directly so that the return type of this function stays "void".
+            declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
+        }
+        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
+            switch (container.kind) {
+                // Modules, source files, and classes need specialized handling for how their
+                // members are declared (for example, a member of a class will go into a specific
+                // symbol table depending on if it is static or not). We defer to specialized
+                // handlers to take care of declaring these child members.
+                case 218 /* ModuleDeclaration */:
+                    return declareModuleMember(node, symbolFlags, symbolExcludes);
+                case 248 /* SourceFile */:
+                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
+                case 186 /* ClassExpression */:
+                case 214 /* ClassDeclaration */:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 217 /* EnumDeclaration */:
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                case 155 /* TypeLiteral */:
+                case 165 /* ObjectLiteralExpression */:
+                case 215 /* InterfaceDeclaration */:
+                    // Interface/Object-types always have their children added to the 'members' of
+                    // their container. They are only accessible through an instance of their
+                    // container, and are never in scope otherwise (even inside the body of the
+                    // object / type / interface declaring them). An exception is type parameters,
+                    // which are in scope without qualification (similar to 'locals').
+                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+                case 152 /* FunctionType */:
+                case 153 /* ConstructorType */:
+                case 147 /* CallSignature */:
+                case 148 /* ConstructSignature */:
+                case 149 /* IndexSignature */:
+                case 143 /* MethodDeclaration */:
+                case 142 /* MethodSignature */:
+                case 144 /* Constructor */:
+                case 145 /* GetAccessor */:
+                case 146 /* SetAccessor */:
+                case 213 /* FunctionDeclaration */:
+                case 173 /* FunctionExpression */:
+                case 174 /* ArrowFunction */:
+                case 216 /* TypeAliasDeclaration */:
+                    // All the children of these container types are never visible through another
+                    // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
+                    // they're only accessed 'lexically' (i.e. from code that exists underneath
+                    // their container in the tree.  To accomplish this, we simply add their declared
+                    // symbol to the 'locals' of the container.  These symbols can then be found as
+                    // the type checker walks up the containers, checking them for matching names.
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function declareClassMember(node, symbolFlags, symbolExcludes) {
+            return node.flags & 64 /* Static */
+                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
+                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+        }
+        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
+            return ts.isExternalModule(file)
+                ? declareModuleMember(node, symbolFlags, symbolExcludes)
+                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
+        }
+        function hasExportDeclarations(node) {
+            var body = node.kind === 248 /* SourceFile */ ? node : node.body;
+            if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) {
+                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
+                    var stat = _a[_i];
+                    if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function setExportContextFlag(node) {
+            // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
+            // declarations with export modifiers) is an export context in which declarations are implicitly exported.
+            if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
+                node.flags |= 131072 /* ExportContext */;
+            }
+            else {
+                node.flags &= ~131072 /* ExportContext */;
+            }
+        }
+        function bindModuleDeclaration(node) {
+            setExportContextFlag(node);
+            if (node.name.kind === 9 /* StringLiteral */) {
+                declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+            }
+            else {
+                var state = getModuleInstanceState(node);
+                if (state === 0 /* NonInstantiated */) {
+                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+                    if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) {
+                        // if module was already merged with some function, class or non-const enum
+                        // treat is a non-const-enum-only
+                        node.symbol.constEnumOnlyModule = false;
+                    }
+                    else {
+                        var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */;
+                        if (node.symbol.constEnumOnlyModule === undefined) {
+                            // non-merged case - use the current state
+                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
+                        }
+                        else {
+                            // merged case: module is const enum only if all its pieces are non-instantiated or const enum
+                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
+                        }
+                    }
+                }
+            }
+        }
+        function bindFunctionOrConstructorType(node) {
+            // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
+            // to the one we would get for: { <...>(...): T }
+            //
+            // We do that by making an anonymous type literal symbol, and then setting the function
+            // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable
+            // from an actual type literal symbol you would have gotten had you used the long form.
+            var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node));
+            addDeclarationToSymbol(symbol, node, 131072 /* Signature */);
+            var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type");
+            addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */);
+            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
+            var _a;
+        }
+        function bindObjectLiteralExpression(node) {
+            var ElementKind;
+            (function (ElementKind) {
+                ElementKind[ElementKind["Property"] = 1] = "Property";
+                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
+            })(ElementKind || (ElementKind = {}));
+            if (inStrictMode) {
+                var seen = {};
+                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (prop.name.kind !== 69 /* Identifier */) {
+                        continue;
+                    }
+                    var identifier = prop.name;
+                    // ECMA-262 11.1.5 Object Initialiser
+                    // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+                    // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
+                    // IsDataDescriptor(propId.descriptor) is true.
+                    //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
+                    //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
+                    //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
+                    // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
+                    var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */
+                        ? 1 /* Property */
+                        : 2 /* Accessor */;
+                    var existingKind = seen[identifier.text];
+                    if (!existingKind) {
+                        seen[identifier.text] = currentKind;
+                        continue;
+                    }
+                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
+                        var span = ts.getErrorSpanForNode(file, identifier);
+                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
+                    }
+                }
+            }
+            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object");
+        }
+        function bindAnonymousDeclaration(node, symbolFlags, name) {
+            var symbol = createSymbol(symbolFlags, name);
+            addDeclarationToSymbol(symbol, node, symbolFlags);
+        }
+        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
+            switch (blockScopeContainer.kind) {
+                case 218 /* ModuleDeclaration */:
+                    declareModuleMember(node, symbolFlags, symbolExcludes);
+                    break;
+                case 248 /* SourceFile */:
+                    if (ts.isExternalModule(container)) {
+                        declareModuleMember(node, symbolFlags, symbolExcludes);
+                        break;
+                    }
+                // fall through.
+                default:
+                    if (!blockScopeContainer.locals) {
+                        blockScopeContainer.locals = {};
+                        addToContainerChain(blockScopeContainer);
+                    }
+                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function bindBlockScopedVariableDeclaration(node) {
+            bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */);
+        }
+        // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized
+        // check for reserved words used as identifiers in strict mode code.
+        function checkStrictModeIdentifier(node) {
+            if (inStrictMode &&
+                node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 114 /* LastFutureReservedWord */ &&
+                !ts.isIdentifierName(node)) {
+                // Report error only if there are no parse errors in file
+                if (!file.parseDiagnostics.length) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
+                }
+            }
+        }
+        function getStrictModeIdentifierMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
+        }
+        function checkStrictModeBinaryExpression(node) {
+            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
+                // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
+                // Assignment operator(11.13) or of a PostfixExpression(11.3)
+                checkStrictModeEvalOrArguments(node, node.left);
+            }
+        }
+        function checkStrictModeCatchClause(node) {
+            // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the
+            // Catch production is eval or arguments
+            if (inStrictMode && node.variableDeclaration) {
+                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
+            }
+        }
+        function checkStrictModeDeleteExpression(node) {
+            // Grammar checking
+            if (inStrictMode && node.expression.kind === 69 /* Identifier */) {
+                // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
+                // UnaryExpression is a direct reference to a variable, function argument, or function name
+                var span = ts.getErrorSpanForNode(file, node.expression);
+                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
+            }
+        }
+        function isEvalOrArgumentsIdentifier(node) {
+            return node.kind === 69 /* Identifier */ &&
+                (node.text === "eval" || node.text === "arguments");
+        }
+        function checkStrictModeEvalOrArguments(contextNode, name) {
+            if (name && name.kind === 69 /* Identifier */) {
+                var identifier = name;
+                if (isEvalOrArgumentsIdentifier(identifier)) {
+                    // We check first if the name is inside class declaration or class expression; if so give explicit message
+                    // otherwise report generic error message.
+                    var span = ts.getErrorSpanForNode(file, name);
+                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
+                }
+            }
+        }
+        function getStrictModeEvalOrArgumentsMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
+        }
+        function checkStrictModeFunctionName(node) {
+            if (inStrictMode) {
+                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1))
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+        }
+        function checkStrictModeNumericLiteral(node) {
+            if (inStrictMode && node.flags & 32768 /* OctalLiteral */) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
+            }
+        }
+        function checkStrictModePostfixUnaryExpression(node) {
+            // Grammar checking
+            // The identifier eval or arguments may not appear as the LeftHandSideExpression of an
+            // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression
+            // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.operand);
+            }
+        }
+        function checkStrictModePrefixUnaryExpression(node) {
+            // Grammar checking
+            if (inStrictMode) {
+                if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) {
+                    checkStrictModeEvalOrArguments(node, node.operand);
+                }
+            }
+        }
+        function checkStrictModeWithStatement(node) {
+            // Grammar checking for withStatement
+            if (inStrictMode) {
+                errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
+            }
+        }
+        function errorOnFirstToken(node, message, arg0, arg1, arg2) {
+            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
+            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
+        }
+        function getDestructuringParameterName(node) {
+            return "__" + ts.indexOf(node.parent.parameters, node);
+        }
+        function bind(node) {
+            if (!node) {
+                return;
+            }
+            node.parent = parent;
+            var savedInStrictMode = inStrictMode;
+            if (!savedInStrictMode) {
+                updateStrictMode(node);
+            }
+            // First we bind declaration nodes to a symbol if possible.  We'll both create a symbol
+            // and then potentially add the symbol to an appropriate symbol table. Possible
+            // destination symbol tables are:
+            //
+            //  1) The 'exports' table of the current container's symbol.
+            //  2) The 'members' table of the current container's symbol.
+            //  3) The 'locals' table of the current container.
+            //
+            // However, not all symbols will end up in any of these tables.  'Anonymous' symbols
+            // (like TypeLiterals for example) will not be put in any table.
+            bindWorker(node);
+            // Then we recurse into the children of the node to bind them as well.  For certain
+            // symbols we do specialized work when we recurse.  For example, we'll keep track of
+            // the current 'container' node when it changes.  This helps us know which symbol table
+            // a local should go into for example.
+            bindChildren(node);
+            inStrictMode = savedInStrictMode;
+        }
+        function updateStrictMode(node) {
+            switch (node.kind) {
+                case 248 /* SourceFile */:
+                case 219 /* ModuleBlock */:
+                    updateStrictModeStatementList(node.statements);
+                    return;
+                case 192 /* Block */:
+                    if (ts.isFunctionLike(node.parent)) {
+                        updateStrictModeStatementList(node.statements);
+                    }
+                    return;
+                case 214 /* ClassDeclaration */:
+                case 186 /* ClassExpression */:
+                    // All classes are automatically in strict mode in ES6.
+                    inStrictMode = true;
+                    return;
+            }
+        }
+        function updateStrictModeStatementList(statements) {
+            for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) {
+                var statement = statements_1[_i];
+                if (!ts.isPrologueDirective(statement)) {
+                    return;
+                }
+                if (isUseStrictPrologueDirective(statement)) {
+                    inStrictMode = true;
+                    return;
+                }
+            }
+        }
+        /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
+        function isUseStrictPrologueDirective(node) {
+            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
+            // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
+            // string to contain unicode escapes (as per ES5).
+            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+        }
+        function bindWorker(node) {
+            switch (node.kind) {
+                /* Strict mode checks */
+                case 69 /* Identifier */:
+                    return checkStrictModeIdentifier(node);
+                case 181 /* BinaryExpression */:
+                    if (ts.isInJavaScriptFile(node)) {
+                        if (ts.isExportsPropertyAssignment(node)) {
+                            bindExportsPropertyAssignment(node);
+                        }
+                        else if (ts.isModuleExportsAssignment(node)) {
+                            bindModuleExportsAssignment(node);
+                        }
+                    }
+                    return checkStrictModeBinaryExpression(node);
+                case 244 /* CatchClause */:
+                    return checkStrictModeCatchClause(node);
+                case 175 /* DeleteExpression */:
+                    return checkStrictModeDeleteExpression(node);
+                case 8 /* NumericLiteral */:
+                    return checkStrictModeNumericLiteral(node);
+                case 180 /* PostfixUnaryExpression */:
+                    return checkStrictModePostfixUnaryExpression(node);
+                case 179 /* PrefixUnaryExpression */:
+                    return checkStrictModePrefixUnaryExpression(node);
+                case 205 /* WithStatement */:
+                    return checkStrictModeWithStatement(node);
+                case 97 /* ThisKeyword */:
+                    seenThisKeyword = true;
+                    return;
+                case 137 /* TypeParameter */:
+                    return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
+                case 138 /* Parameter */:
+                    return bindParameter(node);
+                case 211 /* VariableDeclaration */:
+                case 163 /* BindingElement */:
+                    return bindVariableDeclarationOrBindingElement(node);
+                case 141 /* PropertyDeclaration */:
+                case 140 /* PropertySignature */:
+                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */);
+                case 245 /* PropertyAssignment */:
+                case 246 /* ShorthandPropertyAssignment */:
+                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */);
+                case 247 /* EnumMember */:
+                    return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
+                case 147 /* CallSignature */:
+                case 148 /* ConstructSignature */:
+                case 149 /* IndexSignature */:
+                    return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
+                case 143 /* MethodDeclaration */:
+                case 142 /* MethodSignature */:
+                    // If this is an ObjectLiteralExpression method, then it sits in the same space
+                    // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
+                    // so that it will conflict with any other object literal members with the same
+                    // name.
+                    return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
+                case 213 /* FunctionDeclaration */:
+                    checkStrictModeFunctionName(node);
+                    return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */);
+                case 144 /* Constructor */:
+                    return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
+                case 145 /* GetAccessor */:
+                    return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
+                case 146 /* SetAccessor */:
+                    return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
+                case 152 /* FunctionType */:
+                case 153 /* ConstructorType */:
+                    return bindFunctionOrConstructorType(node);
+                case 155 /* TypeLiteral */:
+                    return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
+                case 165 /* ObjectLiteralExpression */:
+                    return bindObjectLiteralExpression(node);
+                case 173 /* FunctionExpression */:
+                case 174 /* ArrowFunction */:
+                    checkStrictModeFunctionName(node);
+                    var bindingName = node.name ? node.name.text : "__function";
+                    return bindAnonymousDeclaration(node, 16 /* Function */, bindingName);
+                case 168 /* CallExpression */:
+                    if (ts.isInJavaScriptFile(node)) {
+                        bindCallExpression(node);
+                    }
+                    break;
+                // Members of classes, interfaces, and modules
+                case 186 /* ClassExpression */:
+                case 214 /* ClassDeclaration */:
+                    return bindClassLikeDeclaration(node);
+                case 215 /* InterfaceDeclaration */:
+                    return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
+                case 216 /* TypeAliasDeclaration */:
+                    return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
+                case 217 /* EnumDeclaration */:
+                    return bindEnumDeclaration(node);
+                case 218 /* ModuleDeclaration */:
+                    return bindModuleDeclaration(node);
+                // Imports and exports
+                case 221 /* ImportEqualsDeclaration */:
+                case 224 /* NamespaceImport */:
+                case 226 /* ImportSpecifier */:
+                case 230 /* ExportSpecifier */:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
+                case 223 /* ImportClause */:
+                    return bindImportClause(node);
+                case 228 /* ExportDeclaration */:
+                    return bindExportDeclaration(node);
+                case 227 /* ExportAssignment */:
+                    return bindExportAssignment(node);
+                case 248 /* SourceFile */:
+                    return bindSourceFileIfExternalModule();
+            }
+        }
+        function bindSourceFileIfExternalModule() {
+            setExportContextFlag(file);
+            if (ts.isExternalModule(file)) {
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindSourceFileAsExternalModule() {
+            bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+        }
+        function bindExportAssignment(node) {
+            var boundExpression = node.kind === 227 /* ExportAssignment */ ? node.expression : node.right;
+            if (!container.symbol || !container.symbol.exports) {
+                // Export assignment in some sort of block construct
+                bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
+            }
+            else if (boundExpression.kind === 69 /* Identifier */) {
+                // An export default clause with an identifier exports all meanings of that identifier
+                declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
+            }
+            else {
+                // An export default clause with an expression exports a value
+                declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
+            }
+        }
+        function bindExportDeclaration(node) {
+            if (!container.symbol || !container.symbol.exports) {
+                // Export * in some sort of block construct
+                bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node));
+            }
+            else if (!node.exportClause) {
+                // All export * declarations are collected in an __export symbol
+                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */);
+            }
+        }
+        function bindImportClause(node) {
+            if (node.name) {
+                declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
+            }
+        }
+        function setCommonJsModuleIndicator(node) {
+            if (!file.commonJsModuleIndicator) {
+                file.commonJsModuleIndicator = node;
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindExportsPropertyAssignment(node) {
+            // When we create a property via 'exports.foo = bar', the 'exports.foo' property access
+            // expression is the declaration
+            setCommonJsModuleIndicator(node);
+            declareSymbol(file.symbol.exports, file.symbol, node.left, 4 /* Property */ | 7340032 /* Export */, 0 /* None */);
+        }
+        function bindModuleExportsAssignment(node) {
+            // 'module.exports = expr' assignment
+            setCommonJsModuleIndicator(node);
+            bindExportAssignment(node);
+        }
+        function bindCallExpression(node) {
+            // We're only inspecting call expressions to detect CommonJS modules, so we can skip
+            // this check if we've already seen the module indicator
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+                setCommonJsModuleIndicator(node);
+            }
+        }
+        function bindClassLikeDeclaration(node) {
+            if (node.kind === 214 /* ClassDeclaration */) {
+                bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
+            }
+            else {
+                var bindingName = node.name ? node.name.text : "__class";
+                bindAnonymousDeclaration(node, 32 /* Class */, bindingName);
+                // Add name of class expression into the map for semantic classifier
+                if (node.name) {
+                    classifiableNames[node.name.text] = node.name.text;
+                }
+            }
+            var symbol = node.symbol;
+            // TypeScript 1.0 spec (April 2014): 8.4
+            // Every class automatically contains a static property member named 'prototype', the
+            // type of which is an instantiation of the class type with type Any supplied as a type
+            // argument for each type parameter. It is an error to explicitly declare a static
+            // property member with the name 'prototype'.
+            //
+            // Note: we check for this here because this class may be merging into a module.  The
+            // module might have an exported variable called 'prototype'.  We can't allow that as
+            // that would clash with the built-in 'prototype' for the class.
+            var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype");
+            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
+                if (node.name) {
+                    node.name.parent = node;
+                }
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
+            }
+            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
+            prototypeSymbol.parent = symbol;
+        }
+        function bindEnumDeclaration(node) {
+            return ts.isConst(node)
+                ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */)
+                : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */);
+        }
+        function bindVariableDeclarationOrBindingElement(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (!ts.isBindingPattern(node.name)) {
+                if (ts.isBlockOrCatchScoped(node)) {
+                    bindBlockScopedVariableDeclaration(node);
+                }
+                else if (ts.isParameterDeclaration(node)) {
+                    // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration
+                    // because its parent chain has already been set up, since parents are set before descending into children.
+                    //
+                    // If node is a binding element in parameter declaration, we need to use ParameterExcludes.
+                    // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration
+                    // For example:
+                    //      function foo([a,a]) {} // Duplicate Identifier error
+                    //      function bar(a,a) {}   // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter
+                    //                             // which correctly set excluded symbols
+                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */);
+                }
+            }
+        }
+        function bindParameter(node) {
+            if (inStrictMode) {
+                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
+                // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (ts.isBindingPattern(node.name)) {
+                bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node));
+            }
+            else {
+                declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
+            }
+            // If this is a property-parameter, then also declare the property symbol into the
+            // containing class.
+            if (node.flags & 56 /* AccessibilityModifier */ &&
+                node.parent.kind === 144 /* Constructor */ &&
+                ts.isClassLike(node.parent.parent)) {
+                var classDeclaration = node.parent.parent;
+                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */);
+            }
+        }
+        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
+            return ts.hasDynamicName(node)
+                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
+                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
+        }
+        // reachability checks
+        function pushNamedLabel(name) {
+            initializeReachabilityStateIfNecessary();
+            if (ts.hasProperty(labelIndexMap, name.text)) {
+                return false;
+            }
+            labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1;
+            return true;
+        }
+        function pushImplicitLabel() {
+            initializeReachabilityStateIfNecessary();
+            var index = labelStack.push(1 /* Unintialized */) - 1;
+            implicitLabels.push(index);
+            return index;
+        }
+        function popNamedLabel(label, outerState) {
+            var index = labelIndexMap[label.text];
+            ts.Debug.assert(index !== undefined);
+            ts.Debug.assert(labelStack.length == index + 1);
+            labelIndexMap[label.text] = undefined;
+            setCurrentStateAtLabel(labelStack.pop(), outerState, label);
+        }
+        function popImplicitLabel(implicitLabelIndex, outerState) {
+            if (labelStack.length !== implicitLabelIndex + 1) {
+                ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex);
+            }
+            var i = implicitLabels.pop();
+            if (implicitLabelIndex !== i) {
+                ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex);
+            }
+            setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined);
+        }
+        function setCurrentStateAtLabel(innerMergedState, outerState, label) {
+            if (innerMergedState === 1 /* Unintialized */) {
+                if (label && !options.allowUnusedLabels) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label));
+                }
+                currentReachabilityState = outerState;
+            }
+            else {
+                currentReachabilityState = or(innerMergedState, outerState);
+            }
+        }
+        function jumpToLabel(label, outerState) {
+            initializeReachabilityStateIfNecessary();
+            var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels);
+            if (index === undefined) {
+                // reference to unknown label or
+                // break/continue used outside of loops
+                return false;
+            }
+            var stateAtLabel = labelStack[index];
+            labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState);
+            return true;
+        }
+        function checkUnreachable(node) {
+            switch (currentReachabilityState) {
+                case 4 /* Unreachable */:
+                    var reportError = 
+                    // report error on all statements except empty ones
+                    (ts.isStatement(node) && node.kind !== 194 /* EmptyStatement */) ||
+                        // report error on class declarations
+                        node.kind === 214 /* ClassDeclaration */ ||
+                        // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
+                        (node.kind === 218 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
+                        // report error on regular enums and const enums if preserveConstEnums is set
+                        (node.kind === 217 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    if (reportError) {
+                        currentReachabilityState = 8 /* ReportedUnreachable */;
+                        // unreachable code is reported if
+                        // - user has explicitly asked about it AND
+                        // - statement is in not ambient context (statements in ambient context is already an error 
+                        //   so we should not report extras) AND
+                        //   - node is not variable statement OR
+                        //   - node is block scoped variable statement OR
+                        //   - node is not block scoped variable statement and at least one variable declaration has initializer
+                        //   Rationale: we don't want to report errors on non-initialized var's since they are hoisted
+                        //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
+                        var reportUnreachableCode = !options.allowUnreachableCode &&
+                            !ts.isInAmbientContext(node) &&
+                            (node.kind !== 193 /* VariableStatement */ ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ ||
+                                ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
+                        if (reportUnreachableCode) {
+                            errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
+                        }
+                    }
+                case 8 /* ReportedUnreachable */:
+                    return true;
+                default:
+                    return false;
+            }
+            function shouldReportErrorOnModuleDeclaration(node) {
+                var instanceState = getModuleInstanceState(node);
+                return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums);
+            }
+        }
+        function initializeReachabilityStateIfNecessary() {
+            if (labelIndexMap) {
+                return;
+            }
+            currentReachabilityState = 2 /* Reachable */;
+            labelIndexMap = {};
+            labelStack = [];
+            implicitLabels = [];
+        }
+    }
+})(ts || (ts = {}));
 /// <reference path="binder.ts"/>
 /* @internal */
 var ts;
@@ -13284,7 +13918,7 @@ var ts;
             symbolToString: symbolToString,
             getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
             getRootSymbols: getRootSymbols,
-            getContextualType: getContextualType,
+            getContextualType: getApparentTypeOfContextualType,
             getFullyQualifiedName: getFullyQualifiedName,
             getResolvedSignature: getResolvedSignature,
             getConstantValue: getConstantValue,
@@ -13350,6 +13984,7 @@ var ts;
         var getInstantiatedGlobalPromiseLikeType;
         var getGlobalPromiseConstructorLikeType;
         var getGlobalThenableType;
+        var jsxElementClassType;
         var tupleTypes = {};
         var unionTypes = {};
         var intersectionTypes = {};
@@ -13553,7 +14188,7 @@ var ts;
             return ts.getAncestor(node, 248 /* SourceFile */);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 248 /* SourceFile */ && !ts.isExternalModule(node);
+            return node.kind === 248 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -13619,7 +14254,7 @@ var ts;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
                         current.parent.kind === 141 /* PropertyDeclaration */ &&
-                        (current.parent.flags & 128 /* Static */) === 0 &&
+                        (current.parent.flags & 64 /* Static */) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -13655,15 +14290,24 @@ var ts;
                 }
                 switch (location.kind) {
                     case 248 /* SourceFile */:
-                        if (!ts.isExternalModule(location))
+                        if (!ts.isExternalOrCommonJsModule(location))
                             break;
                     case 218 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
                         if (location.kind === 248 /* SourceFile */ ||
                             (location.kind === 218 /* ModuleDeclaration */ && location.name.kind === 9 /* StringLiteral */)) {
-                            // It's an external module. Because of module/namespace merging, a module's exports are in scope,
-                            // yet we never want to treat an export specifier as putting a member in scope. Therefore,
-                            // if the name we find is purely an export specifier, it is not actually considered in scope.
+                            // It's an external module. First see if the module has an export default and if the local
+                            // name of that export default matches.
+                            if (result = moduleExports["default"]) {
+                                var localSymbol = ts.getLocalSymbolForExportDefault(result);
+                                if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
+                                    break loop;
+                                }
+                                result = undefined;
+                            }
+                            // Because of module/namespace merging, a module's exports are in scope,
+                            // yet we never want to treat an export specifier as putting a member in scope. 
+                            // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope.
                             // Two things to note about this:
                             //     1. We have to check this without calling getSymbol. The problem with calling getSymbol
                             //        on an export specifier is that it might find the export specifier itself, and try to
@@ -13677,12 +14321,6 @@ var ts;
                                 ts.getDeclarationOfKind(moduleExports[name], 230 /* ExportSpecifier */)) {
                                 break;
                             }
-                            result = moduleExports["default"];
-                            var localSymbol = ts.getLocalSymbolForExportDefault(result);
-                            if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) {
-                                break loop;
-                            }
-                            result = undefined;
                         }
                         if (result = getSymbol(moduleExports, name, meaning & 8914931 /* ModuleMember */)) {
                             break loop;
@@ -13701,7 +14339,7 @@ var ts;
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !(location.flags & 128 /* Static */)) {
+                        if (ts.isClassLike(location.parent) && !(location.flags & 64 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455 /* Value */)) {
@@ -13715,7 +14353,7 @@ var ts;
                     case 186 /* ClassExpression */:
                     case 215 /* InterfaceDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056 /* Type */)) {
-                            if (lastLocation && lastLocation.flags & 128 /* Static */) {
+                            if (lastLocation && lastLocation.flags & 64 /* Static */) {
                                 // TypeScript 1.0 spec (April 2014): 3.4.1
                                 // The scope of a type parameter extends over the entire declaration with which the type
                                 // parameter list is associated, with the exception of static member declarations in classes.
@@ -13825,7 +14463,7 @@ var ts;
                 //          declare module foo {
                 //              interface bar {}
                 //          }
-                //      let foo/*1*/: foo/*2*/.bar;
+                //      const foo/*1*/: foo/*2*/.bar;
                 // The foo at /*1*/ and /*2*/ will share same symbol with two meaning
                 // block - scope variable and namespace module. However, only when we
                 // try to resolve name in /*1*/ which is used in variable position,
@@ -14129,6 +14767,9 @@ var ts;
             if (moduleName === undefined) {
                 return;
             }
+            if (moduleName.indexOf("!") >= 0) {
+                moduleName = moduleName.substr(0, moduleName.indexOf("!"));
+            }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
                 var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */);
@@ -14243,8 +14884,8 @@ var ts;
         }
         function findConstructorDeclaration(node) {
             var members = node.members;
-            for (var _i = 0; _i < members.length; _i++) {
-                var member = members[_i];
+            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                var member = members_1[_i];
                 if (member.kind === 144 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
@@ -14316,7 +14957,7 @@ var ts;
                 }
                 switch (location_1.kind) {
                     case 248 /* SourceFile */:
-                        if (!ts.isExternalModule(location_1)) {
+                        if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
                     case 218 /* ModuleDeclaration */:
@@ -14438,7 +15079,7 @@ var ts;
                     //     export class c {
                     //     }
                     // }
-                    // let x: typeof m.c
+                    // const x: typeof m.c
                     // In the above example when we start with checking if typeof m.c symbol is accessible,
                     // we are going to see if c can be accessed in scope directly.
                     // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible
@@ -14477,7 +15118,7 @@ var ts;
         }
         function hasExternalModuleSymbol(declaration) {
             return (declaration.kind === 218 /* ModuleDeclaration */ && declaration.name.kind === 9 /* StringLiteral */) ||
-                (declaration.kind === 248 /* SourceFile */ && ts.isExternalModule(declaration));
+                (declaration.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -14491,7 +15132,7 @@ var ts;
                     // because these kind of aliases can be used to name types in declaration file
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 1 /* Export */) &&
+                        !(anyImportSyntax.flags & 2 /* Export */) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -14628,7 +15269,7 @@ var ts;
                     parentSymbol = symbol;
                     appendSymbolNameOnly(symbol, writer);
                 }
-                // Let the writer know we just wrote out a symbol.  The declaration emitter writer uses
+                // const the writer know we just wrote out a symbol.  The declaration emitter writer uses
                 // this to determine if an import it has previously seen (and not written out) needs
                 // to be written to the file once the walk of the tree is complete.
                 //
@@ -14645,8 +15286,8 @@ var ts;
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
-                            for (var _i = 0; _i < accessibleSymbolChain.length; _i++) {
-                                var accessibleSymbol = accessibleSymbolChain[_i];
+                            for (var _i = 0, accessibleSymbolChain_1 = accessibleSymbolChain; _i < accessibleSymbolChain_1.length; _i++) {
+                                var accessibleSymbol = accessibleSymbolChain_1[_i];
                                 appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
                             }
                         }
@@ -14709,7 +15350,7 @@ var ts;
                         writeAnonymousType(type, flags);
                     }
                     else if (type.flags & 256 /* StringLiteral */) {
-                        writer.writeStringLiteral(type.text);
+                        writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\"");
                     }
                     else {
                         // Should never get here
@@ -14836,7 +15477,7 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */ &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 128 /* Static */; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64 /* Static */; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
@@ -14947,8 +15588,8 @@ var ts;
                         var t = getTypeOfSymbol(p);
                         if (p.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(t).length) {
                             var signatures = getSignaturesOfType(t, 0 /* Call */);
-                            for (var _f = 0; _f < signatures.length; _f++) {
-                                var signature = signatures[_f];
+                            for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
+                                var signature = signatures_1[_f];
                                 buildSymbolDisplay(p, writer);
                                 if (p.flags & 536870912 /* Optional */) {
                                     writePunctuation(writer, 53 /* QuestionToken */);
@@ -15096,7 +15737,7 @@ var ts;
                         }
                     }
                     else if (node.kind === 248 /* SourceFile */) {
-                        return ts.isExternalModule(node) ? node : undefined;
+                        return ts.isExternalOrCommonJsModule(node) ? node : undefined;
                     }
                 }
                 ts.Debug.fail("getContainingModule cant reach here");
@@ -15162,7 +15803,7 @@ var ts;
                     case 221 /* ImportEqualsDeclaration */:
                         var parent_4 = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
-                        if (!(ts.getCombinedNodeFlags(node) & 1 /* Export */) &&
+                        if (!(ts.getCombinedNodeFlags(node) & 2 /* Export */) &&
                             !(node.kind !== 221 /* ImportEqualsDeclaration */ && parent_4.kind !== 248 /* SourceFile */ && ts.isInAmbientContext(parent_4))) {
                             return isGlobalSourceFile(parent_4);
                         }
@@ -15174,11 +15815,11 @@ var ts;
                     case 146 /* SetAccessor */:
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
-                        if (node.flags & (32 /* Private */ | 64 /* Protected */)) {
+                        if (node.flags & (16 /* Private */ | 32 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
-                    // Public properties/methods are visible if its parents are visible, so let it fall into next case statement
+                    // Public properties/methods are visible if its parents are visible, so const it fall into next case statement
                     case 144 /* Constructor */:
                     case 148 /* ConstructSignature */:
                     case 147 /* CallSignature */:
@@ -15206,7 +15847,7 @@ var ts;
                     // Source file is always visible
                     case 248 /* SourceFile */:
                         return true;
-                    // Export assignements do not create name bindings outside the module
+                    // Export assignments do not create name bindings outside the module
                     case 227 /* ExportAssignment */:
                         return false;
                     default:
@@ -15342,6 +15983,23 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node);
         }
+        function getTextOfPropertyName(name) {
+            switch (name.kind) {
+                case 69 /* Identifier */:
+                    return name.text;
+                case 9 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                    return name.text;
+                case 136 /* ComputedPropertyName */:
+                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
+                        return name.expression.text;
+                    }
+            }
+            return undefined;
+        }
+        function isComputedNonLiteralName(name) {
+            return name.kind === 136 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
         // Return the inferred type for a binding element
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -15363,10 +16021,15 @@ var ts;
             if (pattern.kind === 161 /* ObjectBindingPattern */) {
                 // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
                 var name_10 = declaration.propertyName || declaration.name;
+                if (isComputedNonLiteralName(name_10)) {
+                    // computed properties with non-literal names are treated as 'any'
+                    return anyType;
+                }
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
-                type = getTypeOfPropertyOfType(parentType, name_10.text) ||
-                    isNumericLiteralName(name_10.text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
+                var text = getTextOfPropertyName(name_10);
+                type = getTypeOfPropertyOfType(parentType, text) ||
+                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
                     getIndexTypeOfType(parentType, 0 /* String */);
                 if (!type) {
                     error(name_10, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_10));
@@ -15466,10 +16129,17 @@ var ts;
         // Return the type implied by an object binding pattern
         function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
             var members = {};
+            var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
-                var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
                 var name = e.propertyName || e.name;
-                var symbol = createSymbol(flags, name.text);
+                if (isComputedNonLiteralName(name)) {
+                    // do not include computed properties in the implied type
+                    hasComputedProperties = true;
+                    return;
+                }
+                var text = getTextOfPropertyName(name);
+                var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
+                var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType);
                 symbol.bindingElement = e;
                 members[symbol.name] = symbol;
@@ -15478,6 +16148,9 @@ var ts;
             if (includePatternInType) {
                 result.pattern = pattern;
             }
+            if (hasComputedProperties) {
+                result.flags |= 67108864 /* ObjectLiteralPatternWithComputedProperties */;
+            }
             return result;
         }
         // Return the type implied by an array binding pattern
@@ -15554,6 +16227,14 @@ var ts;
                 if (declaration.kind === 227 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
+                // Handle module.exports = expr
+                if (declaration.kind === 181 /* BinaryExpression */) {
+                    return links.type = checkExpression(declaration.right);
+                }
+                // Handle exports.p = expr
+                if (declaration.kind === 166 /* PropertyAccessExpression */) {
+                    return checkExpressionCached(declaration.parent.right);
+                }
                 // Handle variable, parameter or property
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
                     return unknownType;
@@ -15704,8 +16385,8 @@ var ts;
         // The function allocates a new array if the input type parameter set is undefined, but otherwise it modifies the set
         // in-place and returns the same array.
         function appendTypeParameters(typeParameters, declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
+                var declaration = declarations_2[_i];
                 var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
                 if (!typeParameters) {
                     typeParameters = [tp];
@@ -15811,39 +16492,46 @@ var ts;
             }
             return type.resolvedBaseConstructorType;
         }
+        function hasClassBaseType(type) {
+            return !!ts.forEach(getBaseTypes(type), function (t) { return !!(t.symbol.flags & 32 /* Class */); });
+        }
         function getBaseTypes(type) {
+            var isClass = type.symbol.flags & 32 /* Class */;
+            var isInterface = type.symbol.flags & 64 /* Interface */;
             if (!type.resolvedBaseTypes) {
-                if (type.symbol.flags & 32 /* Class */) {
+                if (!isClass && !isInterface) {
+                    ts.Debug.fail("type must be class or interface");
+                }
+                if (isClass) {
                     resolveBaseTypesOfClass(type);
                 }
-                else if (type.symbol.flags & 64 /* Interface */) {
+                if (isInterface) {
                     resolveBaseTypesOfInterface(type);
                 }
-                else {
-                    ts.Debug.fail("type must be class or interface");
-                }
             }
             return type.resolvedBaseTypes;
         }
         function resolveBaseTypesOfClass(type) {
-            type.resolvedBaseTypes = emptyArray;
-            var baseContructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseContructorType.flags & 80896 /* ObjectType */)) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
+            var baseConstructorType = getBaseConstructorTypeOfClass(type);
+            if (!(baseConstructorType.flags & 80896 /* ObjectType */)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
             var baseType;
-            if (baseContructorType.symbol && baseContructorType.symbol.flags & 32 /* Class */) {
-                // When base constructor type is a class we know that the constructors all have the same type parameters as the
+            var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined;
+            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 /* Class */ &&
+                areAllOuterTypeParametersApplied(originalBaseType)) {
+                // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the
                 // class and all return the instance type of the class. There is no need for further checks and we can apply the
                 // type arguments in the same manner as a type reference to get the same error reporting experience.
-                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol);
+                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol);
             }
             else {
                 // The class derives from a "class-like" constructor function, check that we have at least one construct signature
                 // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere
                 // we check that all instantiated signatures return the same type.
-                var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments);
+                var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments);
                 if (!constructors.length) {
                     error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
                     return;
@@ -15861,10 +16549,26 @@ var ts;
                 error(type.symbol.valueDeclaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */));
                 return;
             }
-            type.resolvedBaseTypes = [baseType];
+            if (type.resolvedBaseTypes === emptyArray) {
+                type.resolvedBaseTypes = [baseType];
+            }
+            else {
+                type.resolvedBaseTypes.push(baseType);
+            }
+        }
+        function areAllOuterTypeParametersApplied(type) {
+            // An unapplied type parameter has its symbol still the same as the matching argument symbol.
+            // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked.
+            var outerTypeParameters = type.outerTypeParameters;
+            if (outerTypeParameters) {
+                var last = outerTypeParameters.length - 1;
+                var typeArguments = type.typeArguments;
+                return outerTypeParameters[last].symbol !== typeArguments[last].symbol;
+            }
+            return true;
         }
         function resolveBaseTypesOfInterface(type) {
-            type.resolvedBaseTypes = [];
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
@@ -15874,7 +16578,12 @@ var ts;
                         if (baseType !== unknownType) {
                             if (getTargetType(baseType).flags & (1024 /* Class */ | 2048 /* Interface */)) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
-                                    type.resolvedBaseTypes.push(baseType);
+                                    if (type.resolvedBaseTypes === emptyArray) {
+                                        type.resolvedBaseTypes = [baseType];
+                                    }
+                                    else {
+                                        type.resolvedBaseTypes.push(baseType);
+                                    }
                                 }
                                 else {
                                     error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */));
@@ -15895,13 +16604,13 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215 /* InterfaceDeclaration */) {
-                    if (declaration.flags & 524288 /* ContainsThis */) {
+                    if (declaration.flags & 262144 /* ContainsThis */) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
                     if (baseTypeNodes) {
-                        for (var _b = 0; _b < baseTypeNodes.length; _b++) {
-                            var node = baseTypeNodes[_b];
+                        for (var _b = 0, baseTypeNodes_1 = baseTypeNodes; _b < baseTypeNodes_1.length; _b++) {
+                            var node = baseTypeNodes_1[_b];
                             if (ts.isSupportedExpressionWithTypeArguments(node)) {
                                 var baseSymbol = resolveEntityName(node.expression, 793056 /* Type */, /*ignoreErrors*/ true);
                                 if (!baseSymbol || !(baseSymbol.flags & 64 /* Interface */) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
@@ -15937,7 +16646,7 @@ var ts;
                     type.typeArguments = type.typeParameters;
                     type.thisType = createType(512 /* TypeParameter */ | 33554432 /* ThisType */);
                     type.thisType.symbol = symbol;
-                    type.thisType.constraint = getTypeWithThisArgument(type);
+                    type.thisType.constraint = type;
                 }
             }
             return links.declaredType;
@@ -16091,8 +16800,8 @@ var ts;
         }
         function createSymbolTable(symbols) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                var symbol = symbols_1[_i];
                 result[symbol.name] = symbol;
             }
             return result;
@@ -16101,15 +16810,15 @@ var ts;
         // we check symbols to see if we can quickly conclude they are free of "this" references, thus needing no instantiation.
         function createInstantiatedSymbolTable(symbols, mapper, mappingThisOnly) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                var symbol = symbols_2[_i];
                 result[symbol.name] = mappingThisOnly && isIndependentMember(symbol) ? symbol : instantiateSymbol(symbol, mapper);
             }
             return result;
         }
         function addInheritedMembers(symbols, baseSymbols) {
-            for (var _i = 0; _i < baseSymbols.length; _i++) {
-                var s = baseSymbols[_i];
+            for (var _i = 0, baseSymbols_1 = baseSymbols; _i < baseSymbols_1.length; _i++) {
+                var s = baseSymbols_1[_i];
                 if (!ts.hasProperty(symbols, s.name)) {
                     symbols[s.name] = s;
                 }
@@ -16117,8 +16826,8 @@ var ts;
         }
         function addInheritedSignatures(signatures, baseSignatures) {
             if (baseSignatures) {
-                for (var _i = 0; _i < baseSignatures.length; _i++) {
-                    var signature = baseSignatures[_i];
+                for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
+                    var signature = baseSignatures_1[_i];
                     signatures.push(signature);
                 }
             }
@@ -16161,8 +16870,8 @@ var ts;
                     members = createSymbolTable(source.declaredProperties);
                 }
                 var thisArgument = ts.lastOrUndefined(typeArguments);
-                for (var _i = 0; _i < baseTypes.length; _i++) {
-                    var baseType = baseTypes[_i];
+                for (var _i = 0, baseTypes_1 = baseTypes; _i < baseTypes_1.length; _i++) {
+                    var baseType = baseTypes_1[_i];
                     var instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
@@ -16199,7 +16908,7 @@ var ts;
             return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
-            if (!getBaseTypes(classType).length) {
+            if (!hasClassBaseType(classType)) {
                 return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
@@ -16208,8 +16917,8 @@ var ts;
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
-            for (var _i = 0; _i < baseSignatures.length; _i++) {
-                var baseSig = baseSignatures[_i];
+            for (var _i = 0, baseSignatures_2 = baseSignatures; _i < baseSignatures_2.length; _i++) {
+                var baseSig = baseSignatures_2[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
                     var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
@@ -16238,8 +16947,8 @@ var ts;
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
         }
         function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
-            for (var _i = 0; _i < signatureList.length; _i++) {
-                var s = signatureList[_i];
+            for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
+                var s = signatureList_1[_i];
                 if (compareSignatures(s, signature, partialMatch, ignoreReturnTypes, compareTypes)) {
                     return s;
                 }
@@ -16303,8 +17012,8 @@ var ts;
         }
         function getUnionIndexType(types, kind) {
             var indexTypes = [];
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
+                var type = types_1[_i];
                 var indexType = getIndexTypeOfType(type, kind);
                 if (!indexType) {
                     return undefined;
@@ -16452,6 +17161,20 @@ var ts;
             type = getApparentType(type);
             return type.flags & 49152 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
         }
+        /**
+         * The apparent type of a type parameter is the base constraint instantiated with the type parameter
+         * as the type argument for the 'this' type.
+         */
+        function getApparentTypeOfTypeParameter(type) {
+            if (!type.resolvedApparentType) {
+                var constraintType = getConstraintOfTypeParameter(type);
+                while (constraintType && constraintType.flags & 512 /* TypeParameter */) {
+                    constraintType = getConstraintOfTypeParameter(constraintType);
+                }
+                type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type);
+            }
+            return type.resolvedApparentType;
+        }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
@@ -16459,12 +17182,7 @@ var ts;
          */
         function getApparentType(type) {
             if (type.flags & 512 /* TypeParameter */) {
-                do {
-                    type = getConstraintOfTypeParameter(type);
-                } while (type && type.flags & 512 /* TypeParameter */);
-                if (!type) {
-                    type = emptyObjectType;
-                }
+                type = getApparentTypeOfTypeParameter(type);
             }
             if (type.flags & 258 /* StringLike */) {
                 type = globalStringType;
@@ -16483,12 +17201,12 @@ var ts;
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
+                var current = types_2[_i];
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (32 /* Private */ | 64 /* Protected */))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 /* Private */ | 32 /* Protected */))) {
                         if (!props) {
                             props = [prop];
                         }
@@ -16510,8 +17228,8 @@ var ts;
             }
             var propTypes = [];
             var declarations = [];
-            for (var _a = 0; _a < props.length; _a++) {
-                var prop = props[_a];
+            for (var _a = 0, props_1 = props; _a < props_1.length; _a++) {
+                var prop = props_1[_a];
                 if (prop.declarations) {
                     ts.addRange(declarations, prop.declarations);
                 }
@@ -16629,7 +17347,7 @@ var ts;
             if (node.initializer) {
                 var signatureDeclaration = node.parent;
                 var signature = getSignatureFromDeclaration(signatureDeclaration);
-                var parameterIndex = signatureDeclaration.parameters.indexOf(node);
+                var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
                 ts.Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
@@ -16638,7 +17356,9 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 144 /* Constructor */ ? getDeclaredTypeOfClassOrInterface(declaration.parent.symbol) : undefined;
+                var classType = declaration.kind === 144 /* Constructor */ ?
+                    getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
+                    : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
@@ -16728,6 +17448,16 @@ var ts;
             }
             return result;
         }
+        function resolveExternalModuleTypeByLiteral(name) {
+            var moduleSym = resolveExternalModuleName(name, name);
+            if (moduleSym) {
+                var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                if (resolvedModuleSymbol) {
+                    return getTypeOfSymbol(resolvedModuleSymbol);
+                }
+            }
+            return anyType;
+        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -16867,8 +17597,8 @@ var ts;
         // that care about the presence of such types at arbitrary depth in a containing type.
         function getPropagatingFlagsOfTypes(types) {
             var result = 0;
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
+                var type = types_3[_i];
                 result |= type.flags;
             }
             return result & 14680064 /* PropagatingFlags */;
@@ -17018,8 +17748,8 @@ var ts;
         function getTypeOfGlobalSymbol(symbol, arity) {
             function getTypeDeclaration(symbol) {
                 var declarations = symbol.declarations;
-                for (var _i = 0; _i < declarations.length; _i++) {
-                    var declaration = declarations[_i];
+                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                    var declaration = declarations_3[_i];
                     switch (declaration.kind) {
                         case 214 /* ClassDeclaration */:
                         case 215 /* InterfaceDeclaration */:
@@ -17129,8 +17859,8 @@ var ts;
         // Add the given types to the given type set. Order is preserved, duplicates are removed,
         // and nested types of the given kind are flattened into the set.
         function addTypesToSet(typeSet, types, typeSetKind) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
+                var type = types_4[_i];
                 addTypeToSet(typeSet, type, typeSetKind);
             }
         }
@@ -17152,8 +17882,8 @@ var ts;
             }
         }
         function containsTypeAny(types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var type = types_5[_i];
                 if (isTypeAny(type)) {
                     return true;
                 }
@@ -17251,11 +17981,12 @@ var ts;
             return links.resolvedType;
         }
         function getStringLiteralType(node) {
-            if (ts.hasProperty(stringLiteralTypes, node.text)) {
-                return stringLiteralTypes[node.text];
+            var text = node.text;
+            if (ts.hasProperty(stringLiteralTypes, text)) {
+                return stringLiteralTypes[text];
             }
-            var type = stringLiteralTypes[node.text] = createType(256 /* StringLiteral */);
-            type.text = ts.getTextOfNode(node);
+            var type = stringLiteralTypes[text] = createType(256 /* StringLiteral */);
+            type.text = text;
             return type;
         }
         function getTypeFromStringLiteral(node) {
@@ -17269,7 +18000,8 @@ var ts;
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
             if (parent && (ts.isClassLike(parent) || parent.kind === 215 /* InterfaceDeclaration */)) {
-                if (!(container.flags & 128 /* Static */)) {
+                if (!(container.flags & 64 /* Static */) &&
+                    (container.kind !== 144 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -17336,8 +18068,8 @@ var ts;
         function instantiateList(items, mapper, instantiator) {
             if (items && items.length) {
                 var result = [];
-                for (var _i = 0; _i < items.length; _i++) {
-                    var v = items[_i];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var v = items_1[_i];
                     result.push(instantiator(v, mapper));
                 }
                 return result;
@@ -17376,8 +18108,8 @@ var ts;
                 case 2: return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
-                for (var _i = 0; _i < sources.length; _i++) {
-                    var source = sources[_i];
+                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
+                    var source = sources_1[_i];
                     if (t === source) {
                         return anyType;
                     }
@@ -17717,7 +18449,7 @@ var ts;
                     if (apparentType.flags & (80896 /* ObjectType */ | 32768 /* Intersection */) && target.flags & 80896 /* ObjectType */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                        if (result = objectTypeRelatedTo(apparentType, target, reportStructuralErrors)) {
+                        if (result = objectTypeRelatedTo(apparentType, source, target, reportStructuralErrors)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
@@ -17737,7 +18469,7 @@ var ts;
                             return result;
                         }
                     }
-                    return objectTypeRelatedTo(source, target, /*reportErrors*/ false);
+                    return objectTypeRelatedTo(source, source, target, /*reportErrors*/ false);
                 }
                 if (source.flags & 512 /* TypeParameter */ && target.flags & 512 /* TypeParameter */) {
                     return typeParameterIdenticalTo(source, target);
@@ -17763,39 +18495,40 @@ var ts;
                         resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
                         return true;
                     }
-                    return false;
                 }
-                if (type.flags & 49152 /* UnionOrIntersection */) {
+                else if (type.flags & 49152 /* UnionOrIntersection */) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
                     }
-                    return false;
                 }
-                return true;
+                return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (!isKnownProperty(target, prop.name)) {
-                        if (reportErrors) {
-                            // We know *exactly* where things went wrong when comparing the types.
-                            // Use this property as the error node as this will be more helpful in
-                            // reasoning about what went wrong.
-                            errorNode = prop.valueDeclaration;
-                            reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && someConstituentTypeHasKind(target, 80896 /* ObjectType */)) {
+                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        if (!isKnownProperty(target, prop.name)) {
+                            if (reportErrors) {
+                                // We know *exactly* where things went wrong when comparing the types.
+                                // Use this property as the error node as this will be more helpful in
+                                // reasoning about what went wrong.
+                                errorNode = prop.valueDeclaration;
+                                reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                            }
+                            return true;
                         }
-                        return true;
                     }
                 }
+                return false;
             }
             function eachTypeRelatedToSomeType(source, target) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
+                    var sourceType = sourceTypes_1[_i];
                     var related = typeRelatedToSomeType(sourceType, target, false);
                     if (!related) {
                         return 0 /* False */;
@@ -17817,8 +18550,8 @@ var ts;
             function typeRelatedToEachType(source, target, reportErrors) {
                 var result = -1 /* True */;
                 var targetTypes = target.types;
-                for (var _i = 0; _i < targetTypes.length; _i++) {
-                    var targetType = targetTypes[_i];
+                for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
+                    var targetType = targetTypes_1[_i];
                     var related = isRelatedTo(source, targetType, reportErrors);
                     if (!related) {
                         return 0 /* False */;
@@ -17840,8 +18573,8 @@ var ts;
             function eachTypeRelatedToType(source, target, reportErrors) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_2 = sourceTypes; _i < sourceTypes_2.length; _i++) {
+                    var sourceType = sourceTypes_2[_i];
                     var related = isRelatedTo(sourceType, target, reportErrors);
                     if (!related) {
                         return 0 /* False */;
@@ -17867,9 +18600,6 @@ var ts;
                 return result;
             }
             function typeParameterIdenticalTo(source, target) {
-                if (source.symbol.name !== target.symbol.name) {
-                    return 0 /* False */;
-                }
                 // covers case when both type parameters does not have constraint (both equal to noConstraintType)
                 if (source.constraint === target.constraint) {
                     return -1 /* True */;
@@ -17884,11 +18614,11 @@ var ts;
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
             // equal and infinitely expanding. Fourth, if we have reached a depth of 100 nested comparisons, assume we have runaway recursion
             // and issue an error. Otherwise, actually compare the structure of the two types.
-            function objectTypeRelatedTo(source, target, reportErrors) {
+            function objectTypeRelatedTo(apparentSource, originalSource, target, reportErrors) {
                 if (overflow) {
                     return 0 /* False */;
                 }
-                var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
+                var id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     // If we computed this relation already and it was failed and reported, or if we're not being asked to elaborate
@@ -17915,13 +18645,13 @@ var ts;
                     maybeStack = [];
                     expandingFlags = 0;
                 }
-                sourceStack[depth] = source;
+                sourceStack[depth] = apparentSource;
                 targetStack[depth] = target;
                 maybeStack[depth] = {};
                 maybeStack[depth][id] = 1 /* Succeeded */;
                 depth++;
                 var saveExpandingFlags = expandingFlags;
-                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack, depth))
+                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(apparentSource, sourceStack, depth))
                     expandingFlags |= 1;
                 if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth))
                     expandingFlags |= 2;
@@ -17930,15 +18660,15 @@ var ts;
                     result = 1 /* Maybe */;
                 }
                 else {
-                    result = propertiesRelatedTo(source, target, reportErrors);
+                    result = propertiesRelatedTo(apparentSource, target, reportErrors);
                     if (result) {
-                        result &= signaturesRelatedTo(source, target, 0 /* Call */, reportErrors);
+                        result &= signaturesRelatedTo(apparentSource, target, 0 /* Call */, reportErrors);
                         if (result) {
-                            result &= signaturesRelatedTo(source, target, 1 /* Construct */, reportErrors);
+                            result &= signaturesRelatedTo(apparentSource, target, 1 /* Construct */, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, target, reportErrors);
+                                result &= stringIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, target, reportErrors);
+                                    result &= numberIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 }
                             }
                         }
@@ -17966,8 +18696,8 @@ var ts;
                 var result = -1 /* True */;
                 var properties = getPropertiesOfObjectType(target);
                 var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 524288 /* ObjectLiteral */);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
+                    var targetProp = properties_1[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -17981,20 +18711,20 @@ var ts;
                         else if (!(targetProp.flags & 134217728 /* Prototype */)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 32 /* Private */ || targetPropFlags & 32 /* Private */) {
+                            if (sourcePropFlags & 16 /* Private */ || targetPropFlags & 16 /* Private */) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 32 /* Private */ && targetPropFlags & 32 /* Private */) {
+                                        if (sourcePropFlags & 16 /* Private */ && targetPropFlags & 16 /* Private */) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 32 /* Private */ ? source : target), typeToString(sourcePropFlags & 32 /* Private */ ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 /* Private */ ? source : target), typeToString(sourcePropFlags & 16 /* Private */ ? target : source));
                                         }
                                     }
                                     return 0 /* False */;
                                 }
                             }
-                            else if (targetPropFlags & 64 /* Protected */) {
+                            else if (targetPropFlags & 32 /* Protected */) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32 /* Class */;
                                 var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
                                 var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
@@ -18005,7 +18735,7 @@ var ts;
                                     return 0 /* False */;
                                 }
                             }
-                            else if (sourcePropFlags & 64 /* Protected */) {
+                            else if (sourcePropFlags & 32 /* Protected */) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -18047,8 +18777,8 @@ var ts;
                     return 0 /* False */;
                 }
                 var result = -1 /* True */;
-                for (var _i = 0; _i < sourceProperties.length; _i++) {
-                    var sourceProp = sourceProperties[_i];
+                for (var _i = 0, sourceProperties_1 = sourceProperties; _i < sourceProperties_1.length; _i++) {
+                    var sourceProp = sourceProperties_1[_i];
                     var targetProp = getPropertyOfObjectType(target, sourceProp.name);
                     if (!targetProp) {
                         return 0 /* False */;
@@ -18088,13 +18818,13 @@ var ts;
                         return result;
                     }
                 }
-                outer: for (var _i = 0; _i < targetSignatures.length; _i++) {
-                    var t = targetSignatures[_i];
+                outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
+                    var t = targetSignatures_1[_i];
                     if (!t.hasStringLiterals || target.flags & 262144 /* FromSignature */) {
                         var localErrors = reportErrors;
                         var checkedAbstractAssignability = false;
-                        for (var _a = 0; _a < sourceSignatures.length; _a++) {
-                            var s = sourceSignatures[_a];
+                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                            var s = sourceSignatures_1[_a];
                             if (!s.hasStringLiterals || source.flags & 262144 /* FromSignature */) {
                                 var related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
@@ -18125,8 +18855,8 @@ var ts;
                         var targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
                         var sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol);
                         var targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol);
-                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 256 /* Abstract */;
-                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 256 /* Abstract */;
+                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 128 /* Abstract */;
+                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 128 /* Abstract */;
                         if (sourceIsAbstract && !(targetIsAbstract && targetDecl)) {
                             // if target isn't a class-declaration type, then it can be new'd, so we forbid the assignment.
                             if (reportErrors) {
@@ -18235,12 +18965,17 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, target, reportErrors) {
+            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(0 /* String */, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 0 /* String */);
-                if (targetType && !(targetType.flags & 1 /* Any */)) {
+                if (targetType) {
+                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
+                        // non-primitive assignment to any is always allowed, eg
+                        //   `var x: { [index: string]: any } = { property: 12 };`
+                        return -1 /* True */;
+                    }
                     var sourceType = getIndexTypeOfType(source, 0 /* String */);
                     if (!sourceType) {
                         if (reportErrors) {
@@ -18259,12 +18994,17 @@ var ts;
                 }
                 return -1 /* True */;
             }
-            function numberIndexTypesRelatedTo(source, target, reportErrors) {
+            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(1 /* Number */, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 1 /* Number */);
-                if (targetType && !(targetType.flags & 1 /* Any */)) {
+                if (targetType) {
+                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
+                        // non-primitive assignment to any is always allowed, eg
+                        //   `var x: { [index: number]: any } = { property: 12 };`
+                        return -1 /* True */;
+                    }
                     var sourceStringType = getIndexTypeOfType(source, 0 /* String */);
                     var sourceNumberType = getIndexTypeOfType(source, 1 /* Number */);
                     if (!(sourceStringType || sourceNumberType)) {
@@ -18334,8 +19074,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1 /* True */;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (32 /* Private */ | 64 /* Protected */);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (32 /* Private */ | 64 /* Protected */);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 /* Private */ | 32 /* Protected */);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 /* Private */ | 32 /* Protected */);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0 /* False */;
             }
@@ -18351,18 +19091,29 @@ var ts;
             }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
+        function isMatchingSignature(source, target, partialMatch) {
+            // A source signature matches a target signature if the two signatures have the same number of required,
+            // optional, and rest parameters.
+            if (source.parameters.length === target.parameters.length &&
+                source.minArgumentCount === target.minArgumentCount &&
+                source.hasRestParameter === target.hasRestParameter) {
+                return true;
+            }
+            // A source signature partially matches a target signature if the target signature has no fewer required
+            // parameters and no more overall parameters than the source signature (where a signature with a rest
+            // parameter is always considered to have more overall parameters than one without).
+            if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter ||
+                source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) {
+                return true;
+            }
+            return false;
+        }
         function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
             if (source === target) {
                 return -1 /* True */;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
-                if (!partialMatch ||
-                    source.parameters.length < target.parameters.length && !source.hasRestParameter ||
-                    source.minArgumentCount > target.minArgumentCount) {
-                    return 0 /* False */;
-                }
+            if (!(isMatchingSignature(source, target, partialMatch))) {
+                return 0 /* False */;
             }
             var result = -1 /* True */;
             if (source.typeParameters && target.typeParameters) {
@@ -18384,11 +19135,10 @@ var ts;
             // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
             source = getErasedSignature(source);
             target = getErasedSignature(target);
-            var sourceLen = source.parameters.length;
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = source.hasRestParameter && i === sourceLen - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = target.hasRestParameter && i === targetLen - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0 /* False */;
@@ -18400,9 +19150,12 @@ var ts;
             }
             return result;
         }
+        function isRestParameterIndex(signature, parameterIndex) {
+            return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
+        }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var type = types_6[_i];
                 if (candidate !== type && !isTypeSubtypeOf(type, candidate))
                     return false;
             }
@@ -18454,6 +19207,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isStringLiteralType(type) {
+            return type.flags & 256 /* StringLiteral */;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -18638,8 +19394,8 @@ var ts;
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
-            for (var _i = 0; _i < typeParameters.length; _i++) {
-                var unused = typeParameters[_i];
+            for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                var unused = typeParameters_1[_i];
                 inferences.push({
                     primary: undefined, secondary: undefined, isFixed: false
                 });
@@ -18720,8 +19476,8 @@ var ts;
                     var typeParameterCount = 0;
                     var typeParameter;
                     // First infer to each type in union or intersection that isn't a type parameter
-                    for (var _i = 0; _i < targetTypes.length; _i++) {
-                        var t = targetTypes[_i];
+                    for (var _i = 0, targetTypes_2 = targetTypes; _i < targetTypes_2.length; _i++) {
+                        var t = targetTypes_2[_i];
                         if (t.flags & 512 /* TypeParameter */ && ts.contains(context.typeParameters, t)) {
                             typeParameter = t;
                             typeParameterCount++;
@@ -18743,8 +19499,8 @@ var ts;
                 else if (source.flags & 49152 /* UnionOrIntersection */) {
                     // Source is a union or intersection type, infer from each consituent type
                     var sourceTypes = source.types;
-                    for (var _a = 0; _a < sourceTypes.length; _a++) {
-                        var sourceType = sourceTypes[_a];
+                    for (var _a = 0, sourceTypes_3 = sourceTypes; _a < sourceTypes_3.length; _a++) {
+                        var sourceType = sourceTypes_3[_a];
                         inferFromTypes(sourceType, target);
                     }
                 }
@@ -18778,8 +19534,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                    var targetProp = properties_2[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -19126,7 +19882,7 @@ var ts;
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
                 // Check that type is not any, assumed result is true, and we have variable symbol on the left
-                if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) {
                     return type;
                 }
                 // Check that right operand is a function type with a prototype property
@@ -19157,6 +19913,12 @@ var ts;
                     }
                 }
                 if (targetType) {
+                    if (!assumeTrue) {
+                        if (type.flags & 16384 /* Union */) {
+                            return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); }));
+                        }
+                        return type;
+                    }
                     return getNarrowedType(type, targetType);
                 }
                 return type;
@@ -19266,31 +20028,39 @@ var ts;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
             if (languageVersion >= 2 /* ES6 */ ||
-                (symbol.flags & 2 /* BlockScopedVariable */) === 0 ||
+                (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
                 symbol.valueDeclaration.parent.kind === 244 /* CatchClause */) {
                 return;
             }
-            // - check if binding is used in some function
-            // (stop the walk when reaching container of binding declaration)
-            // - if first check succeeded - check if variable is declared inside the loop
-            // nesting structure:
-            // (variable declaration or binding element) -> variable declaration list -> container
-            var container = symbol.valueDeclaration;
-            while (container.kind !== 212 /* VariableDeclarationList */) {
-                container = container.parent;
+            // 1. walk from the use site up to the declaration and check
+            // if there is anything function like between declaration and use-site (is binding/class is captured in function).
+            // 2. walk from the declaration up to the boundary of lexical environment and check
+            // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
+            var container;
+            if (symbol.flags & 32 /* Class */) {
+                // get parent of class declaration
+                container = getClassLikeDeclarationOfSymbol(symbol).parent;
             }
-            // get the parent of variable declaration list
-            container = container.parent;
-            if (container.kind === 193 /* VariableStatement */) {
-                // if parent is variable statement - get its parent
+            else {
+                // nesting structure:
+                // (variable declaration or binding element) -> variable declaration list -> container
+                container = symbol.valueDeclaration;
+                while (container.kind !== 212 /* VariableDeclarationList */) {
+                    container = container.parent;
+                }
+                // get the parent of variable declaration list
                 container = container.parent;
+                if (container.kind === 193 /* VariableStatement */) {
+                    // if parent is variable statement - get its parent
+                    container = container.parent;
+                }
             }
             var inFunction = isInsideFunction(node.parent, container);
             var current = container;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
-                if (isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
+                if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
                     if (inFunction) {
-                        grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node));
+                        getNodeLinks(current).flags |= 65536 /* LoopWithBlockScopedBindingCapturedInFunction */;
                     }
                     // mark value declaration so during emit they can have a special handling
                     getNodeLinks(symbol.valueDeclaration).flags |= 16384 /* BlockScopedBindingInLoop */;
@@ -19336,7 +20106,7 @@ var ts;
                     break;
                 case 141 /* PropertyDeclaration */:
                 case 140 /* PropertySignature */:
-                    if (container.flags & 128 /* Static */) {
+                    if (container.flags & 64 /* Static */) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
@@ -19349,7 +20119,7 @@ var ts;
             }
             if (ts.isClassLike(container.parent)) {
                 var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 128 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return container.flags & 64 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
             }
             return anyType;
         }
@@ -19379,7 +20149,7 @@ var ts;
             var nodeCheckFlag = 0;
             // always set NodeCheckFlags for 'super' expression node
             if (canUseSuperExpression) {
-                if ((container.flags & 128 /* Static */) || isCallExpression) {
+                if ((container.flags & 64 /* Static */) || isCallExpression) {
                     nodeCheckFlag = 512 /* SuperStatic */;
                 }
                 else {
@@ -19435,7 +20205,7 @@ var ts;
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration
                     if (container && ts.isClassLike(container.parent)) {
-                        if (container.flags & 128 /* Static */) {
+                        if (container.flags & 64 /* Static */) {
                             return container.kind === 143 /* MethodDeclaration */ ||
                                 container.kind === 142 /* MethodSignature */ ||
                                 container.kind === 145 /* GetAccessor */ ||
@@ -19469,8 +20239,9 @@ var ts;
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
                         // If last parameter is contextually rest parameter get its type
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (funcHasRestParameters &&
+                            indexOfParameter === (func.parameters.length - 1) &&
+                            isRestParameterIndex(contextualSignature, func.parameters.length - 1)) {
                             return getTypeOfSymbol(ts.lastOrUndefined(contextualSignature.parameters));
                         }
                     }
@@ -19591,8 +20362,8 @@ var ts;
             var types = type.types;
             var mappedType;
             var mappedTypes;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
+                var current = types_7[_i];
                 var t = mapper(current);
                 if (t) {
                     if (!mappedType) {
@@ -19617,6 +20388,9 @@ var ts;
         function getIndexTypeOfContextualType(type, kind) {
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
+        function contextualTypeIsStringLiteralType(type) {
+            return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type));
+        }
         // Return true if the given contextual type is a tuple-like type
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
@@ -19638,7 +20412,7 @@ var ts;
         }
         function getContextualTypeForObjectLiteralElement(element) {
             var objectLiteral = element.parent;
-            var type = getContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral);
             if (type) {
                 if (!ts.hasDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
@@ -19661,7 +20435,7 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(node) {
             var arrayLiteral = node.parent;
-            var type = getContextualType(arrayLiteral);
+            var type = getApparentTypeOfContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
                 return getTypeOfPropertyOfContextualType(type, "" + index)
@@ -19694,11 +20468,28 @@ var ts;
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getContextualType(node) {
-            var type = getContextualTypeWorker(node);
+        function getApparentTypeOfContextualType(node) {
+            var type = getContextualType(node);
             return type && getApparentType(type);
         }
-        function getContextualTypeWorker(node) {
+        /**
+         * Woah! Do you really want to use this function?
+         *
+         * Unless you're trying to get the *non-apparent* type for a
+         * value-literal type or you're authoring relevant portions of this algorithm,
+         * you probably meant to use 'getApparentTypeOfContextualType'.
+         * Otherwise this may not be very useful.
+         *
+         * In cases where you *are* working on this function, you should understand
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'.
+         *
+         *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
+         *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
+         *
+         * @param node the expression whose contextual type will be returned.
+         * @returns the contextual type of an expression.
+         */
+        function getContextualType(node) {
             if (isInsideWithStatementBody(node)) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -19773,7 +20564,7 @@ var ts;
             ts.Debug.assert(node.kind !== 143 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+                : getApparentTypeOfContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -19782,8 +20573,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                var current = types_8[_i];
                 var signature = getNonGenericSignature(current);
                 if (signature) {
                     if (!signatureList) {
@@ -19863,8 +20654,8 @@ var ts;
             var hasSpreadElement = false;
             var elementTypes = [];
             var inDestructuringPattern = isAssignmentTarget(node);
-            for (var _i = 0; _i < elements.length; _i++) {
-                var e = elements[_i];
+            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                var e = elements_1[_i];
                 if (inDestructuringPattern && e.kind === 185 /* SpreadElementExpression */) {
                     // Given the following situation:
                     //    var c: {};
@@ -19899,7 +20690,7 @@ var ts;
                     type.pattern = node;
                     return type;
                 }
-                var contextualType = getContextualType(node);
+                var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
                     // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
@@ -19982,10 +20773,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = {};
             var propertiesArray = [];
-            var contextualType = getContextualType(node);
+            var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === 161 /* ObjectBindingPattern */ || contextualType.pattern.kind === 165 /* ObjectLiteralExpression */);
             var typeFlags = 0;
+            var patternWithComputedProperties = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
@@ -20013,8 +20805,11 @@ var ts;
                         if (isOptional) {
                             prop.flags |= 536870912 /* Optional */;
                         }
+                        if (ts.hasDynamicName(memberDecl)) {
+                            patternWithComputedProperties = true;
+                        }
                     }
-                    else if (contextualTypeHasPattern) {
+                    else if (contextualTypeHasPattern && !(contextualType.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */)) {
                         // If object literal is contextually typed by the implied type of a binding pattern, and if the
                         // binding pattern specifies a default value for the property, make the property optional.
                         var impliedProp = getPropertyOfType(contextualType, member.name);
@@ -20066,7 +20861,7 @@ var ts;
             var numberIndexType = getIndexType(1 /* Number */);
             var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */;
-            result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */);
+            result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
@@ -20132,9 +20927,6 @@ var ts;
                     case 234 /* JsxSelfClosingElement */:
                         checkJsxSelfClosingElement(child);
                         break;
-                    default:
-                        // No checks for JSX Text
-                        ts.Debug.assert(child.kind === 236 /* JsxText */);
                 }
             }
             return jsxElementType || anyType;
@@ -20199,8 +20991,8 @@ var ts;
         function checkJsxSpreadAttribute(node, elementAttributesType, nameTable) {
             var type = checkExpression(node.expression);
             var props = getPropertiesOfType(type);
-            for (var _i = 0; _i < props.length; _i++) {
-                var prop = props[_i];
+            for (var _i = 0, props_2 = props; _i < props_2.length; _i++) {
+                var prop = props_2[_i];
                 // Is there a corresponding property in the element attributes type? Skip checking of properties
                 // that have already been assigned to, as these are not actually pushed into the resulting type
                 if (!nameTable[prop.name]) {
@@ -20419,7 +21211,6 @@ var ts;
             var prop = getPropertyOfType(attributesType, attrib.name.text);
             return prop || unknownSymbol;
         }
-        var jsxElementClassType = undefined;
         function getJsxGlobalElementClassType() {
             if (!jsxElementClassType) {
                 jsxElementClassType = getExportedTypeFromNamespace(JsxNames.JSX, JsxNames.ElementClass);
@@ -20498,7 +21289,7 @@ var ts;
             return s.valueDeclaration ? s.valueDeclaration.kind : 141 /* PropertyDeclaration */;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 16 /* Public */ | 128 /* Static */ : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 8 /* Public */ | 64 /* Static */ : 0;
         }
         /**
          * Check whether the requested property access is valid.
@@ -20528,7 +21319,7 @@ var ts;
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
-                if (flags & 256 /* Abstract */) {
+                if (flags & 128 /* Abstract */) {
                     // A method cannot be accessed in a super property access if the method is abstract.
                     // This error could mask a private property access error. But, a member
                     // cannot simultaneously be private and abstract, so this will trigger an
@@ -20538,7 +21329,7 @@ var ts;
                 }
             }
             // Public properties are otherwise accessible.
-            if (!(flags & (32 /* Private */ | 64 /* Protected */))) {
+            if (!(flags & (16 /* Private */ | 32 /* Protected */))) {
                 return true;
             }
             // Property is known to be private or protected at this point
@@ -20546,7 +21337,7 @@ var ts;
             var enclosingClassDeclaration = ts.getContainingClass(node);
             var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
             // Private property is accessible if declaring and enclosing class are the same
-            if (flags & 32 /* Private */) {
+            if (flags & 16 /* Private */) {
                 if (declaringClass !== enclosingClass) {
                     error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
@@ -20564,7 +21355,7 @@ var ts;
                 return false;
             }
             // No further restrictions for static properties
-            if (flags & 128 /* Static */) {
+            if (flags & 64 /* Static */) {
                 return true;
             }
             // An instance property must be accessed through an instance of the enclosing class
@@ -20781,7 +21572,7 @@ var ts;
         // so order how inherited signatures are processed is still preserved.
         // interface A { (x: string): void }
         // interface B extends A { (x: 'foo'): string }
-        // let b: B;
+        // const b: B;
         // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void]
         function reorderCandidates(signatures, result) {
             var lastParent;
@@ -20791,8 +21582,8 @@ var ts;
             var specializedIndex = -1;
             var spliceIndex;
             ts.Debug.assert(!result.length);
-            for (var _i = 0; _i < signatures.length; _i++) {
-                var signature = signatures[_i];
+            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
+                var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
                 var parent_5 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
@@ -20894,7 +21685,7 @@ var ts;
             // If spread arguments are present, check that they correspond to a rest parameter. If so, no
             // further checking is necessary.
             if (spreadArgIndex >= 0) {
-                return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
+                return isRestParameterIndex(signature, spreadArgIndex);
             }
             // Too many arguments implies incorrect arity.
             if (!signature.hasRestParameter && adjustedArgCount > signature.parameters.length) {
@@ -21124,35 +21915,33 @@ var ts;
           */
         function getEffectiveDecoratorFirstArgumentType(node) {
             // The first argument to a decorator is its `target`.
-            switch (node.kind) {
-                case 214 /* ClassDeclaration */:
-                case 186 /* ClassExpression */:
-                    // For a class decorator, the `target` is the type of the class (e.g. the
-                    // "static" or "constructor" side of the class)
+            if (node.kind === 214 /* ClassDeclaration */) {
+                // For a class decorator, the `target` is the type of the class (e.g. the
+                // "static" or "constructor" side of the class)
+                var classSymbol = getSymbolOfNode(node);
+                return getTypeOfSymbol(classSymbol);
+            }
+            if (node.kind === 138 /* Parameter */) {
+                // For a parameter decorator, the `target` is the parent type of the
+                // parameter's containing method.
+                node = node.parent;
+                if (node.kind === 144 /* Constructor */) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
-                case 138 /* Parameter */:
-                    // For a parameter decorator, the `target` is the parent type of the
-                    // parameter's containing method.
-                    node = node.parent;
-                    if (node.kind === 144 /* Constructor */) {
-                        var classSymbol_1 = getSymbolOfNode(node);
-                        return getTypeOfSymbol(classSymbol_1);
-                    }
-                // fall-through
-                case 141 /* PropertyDeclaration */:
-                case 143 /* MethodDeclaration */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                    // For a property or method decorator, the `target` is the
-                    // "static"-side type of the parent of the member if the member is
-                    // declared "static"; otherwise, it is the "instance"-side type of the
-                    // parent of the member.
-                    return getParentTypeOfClassElement(node);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+                }
             }
+            if (node.kind === 141 /* PropertyDeclaration */ ||
+                node.kind === 143 /* MethodDeclaration */ ||
+                node.kind === 145 /* GetAccessor */ ||
+                node.kind === 146 /* SetAccessor */) {
+                // For a property or method decorator, the `target` is the
+                // "static"-side type of the parent of the member if the member is
+                // declared "static"; otherwise, it is the "instance"-side type of the
+                // parent of the member.
+                return getParentTypeOfClassElement(node);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         /**
           * Returns the effective type for the second argument to a decorator.
@@ -21171,49 +21960,46 @@ var ts;
           */
         function getEffectiveDecoratorSecondArgumentType(node) {
             // The second argument to a decorator is its `propertyKey`
-            switch (node.kind) {
-                case 214 /* ClassDeclaration */:
-                    ts.Debug.fail("Class decorators should not have a second synthetic argument.");
-                    return unknownType;
-                case 138 /* Parameter */:
-                    node = node.parent;
-                    if (node.kind === 144 /* Constructor */) {
-                        // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
-                        return anyType;
-                    }
-                // For a non-constructor parameter decorator, the `propertyKey` will be either
-                // a string or a symbol, based on the name of the parameter's containing method.
-                // fall-through
-                case 141 /* PropertyDeclaration */:
-                case 143 /* MethodDeclaration */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                    // The `propertyKey` for a property or method decorator will be a
-                    // string literal type if the member name is an identifier, number, or string;
-                    // otherwise, if the member name is a computed property name it will
-                    // be either string or symbol.
-                    var element = node;
-                    switch (element.name.kind) {
-                        case 69 /* Identifier */:
-                        case 8 /* NumericLiteral */:
-                        case 9 /* StringLiteral */:
-                            return getStringLiteralType(element.name);
-                        case 136 /* ComputedPropertyName */:
-                            var nameType = checkComputedPropertyName(element.name);
-                            if (allConstituentTypesHaveKind(nameType, 16777216 /* ESSymbol */)) {
-                                return nameType;
-                            }
-                            else {
-                                return stringType;
-                            }
-                        default:
-                            ts.Debug.fail("Unsupported property name.");
-                            return unknownType;
-                    }
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214 /* ClassDeclaration */) {
+                ts.Debug.fail("Class decorators should not have a second synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138 /* Parameter */) {
+                node = node.parent;
+                if (node.kind === 144 /* Constructor */) {
+                    // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
+                    return anyType;
+                }
+            }
+            if (node.kind === 141 /* PropertyDeclaration */ ||
+                node.kind === 143 /* MethodDeclaration */ ||
+                node.kind === 145 /* GetAccessor */ ||
+                node.kind === 146 /* SetAccessor */) {
+                // The `propertyKey` for a property or method decorator will be a
+                // string literal type if the member name is an identifier, number, or string;
+                // otherwise, if the member name is a computed property name it will
+                // be either string or symbol.
+                var element = node;
+                switch (element.name.kind) {
+                    case 69 /* Identifier */:
+                    case 8 /* NumericLiteral */:
+                    case 9 /* StringLiteral */:
+                        return getStringLiteralType(element.name);
+                    case 136 /* ComputedPropertyName */:
+                        var nameType = checkComputedPropertyName(element.name);
+                        if (allConstituentTypesHaveKind(nameType, 16777216 /* ESSymbol */)) {
+                            return nameType;
+                        }
+                        else {
+                            return stringType;
+                        }
+                    default:
+                        ts.Debug.fail("Unsupported property name.");
+                        return unknownType;
+                }
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         /**
           * Returns the effective argument type for the third argument to a decorator.
@@ -21225,27 +22011,28 @@ var ts;
         function getEffectiveDecoratorThirdArgumentType(node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
             // or its `parameterIndex` for a paramter decorator
-            switch (node.kind) {
-                case 214 /* ClassDeclaration */:
-                    ts.Debug.fail("Class decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 138 /* Parameter */:
-                    // The `parameterIndex` for a parameter decorator is always a number
-                    return numberType;
-                case 141 /* PropertyDeclaration */:
-                    ts.Debug.fail("Property decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 143 /* MethodDeclaration */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                    // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
-                    // for the type of the member.
-                    var propertyType = getTypeOfNode(node);
-                    return createTypedPropertyDescriptorType(propertyType);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214 /* ClassDeclaration */) {
+                ts.Debug.fail("Class decorators should not have a third synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138 /* Parameter */) {
+                // The `parameterIndex` for a parameter decorator is always a number
+                return numberType;
+            }
+            if (node.kind === 141 /* PropertyDeclaration */) {
+                ts.Debug.fail("Property decorators should not have a third synthetic argument.");
+                return unknownType;
+            }
+            if (node.kind === 143 /* MethodDeclaration */ ||
+                node.kind === 145 /* GetAccessor */ ||
+                node.kind === 146 /* SetAccessor */) {
+                // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
+                // for the type of the member.
+                var propertyType = getTypeOfNode(node);
+                return createTypedPropertyDescriptorType(propertyType);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         /**
           * Returns the effective argument type for the provided argument to a decorator.
@@ -21438,8 +22225,8 @@ var ts;
             //  declare function f(a: { xa: number; xb: number; });
             //  f({ |
             if (!produceDiagnostics) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var candidate = candidates[_i];
+                for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+                    var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
                             candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
@@ -21458,8 +22245,8 @@ var ts;
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
             }
             function chooseOverload(candidates, relation) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var originalCandidate = candidates[_i];
+                for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
+                    var originalCandidate = candidates_2[_i];
                     if (!hasCorrectArity(node, args, originalCandidate)) {
                         continue;
                     }
@@ -21596,7 +22383,7 @@ var ts;
             // In the case of a merged class-module or class-interface declaration,
             // only the class declaration node will have the Abstract flag set.
             var valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
-            if (valueDecl && valueDecl.flags & 256 /* Abstract */) {
+            if (valueDecl && valueDecl.flags & 128 /* Abstract */) {
                 error(node, ts.Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, ts.declarationNameToString(valueDecl.name));
                 return resolveErrorCall(node);
             }
@@ -21743,6 +22530,10 @@ var ts;
                     return anyType;
                 }
             }
+            // In JavaScript files, calls to any identifier 'require' are treated as external module imports
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+                return resolveExternalModuleTypeByLiteral(node.arguments[0]);
+            }
             return getReturnTypeOfSignature(signature);
         }
         function checkTaggedTemplateExpression(node) {
@@ -21753,7 +22544,10 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                if (!(isTypeAssignableTo(targetType, widenedType))) {
+                // Permit 'number[] | "foo"' to be asserted to 'string'.
+                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258 /* StringLike */) &&
+                    someConstituentTypeHasKind(widenedType, 258 /* StringLike */);
+                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
                     checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
                 }
             }
@@ -21771,7 +22565,7 @@ var ts;
                 var contextualParameterType = getTypeAtPosition(context, i);
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
             }
-            if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
+            if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
                 var parameter = ts.lastOrUndefined(signature.parameters);
                 var contextualParameterType = getTypeOfSymbol(ts.lastOrUndefined(context.parameters));
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
@@ -21784,7 +22578,9 @@ var ts;
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
                     if (element.kind !== 187 /* OmittedExpression */) {
-                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        if (element.name.kind === 69 /* Identifier */) {
+                            getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        }
                         assignBindingElementTypes(element);
                     }
                 }
@@ -21959,19 +22755,11 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function bodyContainsAReturnStatement(funcBody) {
-            return ts.forEachReturnStatement(funcBody, function (returnStatement) {
-                return true;
-            });
-        }
-        function bodyContainsSingleThrowStatement(body) {
-            return (body.statements.length === 1) && (body.statements[0].kind === 208 /* ThrowStatement */);
-        }
         // TypeScript Specification 1.0 (6.3) - July 2014
         // An explicitly typed function whose return type isn't the Void or the Any type
         // must have at least one return statement somewhere in its body.
         // An exception to this rule is if the function implementation consists of a single 'throw' statement.
-        function checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(func, returnType) {
+        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
             if (!produceDiagnostics) {
                 return;
             }
@@ -21980,22 +22768,19 @@ var ts;
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192 /* Block */) {
+            // also if HasImplicitReturnValue flags is not set this means that all codepaths in function body end with return of throw
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192 /* Block */ || !(func.flags & 524288 /* HasImplicitReturn */)) {
                 return;
             }
-            var bodyBlock = func.body;
-            // Ensure the body has at least one return expression.
-            if (bodyContainsAReturnStatement(bodyBlock)) {
-                return;
+            if (func.flags & 1048576 /* HasExplicitReturn */) {
+                if (compilerOptions.noImplicitReturns) {
+                    error(func.type, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
-            // If there are no return expressions, then we need to check if
-            // the function body consists solely of a throw statement;
-            // this is to make an exception for unimplemented functions.
-            if (bodyContainsSingleThrowStatement(bodyBlock)) {
-                return;
+            else {
+                // This function does not conform to the specification.
+                error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            // This function does not conform to the specification.
-            error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement);
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
             ts.Debug.assert(node.kind !== 143 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
@@ -22062,7 +22847,7 @@ var ts;
                 promisedType = checkAsyncFunctionReturnType(node);
             }
             if (returnType && !node.asteriskToken) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (node.body) {
                 if (!node.type) {
@@ -22147,7 +22932,7 @@ var ts;
                     case 69 /* Identifier */:
                     case 166 /* PropertyAccessExpression */: {
                         var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 32768 /* Const */) !== 0;
+                        return symbol && (symbol.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384 /* Const */) !== 0;
                     }
                     case 167 /* ElementAccessExpression */: {
                         var index = n.argumentExpression;
@@ -22155,7 +22940,7 @@ var ts;
                         if (symbol && index && index.kind === 9 /* StringLiteral */) {
                             var name_12 = index.text;
                             var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 32768 /* Const */) !== 0;
+                            return prop && (prop.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384 /* Const */) !== 0;
                         }
                         return false;
                     }
@@ -22240,8 +23025,8 @@ var ts;
             }
             if (type.flags & 49152 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                    var current = types_9[_i];
                     if (current.flags & kind) {
                         return true;
                     }
@@ -22257,8 +23042,8 @@ var ts;
             }
             if (type.flags & 49152 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                    var current = types_10[_i];
                     if (!(current.flags & kind)) {
                         return false;
                     }
@@ -22303,22 +23088,29 @@ var ts;
         }
         function checkObjectLiteralAssignment(node, sourceType, contextualMapper) {
             var properties = node.properties;
-            for (var _i = 0; _i < properties.length; _i++) {
-                var p = properties[_i];
+            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                var p = properties_3[_i];
                 if (p.kind === 245 /* PropertyAssignment */ || p.kind === 246 /* ShorthandPropertyAssignment */) {
-                    // TODO(andersh): Computed property support
                     var name_13 = p.name;
+                    if (name_13.kind === 136 /* ComputedPropertyName */) {
+                        checkComputedPropertyName(name_13);
+                    }
+                    if (isComputedNonLiteralName(name_13)) {
+                        continue;
+                    }
+                    var text = getTextOfPropertyName(name_13);
                     var type = isTypeAny(sourceType)
                         ? sourceType
-                        : getTypeOfPropertyOfType(sourceType, name_13.text) ||
-                            isNumericLiteralName(name_13.text) && getIndexTypeOfType(sourceType, 1 /* Number */) ||
+                        : getTypeOfPropertyOfType(sourceType, text) ||
+                            isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1 /* Number */) ||
                             getIndexTypeOfType(sourceType, 0 /* String */);
                     if (type) {
                         if (p.kind === 246 /* ShorthandPropertyAssignment */) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
-                            checkDestructuringAssignment(p.initializer || name_13, type);
+                            // non-shorthand property assignments should always have initializers 
+                            checkDestructuringAssignment(p.initializer, type);
                         }
                     }
                     else {
@@ -22519,6 +23311,10 @@ var ts;
                 case 31 /* ExclamationEqualsToken */:
                 case 32 /* EqualsEqualsEqualsToken */:
                 case 33 /* ExclamationEqualsEqualsToken */:
+                    // Permit 'number[] | "foo"' to be asserted to 'string'.
+                    if (someConstituentTypeHasKind(leftType, 258 /* StringLike */) && someConstituentTypeHasKind(rightType, 258 /* StringLike */)) {
+                        return booleanType;
+                    }
                     if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -22642,6 +23438,13 @@ var ts;
             var type2 = checkExpression(node.whenFalse, contextualMapper);
             return getUnionType([type1, type2]);
         }
+        function checkStringLiteralExpression(node) {
+            var contextualType = getContextualType(node);
+            if (contextualType && contextualTypeIsStringLiteralType(contextualType)) {
+                return getStringLiteralType(node);
+            }
+            return stringType;
+        }
         function checkTemplateExpression(node) {
             // We just want to check each expressions, but we are unconcerned with
             // the type of each expression, as any value may be coerced into a string.
@@ -22692,7 +23495,7 @@ var ts;
             if (isInferentialContext(contextualMapper)) {
                 var signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
-                    var contextualType = getContextualType(node);
+                    var contextualType = getApparentTypeOfContextualType(node);
                     if (contextualType) {
                         var contextualSignature = getSingleCallSignature(contextualType);
                         if (contextualSignature && !contextualSignature.typeParameters) {
@@ -22756,6 +23559,7 @@ var ts;
                 case 183 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 9 /* StringLiteral */:
+                    return checkStringLiteralExpression(node);
                 case 11 /* NoSubstitutionTemplateLiteral */:
                     return stringType;
                 case 10 /* RegularExpressionLiteral */:
@@ -22838,7 +23642,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 112 /* AccessibilityModifier */) {
+            if (node.flags & 56 /* AccessibilityModifier */) {
                 func = ts.getContainingFunction(node);
                 if (!(func.kind === 144 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
@@ -23038,7 +23842,7 @@ var ts;
             checkFunctionLikeDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (node.flags & 256 /* Abstract */ && node.body) {
+            if (node.flags & 128 /* Abstract */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -23089,7 +23893,7 @@ var ts;
             }
             function isInstancePropertyWithInitializer(n) {
                 return n.kind === 141 /* PropertyDeclaration */ &&
-                    !(n.flags & 128 /* Static */) &&
+                    !(n.flags & 64 /* Static */) &&
                     !!n.initializer;
             }
             // TS 1.0 spec (April 2014): 8.3.2
@@ -23110,14 +23914,14 @@ var ts;
                     // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 /* Public */ | 32 /* Private */ | 64 /* Protected */); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (8 /* Public */ | 16 /* Private */ | 32 /* Protected */); });
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         var superCallStatement;
-                        for (var _i = 0; _i < statements.length; _i++) {
-                            var statement = statements[_i];
+                        for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
+                            var statement = statements_2[_i];
                             if (statement.kind === 195 /* ExpressionStatement */ && isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
@@ -23145,8 +23949,15 @@ var ts;
                 // Grammar checking accessors
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 if (node.kind === 145 /* GetAccessor */) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && !(bodyContainsAReturnStatement(node.body) || bodyContainsSingleThrowStatement(node.body))) {
-                        error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement);
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288 /* HasImplicitReturn */)) {
+                        if (node.flags & 1048576 /* HasExplicitReturn */) {
+                            if (compilerOptions.noImplicitReturns) {
+                                error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                            }
+                        }
+                        else {
+                            error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
+                        }
                     }
                 }
                 if (!ts.hasDynamicName(node)) {
@@ -23155,7 +23966,7 @@ var ts;
                     var otherKind = node.kind === 145 /* GetAccessor */ ? 146 /* SetAccessor */ : 145 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 112 /* AccessibilityModifier */) !== (otherAccessor.flags & 112 /* AccessibilityModifier */))) {
+                        if (((node.flags & 56 /* AccessibilityModifier */) !== (otherAccessor.flags & 56 /* AccessibilityModifier */))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
                         var currentAccessorType = getAnnotatedAccessorType(node);
@@ -23226,7 +24037,7 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 32 /* Private */) && ts.isInAmbientContext(node);
+            return (node.flags & 16 /* Private */) && ts.isInAmbientContext(node);
         }
         function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
             if (!produceDiagnostics) {
@@ -23258,8 +24069,8 @@ var ts;
             else {
                 signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
             }
-            for (var _i = 0; _i < signaturesToCheck.length; _i++) {
-                var otherSignature = signaturesToCheck[_i];
+            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
+                var otherSignature = signaturesToCheck_1[_i];
                 if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) {
                     return;
                 }
@@ -23268,12 +24079,17 @@ var ts;
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
-            if (n.parent.kind !== 215 /* InterfaceDeclaration */ && ts.isInAmbientContext(n)) {
-                if (!(flags & 2 /* Ambient */)) {
+            // children of classes (even ambient classes) should not be marked as ambient or export
+            // because those flags have no useful semantics there.
+            if (n.parent.kind !== 215 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 214 /* ClassDeclaration */ &&
+                n.parent.kind !== 186 /* ClassExpression */ &&
+                ts.isInAmbientContext(n)) {
+                if (!(flags & 4 /* Ambient */)) {
                     // It is nested in an ambient context, which means it is automatically exported
-                    flags |= 1 /* Export */;
+                    flags |= 2 /* Export */;
                 }
-                flags |= 2 /* Ambient */;
+                flags |= 4 /* Ambient */;
             }
             return flags & flagsToCheck;
         }
@@ -23298,16 +24114,16 @@ var ts;
                     var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
                         var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 1 /* Export */) {
+                        if (deviation & 2 /* Export */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
                         }
-                        else if (deviation & 2 /* Ambient */) {
+                        else if (deviation & 4 /* Ambient */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (32 /* Private */ | 64 /* Protected */)) {
+                        else if (deviation & (16 /* Private */ | 32 /* Protected */)) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
-                        else if (deviation & 256 /* Abstract */) {
+                        else if (deviation & 128 /* Abstract */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
                         }
                     });
@@ -23324,7 +24140,7 @@ var ts;
                     });
                 }
             }
-            var flagsToCheck = 1 /* Export */ | 2 /* Ambient */ | 32 /* Private */ | 64 /* Protected */ | 256 /* Abstract */;
+            var flagsToCheck = 2 /* Export */ | 4 /* Ambient */ | 16 /* Private */ | 32 /* Protected */ | 128 /* Abstract */;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -23355,8 +24171,8 @@ var ts;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
                             // the only situation when this is possible (same kind\same name but different symbol) - mixed static and instance class members
                             ts.Debug.assert(node.kind === 143 /* MethodDeclaration */ || node.kind === 142 /* MethodSignature */);
-                            ts.Debug.assert((node.flags & 128 /* Static */) !== (subsequentNode.flags & 128 /* Static */));
-                            var diagnostic = node.flags & 128 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                            ts.Debug.assert((node.flags & 64 /* Static */) !== (subsequentNode.flags & 64 /* Static */));
+                            var diagnostic = node.flags & 64 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                             error(errorNode_1, diagnostic);
                             return;
                         }
@@ -23373,7 +24189,7 @@ var ts;
                 else {
                     // Report different errors regarding non-consecutive blocks of declarations depending on whether
                     // the node in question is abstract.
-                    if (node.flags & 256 /* Abstract */) {
+                    if (node.flags & 128 /* Abstract */) {
                         error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
                     }
                     else {
@@ -23386,8 +24202,8 @@ var ts;
             var isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & 1536 /* Module */;
             var duplicateFunctionDeclaration = false;
             var multipleConstructorImplementation = false;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var current = declarations[_i];
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
                 var inAmbientContextOrInterface = node.parent.kind === 215 /* InterfaceDeclaration */ || node.parent.kind === 155 /* TypeLiteral */ || inAmbientContext;
@@ -23444,7 +24260,7 @@ var ts;
             }
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & 256 /* Abstract */)) {
+                !(lastSeenNonAmbientDeclaration.flags & 128 /* Abstract */)) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
             if (hasOverloads) {
@@ -23470,8 +24286,8 @@ var ts;
                         // function g(x: string, y: string) { }
                         //
                         // The implementation is completely unrelated to the specialized signature, yet we do not check this.
-                        for (var _a = 0; _a < signatures.length; _a++) {
-                            var signature = signatures[_a];
+                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                            var signature = signatures_3[_a];
                             if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) {
                                 error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
                                 break;
@@ -23508,9 +24324,9 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 /* Export */ | 1024 /* Default */);
-                if (effectiveDeclarationFlags & 1 /* Export */) {
-                    if (effectiveDeclarationFlags & 1024 /* Default */) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 /* Export */ | 512 /* Default */);
+                if (effectiveDeclarationFlags & 2 /* Export */) {
+                    if (effectiveDeclarationFlags & 512 /* Default */) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
                     else {
@@ -23763,9 +24579,12 @@ var ts;
                 // type as a value. As such, we will just return unknownType;
                 return unknownType;
             }
-            var promiseConstructor = getMergedSymbol(promiseType.symbol);
+            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
             if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType));
+                var typeName = promiseConstructor
+                    ? symbolToString(promiseConstructor)
+                    : typeToString(promiseType);
+                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
                 return unknownType;
             }
             // Validate the promise constructor type.
@@ -23957,7 +24776,7 @@ var ts;
                 if (isAsync) {
                     promisedType = checkAsyncFunctionReturnType(node);
                 }
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (produceDiagnostics && !node.type) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
@@ -24070,7 +24889,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 248 /* SourceFile */ && ts.isExternalModule(parent)) {
+            if (parent.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -24088,18 +24907,18 @@ var ts;
             // A non-initialized declaration is a no-op as the block declaration will resolve before the var
             // declaration. the problem is if the declaration has an initializer. this will act as a write to the
             // block declared value. this is fine for let, but not const.
-            // Only consider declarations with initializers, uninitialized let declarations will not
+            // Only consider declarations with initializers, uninitialized const declarations will not
             // step on a let/const variable.
-            // Do not consider let and const declarations, as duplicate block-scoped declarations
+            // Do not consider const and const declarations, as duplicate block-scoped declarations
             // are handled by the binder.
-            // We are only looking for let declarations that step on let\const declarations from a
+            // We are only looking for const declarations that step on let\const declarations from a
             // different scope. e.g.:
             //      {
             //          const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration
-            //          let x = 0; // symbol for this declaration will be 'symbol'
+            //          const x = 0; // symbol for this declaration will be 'symbol'
             //      }
             // skip block-scoped variables and parameters
-            if ((ts.getCombinedNodeFlags(node) & 49152 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
+            if ((ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
             // skip variable declarations that don't have initializers
@@ -24114,7 +24933,7 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 49152 /* BlockScoped */) {
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576 /* BlockScoped */) {
                         var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 212 /* VariableDeclarationList */);
                         var container = varDeclList.parent.kind === 193 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
@@ -24183,6 +25002,12 @@ var ts;
                     checkExpressionCached(node.initializer);
                 }
             }
+            if (node.kind === 163 /* BindingElement */) {
+                // check computed properties inside property names of binding elements
+                if (node.propertyName && node.propertyName.kind === 136 /* ComputedPropertyName */) {
+                    checkComputedPropertyName(node.propertyName);
+                }
+            }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
@@ -24267,6 +25092,9 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
+            if (node.thenStatement.kind === 194 /* EmptyStatement */) {
+                error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
+            }
             checkSourceElement(node.elseStatement);
         }
         function checkDoStatement(node) {
@@ -24625,7 +25453,7 @@ var ts;
                         error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                     else if (func.kind === 144 /* Constructor */) {
-                        if (!isTypeAssignableTo(exprType, returnType)) {
+                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
@@ -24663,6 +25491,7 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258 /* StringLike */);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === 242 /* DefaultClause */ && !hasDuplicateDefaultClause) {
@@ -24682,6 +25511,10 @@ var ts;
                     // TypeScript 1.0 spec (April 2014):5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
                     var caseType = checkExpression(caseClause.expression);
+                    // Permit 'number[] | "foo"' to be asserted to 'string'.
+                    if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258 /* StringLike */)) {
+                        return;
+                    }
                     if (!isTypeAssignableTo(expressionType, caseType)) {
                         // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails
                         checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
@@ -24772,7 +25605,7 @@ var ts;
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
-                        if (!(member.flags & 128 /* Static */) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 64 /* Static */) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
@@ -24858,14 +25691,10 @@ var ts;
             return getTypeOfSymbol(getSymbolOfNode(node));
         }
         function checkClassDeclaration(node) {
-            if (!node.name && !(node.flags & 1024 /* Default */)) {
+            if (!node.name && !(node.flags & 512 /* Default */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
             checkClassLikeDeclaration(node);
-            // Interfaces cannot be merged with non-ambient classes.
-            if (getSymbolOfNode(node).flags & 64 /* Interface */ && !ts.isInAmbientContext(node)) {
-                error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-            }
             ts.forEach(node.members, checkSourceElement);
         }
         function checkClassLikeDeclaration(node) {
@@ -24916,8 +25745,8 @@ var ts;
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
             if (implementedTypeNodes) {
-                for (var _b = 0; _b < implementedTypeNodes.length; _b++) {
-                    var typeRefNode = implementedTypeNodes[_b];
+                for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
+                    var typeRefNode = implementedTypeNodes_1[_b];
                     if (!ts.isSupportedExpressionWithTypeArguments(typeRefNode)) {
                         error(typeRefNode.expression, ts.Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
                     }
@@ -24965,8 +25794,8 @@ var ts;
             // derived class instance member variables and accessors, but not by other kinds of members.
             // NOTE: assignability is checked in checkClassDeclaration
             var baseProperties = getPropertiesOfObjectType(baseType);
-            for (var _i = 0; _i < baseProperties.length; _i++) {
-                var baseProperty = baseProperties[_i];
+            for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
+                var baseProperty = baseProperties_1[_i];
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 134217728 /* Prototype */) {
                     continue;
@@ -24984,7 +25813,7 @@ var ts;
                         // It is an error to inherit an abstract member without implementing it or being declared abstract.
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
-                        if (baseDeclarationFlags & 256 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 256 /* Abstract */))) {
+                        if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 128 /* Abstract */))) {
                             if (derivedClassDecl.kind === 186 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
@@ -24996,11 +25825,11 @@ var ts;
                     else {
                         // derived overrides base.
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 32 /* Private */) || (derivedDeclarationFlags & 32 /* Private */)) {
+                        if ((baseDeclarationFlags & 16 /* Private */) || (derivedDeclarationFlags & 16 /* Private */)) {
                             // either base or derived property is private - not override, skip it
                             continue;
                         }
-                        if ((baseDeclarationFlags & 128 /* Static */) !== (derivedDeclarationFlags & 128 /* Static */)) {
+                        if ((baseDeclarationFlags & 64 /* Static */) !== (derivedDeclarationFlags & 64 /* Static */)) {
                             // value of 'static' is not the same for properties - not override, skip it
                             continue;
                         }
@@ -25071,11 +25900,11 @@ var ts;
             var seen = {};
             ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
             var ok = true;
-            for (var _i = 0; _i < baseTypes.length; _i++) {
-                var base = baseTypes[_i];
+            for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
+                var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var prop = properties[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     if (!ts.hasProperty(seen, prop.name)) {
                         seen[prop.name] = { prop: prop, containingType: base };
                     }
@@ -25122,16 +25951,6 @@ var ts;
                         checkIndexConstraints(type);
                     }
                 }
-                // Interfaces cannot merge with non-ambient classes.
-                if (symbol && symbol.declarations) {
-                    for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
-                        var declaration = _c[_b];
-                        if (declaration.kind === 214 /* ClassDeclaration */ && !ts.isInAmbientContext(declaration)) {
-                            error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-                            break;
-                        }
-                    }
-                }
             }
             ts.forEach(ts.getInterfaceBaseTypeNodes(node), function (heritageElement) {
                 if (!ts.isSupportedExpressionWithTypeArguments(heritageElement)) {
@@ -25160,11 +25979,14 @@ var ts;
                 var enumIsConst = ts.isConst(node);
                 for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                     var member = _a[_i];
-                    if (member.name.kind === 136 /* ComputedPropertyName */) {
+                    if (isComputedNonLiteralName(member.name)) {
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
-                    else if (isNumericLiteralName(member.name.text)) {
-                        error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                    else {
+                        var text = getTextOfPropertyName(member.name);
+                        if (isNumericLiteralName(text)) {
+                            error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                        }
                     }
                     var previousEnumMemberIsNonConstant = autoValue === undefined;
                     var initializer = member.initializer;
@@ -25382,8 +26204,8 @@ var ts;
         }
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
             var declarations = symbol.declarations;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
+                var declaration = declarations_5[_i];
                 if ((declaration.kind === 214 /* ClassDeclaration */ ||
                     (declaration.kind === 213 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
@@ -25522,7 +26344,7 @@ var ts;
                 // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -25550,7 +26372,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -25581,7 +26403,7 @@ var ts;
                 // If we hit an export in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -25625,7 +26447,7 @@ var ts;
                 return;
             }
             // Grammar checking
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69 /* Identifier */) {
@@ -25806,8 +26628,8 @@ var ts;
         }
         // Function and class expression bodies are checked after all statements in the enclosing body. This is
         // to ensure constructs like the following are permitted:
-        //     let foo = function () {
-        //        let s = foo();
+        //     const foo = function () {
+        //        const s = foo();
         //        return "hello";
         //     }
         // Here, performing a full type check of the body of the function expression whilst in the process of
@@ -25922,8 +26744,12 @@ var ts;
             if (!(links.flags & 1 /* TypeChecked */)) {
                 // Check whether the file has declared it is the default lib,
                 // and whether the user has specifically chosen to avoid checking it.
-                if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) {
-                    return;
+                if (compilerOptions.skipDefaultLibCheck) {
+                    // If the user specified '--noLib' and a file has a '/// <reference no-default-lib="true"/>',
+                    // then we should treat that file as a default lib.
+                    if (node.hasNoDefaultLib) {
+                        return;
+                    }
                 }
                 // Grammar checking
                 checkGrammarSourceFile(node);
@@ -25933,7 +26759,7 @@ var ts;
                 potentialThisCollisions.length = 0;
                 ts.forEach(node.statements, checkSourceElement);
                 checkFunctionAndClassExpressionBodies(node);
-                if (ts.isExternalModule(node)) {
+                if (ts.isExternalOrCommonJsModule(node)) {
                     checkExternalModuleExports(node);
                 }
                 if (potentialThisCollisions.length) {
@@ -26016,7 +26842,7 @@ var ts;
                     }
                     switch (location.kind) {
                         case 248 /* SourceFile */:
-                            if (!ts.isExternalModule(location)) {
+                            if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
                         case 218 /* ModuleDeclaration */:
@@ -26038,7 +26864,7 @@ var ts;
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
                             // Note: that the memberFlags come from previous iteration.
-                            if (!(memberFlags & 128 /* Static */)) {
+                            if (!(memberFlags & 64 /* Static */)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056 /* Type */);
                             }
                             break;
@@ -26339,7 +27165,7 @@ var ts;
           */
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 128 /* Static */
+            return node.flags & 64 /* Static */
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -26378,6 +27204,9 @@ var ts;
             return [symbol];
         }
         // Emitter support
+        function isArgumentsLocalBinding(node) {
+            return getReferencedValueSymbol(node) === argumentsSymbol;
+        }
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
         // node of the exported entity's container. Otherwise, return undefined.
         function getReferencedExportContainer(node) {
@@ -26650,21 +27479,30 @@ var ts;
                 collectLinkedAliases: collectLinkedAliases,
                 getReferencedValueDeclaration: getReferencedValueDeclaration,
                 getTypeReferenceSerializationKind: getTypeReferenceSerializationKind,
-                isOptionalParameter: isOptionalParameter
+                isOptionalParameter: isOptionalParameter,
+                isArgumentsLocalBinding: isArgumentsLocalBinding,
+                getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration
             };
         }
+        function getExternalModuleFileFromDeclaration(declaration) {
+            var specifier = ts.getExternalModuleName(declaration);
+            var moduleSymbol = getSymbolAtLocation(specifier);
+            if (!moduleSymbol) {
+                return undefined;
+            }
+            return ts.getDeclarationOfKind(moduleSymbol, 248 /* SourceFile */);
+        }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
             ts.forEach(host.getSourceFiles(), function (file) {
-                ts.bindSourceFile(file);
+                ts.bindSourceFile(file, compilerOptions);
             });
             // Initialize global symbol table
             ts.forEach(host.getSourceFiles(), function (file) {
-                if (!ts.isExternalModule(file)) {
+                if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
             });
-            // Initialize special symbols
             getSymbolLinks(undefinedSymbol).type = undefinedType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments");
             getSymbolLinks(unknownSymbol).type = unknownType;
@@ -26810,19 +27648,19 @@ var ts;
                             text = "private";
                             lastPrivate = modifier;
                         }
-                        if (flags & 112 /* AccessibilityModifier */) {
+                        if (flags & 56 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 128 /* Static */) {
+                        else if (flags & 64 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
                         else if (node.parent.kind === 219 /* ModuleBlock */ || node.parent.kind === 248 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
-                        else if (flags & 256 /* Abstract */) {
+                        else if (flags & 128 /* Abstract */) {
                             if (modifier.kind === 110 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
@@ -26833,10 +27671,10 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113 /* StaticKeyword */:
-                        if (flags & 128 /* Static */) {
+                        if (flags & 64 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
                         else if (node.parent.kind === 219 /* ModuleBlock */ || node.parent.kind === 248 /* SourceFile */) {
@@ -26845,23 +27683,23 @@ var ts;
                         else if (node.kind === 138 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
-                        else if (flags & 256 /* Abstract */) {
+                        else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 128 /* Static */;
+                        flags |= 64 /* Static */;
                         lastStatic = modifier;
                         break;
                     case 82 /* ExportKeyword */:
-                        if (flags & 1 /* Export */) {
+                        if (flags & 2 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 2 /* Ambient */) {
+                        else if (flags & 4 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
-                        else if (flags & 256 /* Abstract */) {
+                        else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (node.parent.kind === 214 /* ClassDeclaration */) {
@@ -26870,13 +27708,13 @@ var ts;
                         else if (node.kind === 138 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 1 /* Export */;
+                        flags |= 2 /* Export */;
                         break;
                     case 122 /* DeclareKeyword */:
-                        if (flags & 2 /* Ambient */) {
+                        if (flags & 4 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.parent.kind === 214 /* ClassDeclaration */) {
@@ -26888,69 +27726,69 @@ var ts;
                         else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 219 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 2 /* Ambient */;
+                        flags |= 4 /* Ambient */;
                         lastDeclare = modifier;
                         break;
                     case 115 /* AbstractKeyword */:
-                        if (flags & 256 /* Abstract */) {
+                        if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
                         if (node.kind !== 214 /* ClassDeclaration */) {
                             if (node.kind !== 143 /* MethodDeclaration */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
                             }
-                            if (!(node.parent.kind === 214 /* ClassDeclaration */ && node.parent.flags & 256 /* Abstract */)) {
+                            if (!(node.parent.kind === 214 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 128 /* Static */) {
+                            if (flags & 64 /* Static */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 32 /* Private */) {
+                            if (flags & 16 /* Private */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
-                        flags |= 256 /* Abstract */;
+                        flags |= 128 /* Abstract */;
                         break;
                     case 118 /* AsyncKeyword */:
-                        if (flags & 512 /* Async */) {
+                        if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 4 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.kind === 138 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
-                        flags |= 512 /* Async */;
+                        flags |= 256 /* Async */;
                         lastAsync = modifier;
                         break;
                 }
             }
             if (node.kind === 144 /* Constructor */) {
-                if (flags & 128 /* Static */) {
+                if (flags & 64 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & 256 /* Abstract */) {
+                if (flags & 128 /* Abstract */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 64 /* Protected */) {
+                else if (flags & 32 /* Protected */) {
                     return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
                 }
-                else if (flags & 32 /* Private */) {
+                else if (flags & 16 /* Private */) {
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
-                else if (flags & 512 /* Async */) {
+                else if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
                 return;
             }
-            else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && flags & 4 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 138 /* Parameter */ && (flags & 112 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 138 /* Parameter */ && (flags & 56 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
-            if (flags & 512 /* Async */) {
+            if (flags & 256 /* Async */) {
                 return checkGrammarAsyncModifier(node, lastAsync);
             }
         }
@@ -27051,7 +27889,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 2035 /* Modifier */) {
+            if (parameter.flags & 1022 /* Modifier */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -27071,7 +27909,7 @@ var ts;
             }
         }
         function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 2035 /* Modifier */) {
+            if (node.flags & 1022 /* Modifier */) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
             }
         }
@@ -27094,8 +27932,8 @@ var ts;
         function checkGrammarForOmittedArgument(node, args) {
             if (args) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                for (var _i = 0; _i < args.length; _i++) {
-                    var arg = args[_i];
+                for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
+                    var arg = args_1[_i];
                     if (arg.kind === 187 /* OmittedExpression */) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
@@ -27350,7 +28188,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 2035 /* Modifier */) {
+                    else if (parameter.flags & 1022 /* Modifier */) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -27363,7 +28201,7 @@ var ts;
             }
         }
         function checkGrammarForNonSymbolComputedProperty(node, message) {
-            if (node.kind === 136 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(node.expression)) {
+            if (ts.isDynamicName(node)) {
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -27404,19 +28242,6 @@ var ts;
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
-        function isIterationStatement(node, lookInLabeledStatements) {
-            switch (node.kind) {
-                case 199 /* ForStatement */:
-                case 200 /* ForInStatement */:
-                case 201 /* ForOfStatement */:
-                case 197 /* DoStatement */:
-                case 198 /* WhileStatement */:
-                    return true;
-                case 207 /* LabeledStatement */:
-                    return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-            }
-            return false;
-        }
         function checkGrammarBreakOrContinueStatement(node) {
             var current = node;
             while (current) {
@@ -27429,7 +28254,7 @@ var ts;
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
                             var isMisplacedContinueLabel = node.kind === 202 /* ContinueStatement */
-                                && !isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
+                                && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -27443,7 +28268,7 @@ var ts;
                         }
                         break;
                     default:
-                        if (isIterationStatement(current, /*lookInLabeledStatement*/ false) && !node.label) {
+                        if (ts.isIterationStatement(current, /*lookInLabeledStatement*/ false) && !node.label) {
                             // unlabeled break or continue within iteration statement - ok
                             return false;
                         }
@@ -27514,8 +28339,8 @@ var ts;
             }
             else {
                 var elements = name.elements;
-                for (var _i = 0; _i < elements.length; _i++) {
-                    var element = elements[_i];
+                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                    var element = elements_2[_i];
                     if (element.kind !== 187 /* OmittedExpression */) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
@@ -27639,17 +28464,20 @@ var ts;
             //  DeclarationElement:
             //     ExportAssignment
             //     export_opt   InterfaceDeclaration
+            //     export_opt   TypeAliasDeclaration
             //     export_opt   ImportDeclaration
             //     export_opt   ExternalImportDeclaration
             //     export_opt   AmbientDeclaration
             //
+            // TODO: The spec needs to be amended to reflect this grammar.
             if (node.kind === 215 /* InterfaceDeclaration */ ||
+                node.kind === 216 /* TypeAliasDeclaration */ ||
                 node.kind === 222 /* ImportDeclaration */ ||
                 node.kind === 221 /* ImportEqualsDeclaration */ ||
                 node.kind === 228 /* ExportDeclaration */ ||
                 node.kind === 227 /* ExportAssignment */ ||
-                (node.flags & 2 /* Ambient */) ||
-                (node.flags & (1 /* Export */ | 1024 /* Default */))) {
+                (node.flags & 4 /* Ambient */) ||
+                (node.flags & (2 /* Export */ | 512 /* Default */))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -27696,7 +28524,7 @@ var ts;
         }
         function checkGrammarNumericLiteral(node) {
             // Grammar checking
-            if (node.flags & 65536 /* OctalLiteral */ && languageVersion >= 1 /* ES5 */) {
+            if (node.flags & 32768 /* OctalLiteral */ && languageVersion >= 1 /* ES5 */) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -27732,11 +28560,15 @@ var ts;
         var writeTextOfNode;
         var writer = createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
-        var currentSourceFile;
+        var currentText;
+        var currentLineMap;
+        var currentIdentifiers;
+        var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
         var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        var noDeclare = !root;
         var moduleElementDeclarationEmitInfo = [];
         var asynchronousSubModuleDeclarationEmitInfo;
         // Contains the reference paths that needs to go in the declaration file.
@@ -27750,7 +28582,7 @@ var ts;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
                     // All the references that are not going to be part of same file
-                    if (referencedFile && ((referencedFile.flags & 8192 /* DeclarationFile */) ||
+                    if (referencedFile && ((referencedFile.flags & 4096 /* DeclarationFile */) ||
                         ts.shouldEmitToOwnFile(referencedFile, compilerOptions) ||
                         !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
@@ -27779,23 +28611,56 @@ var ts;
         else {
             // Emit references corresponding to this file
             var emittedReferencedFiles = [];
+            var prevModuleElementDeclarationEmitInfo = [];
             ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                if (!ts.isDeclarationFile(sourceFile)) {
                     // Check what references need to be added
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            // If the reference file is a declaration file or an external module, emit that reference
-                            if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) &&
+                            // If the reference file is a declaration file, emit that reference
+                            if (referencedFile && (ts.isDeclarationFile(referencedFile) &&
                                 !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
                         });
                     }
+                }
+                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                    noDeclare = false;
                     emitSourceFile(sourceFile);
                 }
+                else if (ts.isExternalModule(sourceFile)) {
+                    noDeclare = true;
+                    write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {");
+                    writeLine();
+                    increaseIndent();
+                    emitSourceFile(sourceFile);
+                    decreaseIndent();
+                    write("}");
+                    writeLine();
+                    // create asynchronous output for the importDeclarations
+                    if (moduleElementDeclarationEmitInfo.length) {
+                        var oldWriter = writer;
+                        ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
+                            if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
+                                ts.Debug.assert(aliasEmitInfo.node.kind === 222 /* ImportDeclaration */);
+                                createAndSetNewTextWriterWithSymbolWriter();
+                                ts.Debug.assert(aliasEmitInfo.indent === 1);
+                                increaseIndent();
+                                writeImportDeclaration(aliasEmitInfo.node);
+                                aliasEmitInfo.asynchronousOutput = writer.getText();
+                                decreaseIndent();
+                            }
+                        });
+                        setWriter(oldWriter);
+                    }
+                    prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
+                    moduleElementDeclarationEmitInfo = [];
+                }
             });
+            moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo);
         }
         return {
             reportedDeclarationError: reportedDeclarationError,
@@ -27804,13 +28669,12 @@ var ts;
             referencePathsOutput: referencePathsOutput
         };
         function hasInternalAnnotation(range) {
-            var text = currentSourceFile.text;
-            var comment = text.substring(range.pos, range.end);
+            var comment = currentText.substring(range.pos, range.end);
             return comment.indexOf("@internal") >= 0;
         }
         function stripInternal(node) {
             if (node) {
-                var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos);
                 if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
                     return;
                 }
@@ -27902,7 +28766,7 @@ var ts;
                 var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
                     }
                     else {
                         diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
@@ -27945,15 +28809,15 @@ var ts;
             }
         }
         function emitLines(nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+                var node = nodes_2[_i];
                 emit(node);
             }
         }
         function emitSeparatedList(nodes, separator, eachNodeEmitFn, canEmitFn) {
             var currentWriterPos = writer.getTextPos();
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+                var node = nodes_3[_i];
                 if (!canEmitFn || canEmitFn(node)) {
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(separator);
@@ -27968,10 +28832,10 @@ var ts;
         }
         function writeJsDocComments(declaration) {
             if (declaration) {
-                var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile);
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments);
+                var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange);
+                ts.emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange);
             }
         }
         function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) {
@@ -27988,7 +28852,7 @@ var ts;
                 case 103 /* VoidKeyword */:
                 case 97 /* ThisKeyword */:
                 case 9 /* StringLiteral */:
-                    return writeTextOfNode(currentSourceFile, type);
+                    return writeTextOfNode(currentText, type);
                 case 188 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(type);
                 case 151 /* TypeReference */:
@@ -28019,14 +28883,14 @@ var ts;
             }
             function writeEntityName(entityName) {
                 if (entityName.kind === 69 /* Identifier */) {
-                    writeTextOfNode(currentSourceFile, entityName);
+                    writeTextOfNode(currentText, entityName);
                 }
                 else {
                     var left = entityName.kind === 135 /* QualifiedName */ ? entityName.left : entityName.expression;
                     var right = entityName.kind === 135 /* QualifiedName */ ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
-                    writeTextOfNode(currentSourceFile, right);
+                    writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
@@ -28056,7 +28920,7 @@ var ts;
                 }
             }
             function emitTypePredicate(type) {
-                writeTextOfNode(currentSourceFile, type.parameterName);
+                writeTextOfNode(currentText, type.parameterName);
                 write(" is ");
                 emitType(type.type);
             }
@@ -28097,8 +28961,12 @@ var ts;
             }
         }
         function emitSourceFile(node) {
-            currentSourceFile = node;
+            currentText = node.text;
+            currentLineMap = ts.getLineStarts(node);
+            currentIdentifiers = node.identifiers;
+            isCurrentFileExternalModule = ts.isExternalModule(node);
             enclosingDeclaration = node;
+            ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true /* remove comments */);
             emitLines(node.statements);
         }
         // Return a temp variable name to be used in `export default` statements.
@@ -28107,13 +28975,13 @@ var ts;
         // do not need to keep track of created temp names.
         function getExportDefaultTempVariableName() {
             var baseName = "_default";
-            if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) {
+            if (!ts.hasProperty(currentIdentifiers, baseName)) {
                 return baseName;
             }
             var count = 0;
             while (true) {
                 var name_18 = baseName + "_" + (++count);
-                if (!ts.hasProperty(currentSourceFile.identifiers, name_18)) {
+                if (!ts.hasProperty(currentIdentifiers, name_18)) {
                     return name_18;
                 }
             }
@@ -28121,7 +28989,7 @@ var ts;
         function emitExportAssignment(node) {
             if (node.expression.kind === 69 /* Identifier */) {
                 write(node.isExportEquals ? "export = " : "export default ");
-                writeTextOfNode(currentSourceFile, node.expression);
+                writeTextOfNode(currentText, node.expression);
             }
             else {
                 // Expression
@@ -28159,7 +29027,7 @@ var ts;
                 writeModuleElement(node);
             }
             else if (node.kind === 221 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 248 /* SourceFile */ && ts.isExternalModule(currentSourceFile))) {
+                (node.parent.kind === 248 /* SourceFile */ && isCurrentFileExternalModule)) {
                 var isVisible;
                 if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248 /* SourceFile */) {
                     // Import declaration of another module that is visited async so lets put it in right spot
@@ -28213,30 +29081,30 @@ var ts;
         }
         function emitModuleElementDeclarationFlags(node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent === currentSourceFile) {
+            if (node.parent.kind === 248 /* SourceFile */) {
                 // If the node is exported
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     write("export ");
                 }
-                if (node.flags & 1024 /* Default */) {
+                if (node.flags & 512 /* Default */) {
                     write("default ");
                 }
-                else if (node.kind !== 215 /* InterfaceDeclaration */) {
+                else if (node.kind !== 215 /* InterfaceDeclaration */ && !noDeclare) {
                     write("declare ");
                 }
             }
         }
         function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 32 /* Private */) {
+            if (node.flags & 16 /* Private */) {
                 write("private ");
             }
-            else if (node.flags & 64 /* Protected */) {
+            else if (node.flags & 32 /* Protected */) {
                 write("protected ");
             }
-            if (node.flags & 128 /* Static */) {
+            if (node.flags & 64 /* Static */) {
                 write("static ");
             }
-            if (node.flags & 256 /* Abstract */) {
+            if (node.flags & 128 /* Abstract */) {
                 write("abstract ");
             }
         }
@@ -28244,11 +29112,11 @@ var ts;
             // note usage of writer. methods instead of aliases created, just to make sure we are using
             // correct writer especially to handle asynchronous alias writing
             emitJsDocComments(node);
-            if (node.flags & 1 /* Export */) {
+            if (node.flags & 2 /* Export */) {
                 write("export ");
             }
             write("import ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" = ");
             if (ts.isInternalModuleImportEqualsDeclaration(node)) {
                 emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError);
@@ -28256,7 +29124,7 @@ var ts;
             }
             else {
                 write("require(");
-                writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node));
+                writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 write(");");
             }
             writer.writeLine();
@@ -28279,19 +29147,19 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 1 /* Export */)) {
+            if (!node.importClause && !(node.flags & 2 /* Export */)) {
                 // do not write non-exported import declarations that don't have import clauses
                 return;
             }
             emitJsDocComments(node);
-            if (node.flags & 1 /* Export */) {
+            if (node.flags & 2 /* Export */) {
                 write("export ");
             }
             write("import ");
             if (node.importClause) {
                 var currentWriterPos = writer.getTextPos();
                 if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) {
-                    writeTextOfNode(currentSourceFile, node.importClause.name);
+                    writeTextOfNode(currentText, node.importClause.name);
                 }
                 if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) {
                     if (currentWriterPos !== writer.getTextPos()) {
@@ -28300,7 +29168,7 @@ var ts;
                     }
                     if (node.importClause.namedBindings.kind === 224 /* NamespaceImport */) {
                         write("* as ");
-                        writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name);
+                        writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
                     else {
                         write("{ ");
@@ -28310,16 +29178,28 @@ var ts;
                 }
                 write(" from ");
             }
-            writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+            emitExternalModuleSpecifier(node.moduleSpecifier);
             write(";");
             writer.writeLine();
         }
+        function emitExternalModuleSpecifier(moduleSpecifier) {
+            if (moduleSpecifier.kind === 9 /* StringLiteral */ && (!root) && (compilerOptions.out || compilerOptions.outFile)) {
+                var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent);
+                if (moduleName) {
+                    write("\"");
+                    write(moduleName);
+                    write("\"");
+                    return;
+                }
+            }
+            writeTextOfNode(currentText, moduleSpecifier);
+        }
         function emitImportOrExportSpecifier(node) {
             if (node.propertyName) {
-                writeTextOfNode(currentSourceFile, node.propertyName);
+                writeTextOfNode(currentText, node.propertyName);
                 write(" as ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
         }
         function emitExportSpecifier(node) {
             emitImportOrExportSpecifier(node);
@@ -28341,7 +29221,7 @@ var ts;
             }
             if (node.moduleSpecifier) {
                 write(" from ");
-                writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+                emitExternalModuleSpecifier(node.moduleSpecifier);
             }
             write(";");
             writer.writeLine();
@@ -28349,17 +29229,17 @@ var ts;
         function writeModuleDeclaration(node) {
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 131072 /* Namespace */) {
+            if (node.flags & 65536 /* Namespace */) {
                 write("namespace ");
             }
             else {
                 write("module ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             while (node.body.kind !== 219 /* ModuleBlock */) {
                 node = node.body;
                 write(".");
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
@@ -28378,7 +29258,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("type ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             emitTypeParameters(node.typeParameters);
             write(" = ");
             emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
@@ -28400,7 +29280,7 @@ var ts;
                 write("const ");
             }
             write("enum ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" {");
             writeLine();
             increaseIndent();
@@ -28411,7 +29291,7 @@ var ts;
         }
         function emitEnumMemberDeclaration(node) {
             emitJsDocComments(node);
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var enumMemberValue = resolver.getConstantValue(node);
             if (enumMemberValue !== undefined) {
                 write(" = ");
@@ -28421,14 +29301,14 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 143 /* MethodDeclaration */ && (node.parent.flags & 32 /* Private */);
+            return node.parent.kind === 143 /* MethodDeclaration */ && (node.parent.flags & 16 /* Private */);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
                 increaseIndent();
                 emitJsDocComments(node);
                 decreaseIndent();
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
@@ -28465,7 +29345,7 @@ var ts;
                             break;
                         case 143 /* MethodDeclaration */:
                         case 142 /* MethodSignature */:
-                            if (node.parent.flags & 128 /* Static */) {
+                            if (node.parent.flags & 64 /* Static */) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else if (node.parent.parent.kind === 214 /* ClassDeclaration */) {
@@ -28531,7 +29411,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 112 /* AccessibilityModifier */) {
+                        if (param.flags & 56 /* AccessibilityModifier */) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -28539,11 +29419,11 @@ var ts;
             }
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 256 /* Abstract */) {
+            if (node.flags & 128 /* Abstract */) {
                 write("abstract ");
             }
             write("class ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -28566,7 +29446,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("interface ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -28601,7 +29481,7 @@ var ts;
                     // If this node is a computed name, it can only be a symbol, because we've already skipped
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     // If optional property emit ?
                     if ((node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) && ts.hasQuestionToken(node)) {
                         write("?");
@@ -28609,7 +29489,7 @@ var ts;
                     if ((node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) && node.parent.kind === 155 /* TypeLiteral */) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 32 /* Private */)) {
+                    else if (!(node.flags & 16 /* Private */)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
@@ -28624,7 +29504,7 @@ var ts;
                 }
                 else if (node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
-                    if (node.flags & 128 /* Static */) {
+                    if (node.flags & 64 /* Static */) {
                         return symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -28683,7 +29563,7 @@ var ts;
                         emitBindingPattern(bindingElement.name);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, bindingElement.name);
+                        writeTextOfNode(currentText, bindingElement.name);
                         writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError);
                     }
                 }
@@ -28727,8 +29607,8 @@ var ts;
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
                 emitClassMemberDeclarationFlags(node);
-                writeTextOfNode(currentSourceFile, node.name);
-                if (!(node.flags & 32 /* Private */)) {
+                writeTextOfNode(currentText, node.name);
+                if (!(node.flags & 16 /* Private */)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
@@ -28757,7 +29637,7 @@ var ts;
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 146 /* SetAccessor */) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
-                    if (accessorWithTypeAnnotation.parent.flags & 128 /* Static */) {
+                    if (accessorWithTypeAnnotation.parent.flags & 64 /* Static */) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
@@ -28775,7 +29655,7 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 128 /* Static */) {
+                    if (accessorWithTypeAnnotation.flags & 64 /* Static */) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -28813,13 +29693,13 @@ var ts;
                 }
                 if (node.kind === 213 /* FunctionDeclaration */) {
                     write("function ");
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                 }
                 else if (node.kind === 144 /* Constructor */) {
                     write("constructor");
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if (ts.hasQuestionToken(node)) {
                         write("?");
                     }
@@ -28862,7 +29742,7 @@ var ts;
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 144 /* Constructor */ && !(node.flags & 32 /* Private */)) {
+            else if (node.kind !== 144 /* Constructor */ && !(node.flags & 16 /* Private */)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -28893,7 +29773,7 @@ var ts;
                         break;
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
-                        if (node.flags & 128 /* Static */) {
+                        if (node.flags & 64 /* Static */) {
                             diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -28943,7 +29823,7 @@ var ts;
                 emitBindingPattern(node.name);
             }
             else {
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             if (resolver.isOptionalParameter(node)) {
                 write("?");
@@ -28954,7 +29834,7 @@ var ts;
                 node.parent.parent.kind === 155 /* TypeLiteral */) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 32 /* Private */)) {
+            else if (!(node.parent.flags & 16 /* Private */)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
             function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
@@ -28985,7 +29865,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
-                        if (node.parent.flags & 128 /* Static */) {
+                        if (node.parent.flags & 64 /* Static */) {
                             return symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -29058,7 +29938,7 @@ var ts;
                         // Example:
                         //      original: function foo({y: [a,b,c]}) {}
                         //      emit    : declare function foo({y: [a, b, c]}: { y: [any, any, any] }) void;
-                        writeTextOfNode(currentSourceFile, bindingElement.propertyName);
+                        writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
                     }
                     if (bindingElement.name) {
@@ -29081,7 +29961,7 @@ var ts;
                             if (bindingElement.dotDotDotToken) {
                                 write("...");
                             }
-                            writeTextOfNode(currentSourceFile, bindingElement.name);
+                            writeTextOfNode(currentText, bindingElement.name);
                         }
                     }
                 }
@@ -29127,7 +30007,7 @@ var ts;
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 8192 /* DeclarationFile */
+            var declFileName = referencedFile.flags & 4096 /* DeclarationFile */
                 ? referencedFile.fileName // Declaration file, use declaration file name
                 : ts.shouldEmitToOwnFile(referencedFile, compilerOptions)
                     ? ts.getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file
@@ -29173,6 +30053,24 @@ var ts;
         return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile);
     }
     ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile;
+    function getResolvedExternalModuleName(host, file) {
+        return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || ts.isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
+    var Jump;
+    (function (Jump) {
+        Jump[Jump["Break"] = 2] = "Break";
+        Jump[Jump["Continue"] = 4] = "Continue";
+        Jump[Jump["Return"] = 8] = "Return";
+    })(Jump || (Jump = {}));
     var entities = {
         "quot": 0x0022,
         "amp": 0x0026,
@@ -29454,15 +30352,19 @@ var ts;
         var newLine = host.getNewLine();
         var jsxDesugaring = host.getCompilerOptions().jsx !== 1 /* Preserve */;
         var shouldEmitJsx = function (s) { return (s.languageVariant === 1 /* JSX */ && !jsxDesugaring); };
+        var outFile = compilerOptions.outFile || compilerOptions.out;
+        var emitJavaScript = createFileEmitter();
         if (targetSourceFile === undefined) {
-            ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
-                    var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
-                    emitFile(jsFilePath, sourceFile);
-                }
-            });
-            if (compilerOptions.outFile || compilerOptions.out) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            if (outFile) {
+                emitFile(outFile);
+            }
+            else {
+                ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                    if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
+                        var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
+                        emitFile(jsFilePath, sourceFile);
+                    }
+                });
             }
         }
         else {
@@ -29471,8 +30373,8 @@ var ts;
                 var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
                 emitFile(jsFilePath, targetSourceFile);
             }
-            else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            else if (!ts.isDeclarationFile(targetSourceFile) && outFile) {
+                emitFile(outFile);
             }
         }
         // Sort and make the unique list of diagnostics
@@ -29482,16 +30384,8 @@ var ts;
             diagnostics: diagnostics,
             sourceMaps: sourceMapDataList
         };
-        function isNodeDescendentOf(node, ancestor) {
-            while (node) {
-                if (node === ancestor)
-                    return true;
-                node = node.parent;
-            }
-            return false;
-        }
         function isUniqueLocalName(name, container) {
-            for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
+            for (var node = container; ts.isNodeDescendentOf(node, container); node = node.nextContainer) {
                 if (node.locals && ts.hasProperty(node.locals, name)) {
                     // We conservatively include alias symbols to cover cases where they're emitted as locals
                     if (node.locals[name].flags & (107455 /* Value */ | 1048576 /* ExportValue */ | 8388608 /* Alias */)) {
@@ -29501,10 +30395,47 @@ var ts;
             }
             return true;
         }
-        function emitJavaScript(jsFilePath, root) {
+        function setLabeledJump(state, isBreak, labelText, labelMarker) {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = {};
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = {};
+                }
+                state.labeledNonLocalContinues[labelText] = labelMarker;
+            }
+        }
+        function hoistVariableDeclarationFromLoop(state, declaration) {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+            visit(declaration.name);
+            function visit(node) {
+                if (node.kind === 69 /* Identifier */) {
+                    state.hoistedLocalVariables.push(node);
+                }
+                else {
+                    for (var _a = 0, _b = node.elements; _a < _b.length; _a++) {
+                        var element = _b[_a];
+                        visit(element.name);
+                    }
+                }
+            }
+        }
+        function createFileEmitter() {
             var writer = ts.createTextWriter(newLine);
             var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent;
             var currentSourceFile;
+            var currentText;
+            var currentLineMap;
+            var currentFileIdentifiers;
+            var renamedDependencies;
+            var isEs6Module;
+            var isCurrentFileExternalModule;
             // name of an exporter function if file is a System external module
             // System.register([...], function (<exporter>) {...})
             // exporting in System modules looks like:
@@ -29512,14 +30443,15 @@ var ts;
             // =>
             // var x;... exporter("x", x = 1)
             var exportFunctionForFile;
-            var generatedNameSet = {};
-            var nodeToGeneratedName = [];
+            var generatedNameSet;
+            var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
-            var extendsEmitted = false;
-            var decorateEmitted = false;
-            var paramEmitted = false;
-            var awaiterEmitted = false;
-            var tempFlags = 0;
+            var convertedLoopState;
+            var extendsEmitted;
+            var decorateEmitted;
+            var paramEmitted;
+            var awaiterEmitted;
+            var tempFlags;
             var tempVariables;
             var tempParameters;
             var externalImports;
@@ -29551,6 +30483,8 @@ var ts;
             var scopeEmitEnd = function () { };
             /** Sourcemap data that will get encoded */
             var sourceMapData;
+            /** The root file passed to the emit function (if present) */
+            var root;
             /** If removeComments is true, no leading-comments needed to be emitted **/
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var moduleEmitDelegates = (_a = {},
@@ -29561,31 +30495,77 @@ var ts;
                 _a[1 /* CommonJS */] = emitCommonJSModule,
                 _a
             );
-            if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
-                initializeEmitterWithSourceMaps();
-            }
-            if (root) {
-                // Do not call emit directly. It does not set the currentSourceFile.
-                emitSourceFile(root);
-            }
-            else {
-                ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emitSourceFile(sourceFile);
+            var bundleEmitDelegates = (_b = {},
+                _b[5 /* ES6 */] = function () { },
+                _b[2 /* AMD */] = emitAMDModule,
+                _b[4 /* System */] = emitSystemModule,
+                _b[3 /* UMD */] = function () { },
+                _b[1 /* CommonJS */] = function () { },
+                _b
+            );
+            return doEmit;
+            function doEmit(jsFilePath, rootFile) {
+                // reset the state
+                writer.reset();
+                currentSourceFile = undefined;
+                currentText = undefined;
+                currentLineMap = undefined;
+                exportFunctionForFile = undefined;
+                generatedNameSet = {};
+                nodeToGeneratedName = [];
+                computedPropertyNamesToGeneratedNames = undefined;
+                convertedLoopState = undefined;
+                extendsEmitted = false;
+                decorateEmitted = false;
+                paramEmitted = false;
+                awaiterEmitted = false;
+                tempFlags = 0;
+                tempVariables = undefined;
+                tempParameters = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStars = undefined;
+                detachedCommentsInfo = undefined;
+                sourceMapData = undefined;
+                isEs6Module = false;
+                renamedDependencies = undefined;
+                isCurrentFileExternalModule = false;
+                root = rootFile;
+                if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
+                    initializeEmitterWithSourceMaps(jsFilePath, root);
+                }
+                if (root) {
+                    // Do not call emit directly. It does not set the currentSourceFile.
+                    emitSourceFile(root);
+                }
+                else {
+                    if (modulekind) {
+                        ts.forEach(host.getSourceFiles(), emitEmitHelpers);
                     }
-                });
+                    ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                        if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) {
+                            emitSourceFile(sourceFile);
+                        }
+                    });
+                }
+                writeLine();
+                writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
             }
-            writeLine();
-            writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM);
-            return;
             function emitSourceFile(sourceFile) {
                 currentSourceFile = sourceFile;
+                currentText = sourceFile.text;
+                currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
+                renamedDependencies = sourceFile.renamedDependencies;
+                currentFileIdentifiers = sourceFile.identifiers;
+                isCurrentFileExternalModule = ts.isExternalModule(sourceFile);
                 emit(sourceFile);
             }
             function isUniqueName(name) {
                 return !resolver.hasGlobalName(name) &&
-                    !ts.hasProperty(currentSourceFile.identifiers, name) &&
+                    !ts.hasProperty(currentFileIdentifiers, name) &&
                     !ts.hasProperty(generatedNameSet, name);
             }
             // Return the next available name in the pattern _a ... _z, _0, _1, ...
@@ -29668,7 +30648,7 @@ var ts;
                 var id = ts.getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
-            function initializeEmitterWithSourceMaps() {
+            function initializeEmitterWithSourceMaps(jsFilePath, root) {
                 var sourceMapDir; // The directory in which sourcemap will be
                 // Current source map file and its index in the sources list
                 var sourceMapSourceIndex = -1;
@@ -29756,7 +30736,7 @@ var ts;
                     }
                 }
                 function recordSourceMapSpan(pos) {
-                    var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos);
+                    var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos);
                     // Convert the location to be one-based.
                     sourceLinePos.line++;
                     sourceLinePos.character++;
@@ -29790,13 +30770,13 @@ var ts;
                 }
                 function recordEmitNodeStartSpan(node) {
                     // Get the token pos after skipping to the token (ignoring the leading trivia)
-                    recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos));
+                    recordSourceMapSpan(ts.skipTrivia(currentText, node.pos));
                 }
                 function recordEmitNodeEndSpan(node) {
                     recordSourceMapSpan(node.end);
                 }
                 function writeTextWithSpanRecord(tokenKind, startPos, emitFn) {
-                    var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
+                    var tokenStartPos = ts.skipTrivia(currentText, startPos);
                     recordSourceMapSpan(tokenStartPos);
                     var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
                     recordSourceMapSpan(tokenEndPos);
@@ -29878,9 +30858,9 @@ var ts;
                     sourceMapNameIndices.pop();
                 }
                 ;
-                function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) {
+                function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) {
                     recordSourceMapSpan(comment.pos);
-                    ts.writeCommentRange(currentSourceFile, writer, comment, newLine);
+                    ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine);
                     recordSourceMapSpan(comment.end);
                 }
                 function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) {
@@ -29910,7 +30890,7 @@ var ts;
                         return output;
                     }
                 }
-                function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) {
+                function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) {
                     encodeLastRecordedSourceMapSpan();
                     var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent);
                     sourceMapDataList.push(sourceMapData);
@@ -29926,7 +30906,7 @@ var ts;
                         sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL;
                     }
                     // Write sourcemap url to the js file and write the js file
-                    writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark);
+                    writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark);
                 }
                 // Initialize source map data
                 var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath));
@@ -29998,7 +30978,7 @@ var ts;
                 scopeEmitEnd = recordScopeNameEnd;
                 writeComment = writeCommentRangeWithMap;
             }
-            function writeJavaScriptFile(emitOutput, writeByteOrderMark) {
+            function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) {
                 ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
             // Create a temporary variable with a unique unused name.
@@ -30178,7 +31158,7 @@ var ts;
                 // If we don't need to downlevel and we can reach the original source text using
                 // the node's parent reference, then simply get the text as it was originally written.
                 if (node.parent) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                    return ts.getTextOfNodeFromSourceText(currentText, node);
                 }
                 // If we can't reach the original source text, use the canonical form if it's a number,
                 // or an escaped quoted form of the original text if it's string-like.
@@ -30205,7 +31185,7 @@ var ts;
                 // Find original source text, since we need to emit the raw strings of the tagged template.
                 // The raw strings contain the (escaped) strings of what the user wrote.
                 // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-                var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                var text = ts.getTextOfNodeFromSourceText(currentText, node);
                 // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
                 // thus we need to remove those characters.
                 // First template piece starts with "`", others with "}"
@@ -30622,7 +31602,7 @@ var ts;
                         write(node.text);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, node);
+                        writeTextOfNode(currentText, node);
                     }
                     write("\"");
                 }
@@ -30708,41 +31688,45 @@ var ts;
                         write(".");
                     }
                 }
-                else if (modulekind !== 5 /* ES6 */) {
-                    var declaration = resolver.getReferencedImportDeclaration(node);
-                    if (declaration) {
-                        if (declaration.kind === 223 /* ImportClause */) {
-                            // Identifier references default import
-                            write(getGeneratedNameForNode(declaration.parent));
-                            write(languageVersion === 0 /* ES3 */ ? "[\"default\"]" : ".default");
-                            return;
-                        }
-                        else if (declaration.kind === 226 /* ImportSpecifier */) {
-                            // Identifier references named import
-                            write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                            var name_23 = declaration.propertyName || declaration.name;
-                            var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_23);
-                            if (languageVersion === 0 /* ES3 */ && identifier === "default") {
-                                write("[\"default\"]");
+                else {
+                    if (modulekind !== 5 /* ES6 */) {
+                        var declaration = resolver.getReferencedImportDeclaration(node);
+                        if (declaration) {
+                            if (declaration.kind === 223 /* ImportClause */) {
+                                // Identifier references default import
+                                write(getGeneratedNameForNode(declaration.parent));
+                                write(languageVersion === 0 /* ES3 */ ? "[\"default\"]" : ".default");
+                                return;
                             }
-                            else {
-                                write(".");
-                                write(identifier);
+                            else if (declaration.kind === 226 /* ImportSpecifier */) {
+                                // Identifier references named import
+                                write(getGeneratedNameForNode(declaration.parent.parent.parent));
+                                var name_23 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_23);
+                                if (languageVersion === 0 /* ES3 */ && identifier === "default") {
+                                    write("[\"default\"]");
+                                }
+                                else {
+                                    write(".");
+                                    write(identifier);
+                                }
+                                return;
                             }
-                            return;
                         }
                     }
-                    declaration = resolver.getReferencedNestedRedeclaration(node);
-                    if (declaration) {
-                        write(getGeneratedNameForNode(declaration.name));
-                        return;
+                    if (languageVersion !== 2 /* ES6 */) {
+                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                        if (declaration) {
+                            write(getGeneratedNameForNode(declaration.name));
+                            return;
+                        }
                     }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function isNameOfNestedRedeclaration(node) {
@@ -30759,6 +31743,14 @@ var ts;
                 return false;
             }
             function emitIdentifier(node) {
+                if (convertedLoopState) {
+                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
+                        // in converted loop body arguments cannot be used directly.
+                        var name_24 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_24);
+                        return;
+                    }
+                }
                 if (!node.parent) {
                     write(node.text);
                 }
@@ -30772,7 +31764,7 @@ var ts;
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function emitThis(node) {
@@ -30933,7 +31925,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ (node.flags & 2048 /* MultiLine */) !== 0, 
+                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ (node.flags & 1024 /* MultiLine */) !== 0, 
                     /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true);
                 }
             }
@@ -30952,7 +31944,7 @@ var ts;
                         emitLinePreservingList(node, properties, /* allowTrailingComma */ languageVersion >= 1 /* ES5 */, /* spacesBetweenBraces */ true);
                     }
                     else {
-                        var multiLine = (node.flags & 2048 /* MultiLine */) !== 0;
+                        var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -30971,7 +31963,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 2048 /* MultiLine */) !== 0;
+                var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -31176,7 +32168,7 @@ var ts;
             function emitShorthandPropertyAssignment(node) {
                 // The name property of a short-hand property assignment is considered an expression position, so here
                 // we manually emit the identifier to avoid rewriting.
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier,
                 // we emit a normal property assignment. For example:
                 //   module m {
@@ -31186,7 +32178,7 @@ var ts;
                 //       let obj = { y };
                 //   }
                 // Here we need to emit obj = { y : m.y } regardless of the output target.
-                if (languageVersion < 2 /* ES6 */ || isNamespaceExportReference(node.name)) {
+                if (modulekind !== 5 /* ES6 */ || isNamespaceExportReference(node.name)) {
                     // Emit identifier as an identifier
                     write(": ");
                     emit(node.name);
@@ -31243,11 +32235,11 @@ var ts;
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 // 1 .toString is a valid property access, emit a space after the literal
                 // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal
-                var shouldEmitSpace;
+                var shouldEmitSpace = false;
                 if (!indentedBeforeDot) {
                     if (node.expression.kind === 8 /* NumericLiteral */) {
                         // check if numeric literal was originally written with a dot
-                        var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression);
+                        var text = ts.getTextOfNodeFromSourceText(currentText, node.expression);
                         shouldEmitSpace = text.indexOf(ts.tokenToString(21 /* DotToken */)) < 0;
                     }
                     else {
@@ -31594,13 +32586,13 @@ var ts;
              *   we we emit variable statement 'var' should be dropped.
              */
             function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
-                if (!node || languageVersion >= 2 /* ES6 */ || !isCurrentFileSystemExternalModule()) {
+                if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
                 var current = node;
                 while (current) {
                     if (current.kind === 248 /* SourceFile */) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1 /* Export */) !== 0);
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2 /* Export */) !== 0);
                     }
                     else if (ts.isFunctionLike(current) || current.kind === 219 /* ModuleBlock */) {
                         return false;
@@ -31797,8 +32789,16 @@ var ts;
                 }
             }
             function emitDoStatement(node) {
+                emitLoop(node, emitDoStatementWorker);
+            }
+            function emitDoStatementWorker(node, loop) {
                 write("do");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
                 if (node.statement.kind === 192 /* Block */) {
                     write(" ");
                 }
@@ -31810,10 +32810,18 @@ var ts;
                 write(");");
             }
             function emitWhileStatement(node) {
+                emitLoop(node, emitWhileStatementWorker);
+            }
+            function emitWhileStatementWorker(node, loop) {
                 write("while (");
                 emit(node.expression);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
             }
             /**
              * Returns true if start of variable declaration list was emitted.
@@ -31825,6 +32833,15 @@ var ts;
                     // variables in variable declaration list were already hoisted
                     return false;
                 }
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576 /* BlockScoped */) === 0) {
+                    // we are inside a converted loop - this can only happen in downlevel scenarios 
+                    // record names for all variable declarations
+                    for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
+                        var varDecl = _b[_a];
+                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
+                    }
+                    return false;
+                }
                 var tokenKind = 102 /* VarKeyword */;
                 if (decl && languageVersion >= 2 /* ES6 */) {
                     if (ts.isLet(decl)) {
@@ -31870,7 +32887,253 @@ var ts;
                 }
                 return started;
             }
+            function shouldConvertLoopBody(node) {
+                return languageVersion < 2 /* ES6 */ &&
+                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithBlockScopedBindingCapturedInFunction */) !== 0;
+            }
+            function emitLoop(node, loopEmitter) {
+                var shouldConvert = shouldConvertLoopBody(node);
+                if (!shouldConvert) {
+                    loopEmitter(node, /* convertedLoop*/ undefined);
+                }
+                else {
+                    var loop = convertLoopBody(node);
+                    if (node.parent.kind === 207 /* LabeledStatement */) {
+                        // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
+                        emitLabelAndColon(node.parent);
+                    }
+                    loopEmitter(node, loop);
+                }
+            }
+            function convertLoopBody(node) {
+                var functionName = makeUniqueName("_loop");
+                var loopInitializer;
+                switch (node.kind) {
+                    case 199 /* ForStatement */:
+                    case 200 /* ForInStatement */:
+                    case 201 /* ForOfStatement */:
+                        if (node.initializer.kind === 212 /* VariableDeclarationList */) {
+                            loopInitializer = node.initializer;
+                        }
+                        break;
+                }
+                var loopParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576 /* BlockScoped */)) {
+                    // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
+                    loopParameters = [];
+                    for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
+                        var varDeclaration = _b[_a];
+                        collectNames(varDeclaration.name);
+                    }
+                }
+                var bodyIsBlock = node.statement.kind === 192 /* Block */;
+                var paramList = loopParameters ? loopParameters.join(", ") : "";
+                writeLine();
+                write("var " + functionName + " = function(" + paramList + ")");
+                if (!bodyIsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                var convertedOuterLoopState = convertedLoopState;
+                convertedLoopState = {};
+                if (convertedOuterLoopState) {
+                    // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
+                    // if outer converted loop has already accumulated some state - pass it through
+                    if (convertedOuterLoopState.argumentsName) {
+                        // outer loop has already used 'arguments' so we've already have some name to alias it
+                        // use the same name in all nested loops
+                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
+                    }
+                    if (convertedOuterLoopState.hoistedLocalVariables) {
+                        // we've already collected some non-block scoped variable declarations in enclosing loop
+                        // use the same storage in nested loop
+                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
+                    }
+                }
+                emitEmbeddedStatement(node.statement);
+                if (!bodyIsBlock) {
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                write(";");
+                writeLine();
+                if (convertedLoopState.argumentsName) {
+                    // if alias for arguments is set
+                    if (convertedOuterLoopState) {
+                        // pass it to outer converted loop
+                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
+                    }
+                    else {
+                        // this is top level converted loop and we need to create an alias for 'arguments' object
+                        write("var " + convertedLoopState.argumentsName + " = arguments;");
+                        writeLine();
+                    }
+                }
+                if (convertedLoopState.hoistedLocalVariables) {
+                    // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
+                    if (convertedOuterLoopState) {
+                        // pass them to outer converted loop
+                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
+                    }
+                    else {
+                        // deduplicate and hoist collected variable declarations
+                        write("var ");
+                        var seen;
+                        for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
+                            var id = _d[_c];
+                            // Don't initialize seen unless we have at least one element.
+                            // Emit a comma to separate for all but the first element.
+                            if (!seen) {
+                                seen = {};
+                            }
+                            else {
+                                write(", ");
+                            }
+                            if (!ts.hasProperty(seen, id.text)) {
+                                emit(id);
+                                seen[id.text] = id.text;
+                            }
+                        }
+                        write(";");
+                        writeLine();
+                    }
+                }
+                var currentLoopState = convertedLoopState;
+                convertedLoopState = convertedOuterLoopState;
+                return { functionName: functionName, paramList: paramList, state: currentLoopState };
+                function collectNames(name) {
+                    if (name.kind === 69 /* Identifier */) {
+                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        loopParameters.push(nameText);
+                    }
+                    else {
+                        for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
+                            var element = _b[_a];
+                            collectNames(element.name);
+                        }
+                    }
+                }
+            }
+            function emitNormalLoopBody(node, emitAsEmbeddedStatement) {
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    // we get here if we are trying to emit normal loop loop inside converted loop
+                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
+                }
+                if (emitAsEmbeddedStatement) {
+                    emitEmbeddedStatement(node.statement);
+                }
+                else if (node.statement.kind === 192 /* Block */) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+            }
+            function emitConvertedLoopCall(loop, emitAsBlock) {
+                if (emitAsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
+                // simple loops are emitted as just 'loop()';
+                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                    !loop.state.labeledNonLocalBreaks &&
+                    !loop.state.labeledNonLocalContinues;
+                var loopResult = makeUniqueName("state");
+                if (!isSimpleLoop) {
+                    write("var " + loopResult + " = ");
+                }
+                write(loop.functionName + "(" + loop.paramList + ");");
+                if (!isSimpleLoop) {
+                    // for non simple loops we need to store result returned from converted loop function and use it to do dispatching
+                    // converted loop function can return:
+                    // - object - used when body of the converted loop contains return statement. Property "value" of this object stores retuned value
+                    // - string - used to dispatch jumps. "break" and "continue" are used to non-labeled jumps, other values are used to transfer control to
+                    //   different labels
+                    writeLine();
+                    if (loop.state.nonLocalJumps & 8 /* Return */) {
+                        write("if (typeof " + loopResult + " === \"object\") ");
+                        if (convertedLoopState) {
+                            // we are currently nested in another converted loop - return unwrapped result
+                            write("return " + loopResult + ";");
+                            // propagate 'hasReturn' flag to outer loop
+                            convertedLoopState.nonLocalJumps |= 8 /* Return */;
+                        }
+                        else {
+                            // top level converted loop - return unwrapped value
+                            write("return " + loopResult + ".value");
+                        }
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 2 /* Break */) {
+                        write("if (" + loopResult + " === \"break\") break;");
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 4 /* Continue */) {
+                        write("if (" + loopResult + " === \"continue\") continue;");
+                        writeLine();
+                    }
+                    // in case of labeled breaks emit code that either breaks to some known label inside outer loop or delegates jump decision to outer loop
+                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
+                }
+                if (emitAsBlock) {
+                    writeLine();
+                    decreaseIndent();
+                    write("}");
+                }
+                function emitDispatchTableForLabeledJumps(loopResultVariable, currentLoop, outerLoop) {
+                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
+                        return;
+                    }
+                    write("switch(" + loopResultVariable + ") {");
+                    increaseIndent();
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /* isBreak */ true, loopResultVariable, outerLoop);
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /* isBreak */ false, loopResultVariable, outerLoop);
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                function emitDispatchEntriesForLabeledJumps(table, isBreak, loopResultVariable, outerLoop) {
+                    if (!table) {
+                        return;
+                    }
+                    for (var labelText in table) {
+                        var labelMarker = table[labelText];
+                        writeLine();
+                        write("case \"" + labelMarker + "\": ");
+                        // if there are no outer converted loop or outer label in question is located inside outer converted loop
+                        // then emit labeled break\continue
+                        // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do  
+                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
+                            if (isBreak) {
+                                write("break ");
+                            }
+                            else {
+                                write("continue ");
+                            }
+                            write(labelText + ";");
+                        }
+                        else {
+                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                            write("return " + loopResultVariable + ";");
+                        }
+                    }
+                }
+            }
             function emitForStatement(node) {
+                emitLoop(node, emitForStatementWorker);
+            }
+            function emitForStatementWorker(node, loop) {
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
@@ -31892,12 +33155,22 @@ var ts;
                 write(";");
                 emitOptional(" ", node.incrementor);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
             }
             function emitForInOrForOfStatement(node) {
                 if (languageVersion < 2 /* ES6 */ && node.kind === 201 /* ForOfStatement */) {
-                    return emitDownLevelForOfStatement(node);
+                    emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
+                else {
+                    emitLoop(node, emitForInOrForOfStatementWorker);
+                }
+            }
+            function emitForInOrForOfStatementWorker(node, loop) {
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
@@ -31919,9 +33192,17 @@ var ts;
                 }
                 emit(node.expression);
                 emitToken(18 /* CloseParenToken */, node.expression.end);
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
             }
             function emitDownLevelForOfStatement(node) {
+                emitLoop(node, emitDownLevelForOfStatementWorker);
+            }
+            function emitDownLevelForOfStatementWorker(node, loop) {
                 // The following ES6 code:
                 //
                 //    for (let v of expr) { }
@@ -31952,10 +33233,12 @@ var ts;
                 //
                 //     for (let v of arr) { }
                 //
-                // we don't want to emit a temporary variable for the RHS, just use it directly.
-                var rhsIsIdentifier = node.expression.kind === 69 /* Identifier */;
+                // we can't reuse 'arr' because it might be modified within the body of the loop.
                 var counter = createTempVariable(268435456 /* _i */);
-                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(0 /* Auto */);
+                var rhsReference = ts.createSynthesizedNode(69 /* Identifier */);
+                rhsReference.text = node.expression.kind === 69 /* Identifier */ ?
+                    makeUniqueName(node.expression.text) :
+                    makeTempVariableName(0 /* Auto */);
                 // This is the let keyword for the counter and rhsReference. The let keyword for
                 // the LHS will be emitted inside the body.
                 emitStart(node.expression);
@@ -31964,15 +33247,13 @@ var ts;
                 emitNodeWithoutSourceMap(counter);
                 write(" = 0");
                 emitEnd(node.expression);
-                if (!rhsIsIdentifier) {
-                    // , _a = expr
-                    write(", ");
-                    emitStart(node.expression);
-                    emitNodeWithoutSourceMap(rhsReference);
-                    write(" = ");
-                    emitNodeWithoutSourceMap(node.expression);
-                    emitEnd(node.expression);
-                }
+                // , _a = expr
+                write(", ");
+                emitStart(node.expression);
+                emitNodeWithoutSourceMap(rhsReference);
+                write(" = ");
+                emitNodeWithoutSourceMap(node.expression);
+                emitEnd(node.expression);
                 write("; ");
                 // _i < _a.length;
                 emitStart(node.initializer);
@@ -32037,23 +33318,69 @@ var ts;
                 }
                 emitEnd(node.initializer);
                 write(";");
-                if (node.statement.kind === 192 /* Block */) {
-                    emitLines(node.statement.statements);
+                if (loop) {
+                    writeLine();
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ false);
                 }
                 else {
-                    writeLine();
-                    emit(node.statement);
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ false);
                 }
                 writeLine();
                 decreaseIndent();
                 write("}");
             }
             function emitBreakOrContinueStatement(node) {
+                if (convertedLoopState) {
+                    // check if we can emit break\continue as is
+                    // it is possible if either
+                    //   - break\continue is statement labeled and label is located inside the converted loop
+                    //   - break\continue is non-labeled and located in non-converted loop\switch statement
+                    var jump = node.kind === 203 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                    var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
+                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+                    if (!canUseBreakOrContinue) {
+                        if (!node.label) {
+                            if (node.kind === 203 /* BreakStatement */) {
+                                convertedLoopState.nonLocalJumps |= 2 /* Break */;
+                                write("return \"break\";");
+                            }
+                            else {
+                                convertedLoopState.nonLocalJumps |= 4 /* Continue */;
+                                write("return \"continue\";");
+                            }
+                        }
+                        else {
+                            var labelMarker;
+                            if (node.kind === 203 /* BreakStatement */) {
+                                labelMarker = "break-" + node.label.text;
+                                setLabeledJump(convertedLoopState, /* isBreak */ true, node.label.text, labelMarker);
+                            }
+                            else {
+                                labelMarker = "continue-" + node.label.text;
+                                setLabeledJump(convertedLoopState, /* isBreak */ false, node.label.text, labelMarker);
+                            }
+                            write("return \"" + labelMarker + "\";");
+                        }
+                        return;
+                    }
+                }
                 emitToken(node.kind === 203 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
             function emitReturnStatement(node) {
+                if (convertedLoopState) {
+                    convertedLoopState.nonLocalJumps |= 8 /* Return */;
+                    write("return { value: ");
+                    if (node.expression) {
+                        emit(node.expression);
+                    }
+                    else {
+                        write("void 0");
+                    }
+                    write(" };");
+                    return;
+                }
                 emitToken(94 /* ReturnKeyword */, node.pos);
                 emitOptional(" ", node.expression);
                 write(";");
@@ -32071,7 +33398,16 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(18 /* CloseParenToken */, node.expression.end);
                 write(" ");
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    // for switch statement allow only non-labeled break
+                    convertedLoopState.allowedNonLabeledJumps |= 2 /* Break */;
+                }
                 emitCaseBlock(node.caseBlock, endPos);
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
             }
             function emitCaseBlock(node, startPos) {
                 emitToken(15 /* OpenBraceToken */, startPos);
@@ -32082,16 +33418,16 @@ var ts;
                 emitToken(16 /* CloseBraceToken */, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, node2.end);
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
                 if (node.kind === 241 /* CaseClause */) {
@@ -32141,10 +33477,24 @@ var ts;
                 emitToken(76 /* DebuggerKeyword */, node.pos);
                 write(";");
             }
-            function emitLabelledStatement(node) {
+            function emitLabelAndColon(node) {
                 emit(node.label);
                 write(": ");
+            }
+            function emitLabeledStatement(node) {
+                if (!ts.isIterationStatement(node.statement, /* lookInLabeledStatements */ false) || !shouldConvertLoopBody(node.statement)) {
+                    emitLabelAndColon(node);
+                }
+                if (convertedLoopState) {
+                    if (!convertedLoopState.labels) {
+                        convertedLoopState.labels = {};
+                    }
+                    convertedLoopState.labels[node.label.text] = node.label.text;
+                }
                 emit(node.statement);
+                if (convertedLoopState) {
+                    convertedLoopState.labels[node.label.text] = undefined;
+                }
             }
             function getContainingModule(node) {
                 do {
@@ -32158,7 +33508,7 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 1 /* Export */) {
+                if (ts.getCombinedNodeFlags(node) & 2 /* Export */) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
@@ -32180,10 +33530,10 @@ var ts;
             }
             function emitEs6ExportDefaultCompat(node) {
                 if (node.parent.kind === 248 /* SourceFile */) {
-                    ts.Debug.assert(!!(node.flags & 1024 /* Default */) || node.kind === 227 /* ExportAssignment */);
+                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 227 /* ExportAssignment */);
                     // only allow export default at a source file level
                     if (modulekind === 1 /* CommonJS */ || modulekind === 2 /* AMD */ || modulekind === 3 /* UMD */) {
-                        if (!currentSourceFile.symbol.exports["___esModule"]) {
+                        if (!isEs6Module) {
                             if (languageVersion === 1 /* ES5 */) {
                                 // default value of configurable, enumerable, writable are `false`.
                                 write("Object.defineProperty(exports, \"__esModule\", { value: true });");
@@ -32198,7 +33548,7 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     writeLine();
                     emitStart(node);
                     // emit call to exporter only for top level nodes
@@ -32206,7 +33556,7 @@ var ts;
                         // emit export default <smth> as
                         // export("default", <smth>)
                         write(exportFunctionForFile + "(\"");
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             write("default");
                         }
                         else {
@@ -32217,7 +33567,7 @@ var ts;
                         write(")");
                     }
                     else {
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0 /* ES3 */) {
                                 write("exports[\"default\"]");
@@ -32321,7 +33671,7 @@ var ts;
                 // because actual variable declarations are hoisted
                 var canDefineTempVariablesInPlace = false;
                 if (root.kind === 211 /* VariableDeclaration */) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 1 /* Export */;
+                    var isExported = ts.getCombinedNodeFlags(root) & 2 /* Export */;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
@@ -32378,14 +33728,20 @@ var ts;
                     return node;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
-                    // We create a synthetic copy of the identifier in order to avoid the rewriting that might
-                    // otherwise occur when the identifier is emitted.
-                    var syntheticName = ts.createSynthesizedNode(propName.kind);
-                    syntheticName.text = propName.text;
-                    if (syntheticName.kind !== 69 /* Identifier */) {
-                        return createElementAccessExpression(object, syntheticName);
+                    var index;
+                    var nameIsComputed = propName.kind === 136 /* ComputedPropertyName */;
+                    if (nameIsComputed) {
+                        index = ensureIdentifier(propName.expression, /* reuseIdentifierExpression */ false);
                     }
-                    return createPropertyAccessExpression(object, syntheticName);
+                    else {
+                        // We create a synthetic copy of the identifier in order to avoid the rewriting that might
+                        // otherwise occur when the identifier is emitted.
+                        index = ts.createSynthesizedNode(propName.kind);
+                        index.text = propName.text;
+                    }
+                    return !nameIsComputed && index.kind === 69 /* Identifier */
+                        ? createPropertyAccessExpression(object, index)
+                        : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
                     var call = ts.createSynthesizedNode(168 /* CallExpression */);
@@ -32403,8 +33759,8 @@ var ts;
                         // to ensure value is evaluated exactly once.
                         value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true);
                     }
-                    for (var _a = 0; _a < properties.length; _a++) {
-                        var p = properties[_a];
+                    for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
+                        var p = properties_5[_a];
                         if (p.kind === 245 /* PropertyAssignment */ || p.kind === 246 /* ShorthandPropertyAssignment */) {
                             var propName = p.name;
                             var target_1 = p.kind === 246 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
@@ -32538,10 +33894,10 @@ var ts;
                         // for (...) { var <some-uniqie-name> = void 0; }
                         // this is necessary to preserve ES6 semantic in scenarios like
                         // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 16384 /* BlockScopedBindingInLoop */) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 16384 /* Let */);
+                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384 /* BlockScopedBindingInLoop */) &&
+                            (getCombinedFlagsForIdentifier(node.name) & 8192 /* Let */);
                         // NOTE: default initialization should not be added to let bindings in for-in\for-of statements
-                        if (isUninitializedLet &&
+                        if (isLetDefinedInLoop &&
                             node.parent.parent.kind !== 200 /* ForInStatement */ &&
                             node.parent.parent.kind !== 201 /* ForOfStatement */) {
                             initializer = createVoidZero();
@@ -32579,13 +33935,13 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 1 /* Export */) &&
+                return !!(node.flags & 2 /* Export */) &&
                     modulekind === 5 /* ES6 */ &&
                     node.parent.kind === 248 /* SourceFile */;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     if (isES6ExportedDeclaration(node)) {
                         // Exported ES6 module member
                         write("export ");
@@ -32612,7 +33968,7 @@ var ts;
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
                 // If we're not exporting the variables, there's nothing special here.
                 // Always emit comments for these nodes.
-                if (!(node.flags & 1 /* Export */)) {
+                if (!(node.flags & 2 /* Export */)) {
                     return true;
                 }
                 // If we are exporting, but it's a top-level ES6 module exports,
@@ -32632,12 +33988,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2 /* ES6 */) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_24 = createTempVariable(0 /* Auto */);
+                        var name_25 = createTempVariable(0 /* Auto */);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_24);
-                        emit(name_24);
+                        tempParameters.push(name_25);
+                        emit(name_25);
                     }
                     else {
                         emit(node.name);
@@ -32795,7 +34151,7 @@ var ts;
                 if (!shouldEmitAsArrowFunction(node)) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             write("default ");
                         }
                     }
@@ -32848,7 +34204,6 @@ var ts;
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
                 var isArrowFunction = node.kind === 174 /* ArrowFunction */;
                 var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096 /* CaptureArguments */) !== 0;
-                var args;
                 // An async function is emit as an outer function that calls an inner
                 // generator function. To preserve lexical bindings, we pass the current
                 // `this` and `arguments` objects to `__awaiter`. The generator function
@@ -32976,9 +34331,11 @@ var ts;
                 }
             }
             function emitSignatureAndBody(node) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -33000,6 +34357,8 @@ var ts;
                 if (!isES6ExportedDeclaration(node)) {
                     emitExportMemberAssignment(node);
                 }
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -33011,7 +34370,7 @@ var ts;
                 emitRestParameter(node);
             }
             function emitExpressionFunctionBody(node, body) {
-                if (languageVersion < 2 /* ES6 */ || node.flags & 512 /* Async */) {
+                if (languageVersion < 2 /* ES6 */ || node.flags & 256 /* Async */) {
                     emitDownLevelExpressionFunctionBody(node, body);
                     return;
                 }
@@ -33032,7 +34391,7 @@ var ts;
                 scopeEmitStart(node);
                 increaseIndent();
                 var outPos = writer.getTextPos();
-                emitDetachedComments(node.body);
+                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
@@ -33070,7 +34429,7 @@ var ts;
                 scopeEmitStart(node);
                 var initialTextPos = writer.getTextPos();
                 increaseIndent();
-                emitDetachedComments(body.statements);
+                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
                 // Emit all the directive prologues (like "use strict").  These have to come before
                 // any other preamble code we write (like parameter initializers).
                 var startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
@@ -33114,7 +34473,7 @@ var ts;
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 112 /* AccessibilityModifier */) {
+                    if (param.flags & 56 /* AccessibilityModifier */) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -33149,15 +34508,15 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 141 /* PropertyDeclaration */ && isStatic === ((member.flags & 128 /* Static */) !== 0) && member.initializer) {
+                    if (member.kind === 141 /* PropertyDeclaration */ && isStatic === ((member.flags & 64 /* Static */) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
                 return properties;
             }
             function emitPropertyDeclarations(node, properties) {
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var property = properties[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var property = properties_6[_a];
                     emitPropertyDeclaration(node, property);
                 }
             }
@@ -33170,7 +34529,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 128 /* Static */) {
+                    if (property.flags & 64 /* Static */) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -33269,7 +34628,7 @@ var ts;
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 128 /* Static */) {
+                        if (member.flags & 64 /* Static */) {
                             write("static ");
                         }
                         if (member.kind === 145 /* GetAccessor */) {
@@ -33293,13 +34652,17 @@ var ts;
                 }
             }
             function emitConstructor(node, baseTypeElement) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
                 emitConstructorWorker(node, baseTypeElement);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -33315,7 +34678,7 @@ var ts;
                         emitCommentsOnNotEmittedNode(member);
                     }
                     // Check if there is any non-static property assignment
-                    if (member.kind === 141 /* PropertyDeclaration */ && member.initializer && (member.flags & 128 /* Static */) === 0) {
+                    if (member.kind === 141 /* PropertyDeclaration */ && member.initializer && (member.flags & 64 /* Static */) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -33362,7 +34725,7 @@ var ts;
                     // Emit all the directive prologues (like "use strict").  These have to come before
                     // any other preamble code we write (like parameter initializers).
                     startIndex = emitDirectivePrologues(ctor.body.statements, /*startWithNewLine*/ true);
-                    emitDetachedComments(ctor.body.statements);
+                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
                 }
                 emitCaptureThisForNodeIfNecessary(node);
                 var superCall;
@@ -33482,7 +34845,7 @@ var ts;
                         //     _default = __decorate([dec], _default);
                         //     export default _default;
                         //
-                        if (isES6ExportedDeclaration(node) && !(node.flags & 1024 /* Default */)) {
+                        if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */)) {
                             write("export ");
                         }
                         write("let ");
@@ -33491,7 +34854,7 @@ var ts;
                     }
                     else if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             write("default ");
                         }
                     }
@@ -33521,7 +34884,7 @@ var ts;
                 // emit name if
                 // - node has a name
                 // - this is default export with static initializers
-                if ((node.name || (node.flags & 1024 /* Default */ && staticProperties.length > 0)) && !thisNodeIsDecorated) {
+                if ((node.name || (node.flags & 512 /* Default */ && staticProperties.length > 0)) && !thisNodeIsDecorated) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -33557,8 +34920,8 @@ var ts;
                 //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
                 //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
                 if (isClassExpressionWithStaticProperties) {
-                    for (var _a = 0; _a < staticProperties.length; _a++) {
-                        var property = staticProperties[_a];
+                    for (var _a = 0, staticProperties_1 = staticProperties; _a < staticProperties_1.length; _a++) {
+                        var property = staticProperties_1[_a];
                         write(",");
                         writeLine();
                         emitPropertyDeclaration(node, property, /*receiver:*/ tempVariable, /*isExpression:*/ true);
@@ -33576,7 +34939,7 @@ var ts;
                 }
                 // If this is an exported class, but not on the top level (i.e. on an internal
                 // module), export it
-                if (!isES6ExportedDeclaration(node) && (node.flags & 1 /* Export */)) {
+                if (!isES6ExportedDeclaration(node) && (node.flags & 2 /* Export */)) {
                     writeLine();
                     emitStart(node);
                     emitModuleMemberName(node);
@@ -33585,7 +34948,7 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                else if (isES6ExportedDeclaration(node) && (node.flags & 1024 /* Default */) && thisNodeIsDecorated) {
+                else if (isES6ExportedDeclaration(node) && (node.flags & 512 /* Default */) && thisNodeIsDecorated) {
                     // if this is a top level default export of decorated class, write the export after the declaration.
                     writeLine();
                     write("export default ");
@@ -33612,6 +34975,8 @@ var ts;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
                 var saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                var saveConvertedLoopState = convertedLoopState;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -33639,6 +35004,8 @@ var ts;
                 });
                 write(";");
                 emitTempDeclarations(/*newLine*/ true);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -33663,13 +35030,13 @@ var ts;
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 128 /* Static */)) {
+                if (!(member.flags & 64 /* Static */)) {
                     write(".prototype");
                 }
             }
             function emitDecoratorsOfClass(node) {
                 emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, 128 /* Static */);
+                emitDecoratorsOfMembers(node, 64 /* Static */);
                 emitDecoratorsOfConstructor(node);
             }
             function emitDecoratorsOfConstructor(node) {
@@ -33716,7 +35083,7 @@ var ts;
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
                     // only emit members in the correct group
-                    if ((member.flags & 128 /* Static */) !== staticFlag) {
+                    if ((member.flags & 64 /* Static */) !== staticFlag) {
                         continue;
                     }
                     // skip members that cannot be decorated (such as the constructor)
@@ -34117,7 +35484,7 @@ var ts;
                 }
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
-                    if (!(node.flags & 1 /* Export */) || isES6ExportedDeclaration(node)) {
+                    if (!(node.flags & 2 /* Export */) || isES6ExportedDeclaration(node)) {
                         emitStart(node);
                         if (isES6ExportedDeclaration(node)) {
                             write("export ");
@@ -34148,7 +35515,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 1 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 2 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     writeLine();
                     emitStart(node);
@@ -34160,7 +35527,7 @@ var ts;
                     write(";");
                 }
                 if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 1 /* Export */)) {
+                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
                         // write the call to exporter for enum
                         writeLine();
                         write(exportFunctionForFile + "(\"");
@@ -34238,11 +35605,15 @@ var ts;
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === 219 /* ModuleBlock */) {
+                    var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
+                    convertedLoopState = undefined;
                     tempFlags = 0;
                     tempVariables = undefined;
                     emit(node.body);
+                    ts.Debug.assert(convertedLoopState === undefined);
+                    convertedLoopState = saveConvertedLoopState;
                     tempFlags = saveTempFlags;
                     tempVariables = saveTempVariables;
                 }
@@ -34261,7 +35632,7 @@ var ts;
                 }
                 write(")(");
                 // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & 1 /* Export */) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 2 /* Export */) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -34271,7 +35642,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 /* Identifier */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 1 /* Export */)) {
+                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -34287,8 +35658,8 @@ var ts;
              * Here we check if alternative name was provided for a given moduleName and return it if possible.
              */
             function tryRenameExternalModule(moduleName) {
-                if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                    return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\"";
+                if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) {
+                    return "\"" + renamedDependencies[moduleName.text] + "\"";
                 }
                 return undefined;
             }
@@ -34374,7 +35745,7 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 221 /* ImportEqualsDeclaration */ && (node.flags & 1 /* Export */) !== 0;
+                    var isExportedImport = node.kind === 221 /* ImportEqualsDeclaration */ && (node.flags & 2 /* Export */) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
                     if (modulekind !== 2 /* AMD */) {
                         emitLeadingComments(node);
@@ -34441,7 +35812,7 @@ var ts;
                 // - current file is not external module
                 // - import declaration is top level and target is value imported by entity name
                 if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     // variable declaration for import-equals declaration can be hoisted in system modules
@@ -34456,7 +35827,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 1 /* Export */)) {
+                        else if (!(node.flags & 2 /* Export */)) {
                             write("var ");
                         }
                     }
@@ -34547,8 +35918,8 @@ var ts;
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
                 ts.Debug.assert(modulekind === 5 /* ES6 */);
                 var needsComma = false;
-                for (var _a = 0; _a < specifiers.length; _a++) {
-                    var specifier = specifiers[_a];
+                for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
+                    var specifier = specifiers_1[_a];
                     if (shouldEmit(specifier)) {
                         if (needsComma) {
                             write(", ");
@@ -34640,8 +36011,8 @@ var ts;
                                 // export { x, y }
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_25 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_25] || (exportSpecifiers[name_25] = [])).push(specifier);
+                                    var name_26 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_26] || (exportSpecifiers[name_26] = [])).push(specifier);
                                 }
                             }
                             break;
@@ -34669,7 +36040,7 @@ var ts;
             function getLocalNameForExternalImport(node) {
                 var namespaceDeclaration = getNamespaceDeclarationNode(node);
                 if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
+                    return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
                 if (node.kind === 222 /* ImportDeclaration */ && node.importClause) {
                     return getGeneratedNameForNode(node);
@@ -34691,8 +36062,8 @@ var ts;
                 }
                 writeLine();
                 var started = false;
-                for (var _a = 0; _a < externalImports.length; _a++) {
-                    var importNode = externalImports[_a];
+                for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
+                    var importNode = externalImports_1[_a];
                     // do not create variable declaration for exports and imports that lack import clause
                     var skipNode = importNode.kind === 228 /* ExportDeclaration */ ||
                         (importNode.kind === 222 /* ImportDeclaration */ && !importNode.importClause);
@@ -34726,8 +36097,8 @@ var ts;
                     // no exported declarations (export var ...) or export specifiers (export {x})
                     // check if we have any non star export declarations.
                     var hasExportDeclarationWithExportClause = false;
-                    for (var _a = 0; _a < externalImports.length; _a++) {
-                        var externalImport = externalImports[_a];
+                    for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
+                        var externalImport = externalImports_2[_a];
                         if (externalImport.kind === 228 /* ExportDeclaration */ && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
@@ -34758,8 +36129,8 @@ var ts;
                         }
                     }
                 }
-                for (var _d = 0; _d < externalImports.length; _d++) {
-                    var externalImport = externalImports[_d];
+                for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
+                    var externalImport = externalImports_3[_d];
                     if (externalImport.kind !== 228 /* ExportDeclaration */) {
                         continue;
                     }
@@ -34808,7 +36179,7 @@ var ts;
                 function writeExportedName(node) {
                     // do not record default exports
                     // they are local to module and never overwritten (explicitly skipped) by star export
-                    if (node.kind !== 69 /* Identifier */ && node.flags & 1024 /* Default */) {
+                    if (node.kind !== 69 /* Identifier */ && node.flags & 512 /* Default */) {
                         return;
                     }
                     if (started) {
@@ -34848,12 +36219,12 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; ++i) {
                         var local = hoistedVars[i];
-                        var name_26 = local.kind === 69 /* Identifier */
+                        var name_27 = local.kind === 69 /* Identifier */
                             ? local
                             : local.name;
-                        if (name_26) {
+                        if (name_27) {
                             // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            var text = ts.unescapeIdentifier(name_26.text);
+                            var text = ts.unescapeIdentifier(name_27.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -34871,7 +36242,7 @@ var ts;
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 /* Identifier */ ? local.parent : local);
-                        if (flags & 1 /* Export */) {
+                        if (flags & 2 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -34881,11 +36252,11 @@ var ts;
                     write(";");
                 }
                 if (hoistedFunctionDeclarations) {
-                    for (var _a = 0; _a < hoistedFunctionDeclarations.length; _a++) {
-                        var f = hoistedFunctionDeclarations[_a];
+                    for (var _a = 0, hoistedFunctionDeclarations_1 = hoistedFunctionDeclarations; _a < hoistedFunctionDeclarations_1.length; _a++) {
+                        var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 1 /* Export */) {
+                        if (f.flags & 2 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -34895,7 +36266,7 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 2 /* Ambient */) {
+                    if (node.flags & 4 /* Ambient */) {
                         return;
                     }
                     if (node.kind === 213 /* FunctionDeclaration */) {
@@ -34932,15 +36303,15 @@ var ts;
                     }
                     if (node.kind === 211 /* VariableDeclaration */ || node.kind === 163 /* BindingElement */) {
                         if (shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            var name_27 = node.name;
-                            if (name_27.kind === 69 /* Identifier */) {
+                            var name_28 = node.name;
+                            if (name_28.kind === 69 /* Identifier */) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_27);
+                                hoistedVars.push(name_28);
                             }
                             else {
-                                ts.forEachChild(name_27, visit);
+                                ts.forEachChild(name_28, visit);
                             }
                         }
                         return;
@@ -34970,11 +36341,11 @@ var ts;
                 // - it is top level block scoped
                 // if block scoped variables are nested in some another block then
                 // no other functions can use them except ones that are defined at least in the same block
-                return (ts.getCombinedNodeFlags(node) & 49152 /* BlockScoped */) === 0 ||
+                return (ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) === 0 ||
                     ts.getEnclosingBlockScopeContainer(node).kind === 248 /* SourceFile */;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 /* System */ && ts.isExternalModule(currentSourceFile);
+                return modulekind === 4 /* System */ && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 // shape of the body in system modules:
@@ -35042,8 +36413,8 @@ var ts;
                     var parameterName = makeUniqueName(ts.forEach(group, getLocalNameForExternalImport) || "");
                     write("function (" + parameterName + ") {");
                     increaseIndent();
-                    for (var _a = 0; _a < group.length; _a++) {
-                        var entry = group[_a];
+                    for (var _a = 0, group_1 = group; _a < group_1.length; _a++) {
+                        var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
                             case 222 /* ImportDeclaration */:
@@ -35144,7 +36515,13 @@ var ts;
                 writeLine();
                 write("}"); // execute
             }
-            function emitSystemModule(node) {
+            function writeModuleName(node, emitRelativePathAsModuleName) {
+                var moduleName = node.moduleName;
+                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
+                    write("\"" + moduleName + "\", ");
+                }
+            }
+            function emitSystemModule(node, emitRelativePathAsModuleName) {
                 collectExternalModuleInfo(node);
                 // System modules has the following shape
                 // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
@@ -35159,9 +36536,7 @@ var ts;
                 exportFunctionForFile = makeUniqueName("exports");
                 writeLine();
                 write("System.register(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
+                writeModuleName(node, emitRelativePathAsModuleName);
                 write("[");
                 var groupIndices = {};
                 var dependencyGroups = [];
@@ -35180,6 +36555,12 @@ var ts;
                     if (i !== 0) {
                         write(", ");
                     }
+                    if (emitRelativePathAsModuleName) {
+                        var name_29 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]);
+                        if (name_29) {
+                            text = "\"" + name_29 + "\"";
+                        }
+                    }
                     write(text);
                 }
                 write("], function(" + exportFunctionForFile + ") {");
@@ -35193,7 +36574,7 @@ var ts;
                 writeLine();
                 write("});");
             }
-            function getAMDDependencyNames(node, includeNonAmdDependencies) {
+            function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
                 // names of modules with corresponding parameter in the factory function
                 var aliasedModuleNames = [];
                 // names of modules with no corresponding parameters in factory function
@@ -35212,10 +36593,16 @@ var ts;
                         unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
                     }
                 }
-                for (var _c = 0; _c < externalImports.length; _c++) {
-                    var importNode = externalImports[_c];
+                for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
+                    var importNode = externalImports_4[_c];
                     // Find the name of the external module
                     var externalModuleName = getExternalModuleNameText(importNode);
+                    if (emitRelativePathAsModuleName) {
+                        var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                        if (name_30) {
+                            externalModuleName = "\"" + name_30 + "\"";
+                        }
+                    }
                     // Find the name of the module alias, if there is one
                     var importAliasName = getLocalNameForExternalImport(importNode);
                     if (includeNonAmdDependencies && importAliasName) {
@@ -35228,7 +36615,7 @@ var ts;
                 }
                 return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
             }
-            function emitAMDDependencies(node, includeNonAmdDependencies) {
+            function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
                 // An AMD define function has the following shape:
                 //     define(id?, dependencies?, factory);
                 //
@@ -35240,7 +36627,7 @@ var ts;
                 // To ensure this is true in cases of modules with no aliases, e.g.:
                 // `import "module"` or `<amd-dependency path= "a.css" />`
                 // we need to add modules without alias names to the end of the dependencies list
-                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies);
+                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
                 emitAMDDependencyList(dependencyNames);
                 write(", ");
                 emitAMDFactoryHeader(dependencyNames);
@@ -35267,15 +36654,13 @@ var ts;
                 }
                 write(") {");
             }
-            function emitAMDModule(node) {
+            function emitAMDModule(node, emitRelativePathAsModuleName) {
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 writeLine();
                 write("define(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
-                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true);
+                writeModuleName(node, emitRelativePathAsModuleName);
+                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
                 var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
                 emitExportStarHelper();
@@ -35492,10 +36877,15 @@ var ts;
                 // Start new file on new line
                 writeLine();
                 emitShebang();
-                emitDetachedComments(node);
+                emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                    var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */];
-                    emitModule(node);
+                    if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */];
+                        emitModule(node);
+                    }
+                    else {
+                        bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/ true);
+                    }
                 }
                 else {
                     // emit prologue directives prior to __extends
@@ -35516,7 +36906,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 2 /* Ambient */) {
+                    if (node.flags & 4 /* Ambient */) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -35716,7 +37106,7 @@ var ts;
                     case 242 /* DefaultClause */:
                         return emitCaseOrDefaultClause(node);
                     case 207 /* LabeledStatement */:
-                        return emitLabelledStatement(node);
+                        return emitLabeledStatement(node);
                     case 208 /* ThrowStatement */:
                         return emitThrowStatement(node);
                     case 209 /* TryStatement */:
@@ -35756,7 +37146,7 @@ var ts;
             }
             function getLeadingCommentsWithoutDetachedComments() {
                 // get the leading comments from detachedPos
-                var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
+                var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
                 if (detachedCommentsInfo.length - 1) {
                     detachedCommentsInfo.pop();
                 }
@@ -35765,10 +37155,6 @@ var ts;
                 }
                 return leadingComments;
             }
-            function isPinnedComments(comment) {
-                return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 33 /* exclamation */;
-            }
             /**
              * Determine if the given comment is a triple-slash
              *
@@ -35777,10 +37163,10 @@ var ts;
             function isTripleSlashComment(comment) {
                 // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
                 // so that we don't end up computing comment string and doing match for all // comments
-                if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 /* slash */ &&
+                if (currentText.charCodeAt(comment.pos + 1) === 47 /* slash */ &&
                     comment.pos + 2 < comment.end &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 /* slash */) {
-                    var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end);
+                    currentText.charCodeAt(comment.pos + 2) === 47 /* slash */) {
+                    var textSubStr = currentText.substring(comment.pos, comment.end);
                     return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) ||
                         textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ?
                         true : false;
@@ -35797,7 +37183,7 @@ var ts;
                         }
                         else {
                             // get the leading comments from the node
-                            return ts.getLeadingCommentRangesOfNode(node, currentSourceFile);
+                            return ts.getLeadingCommentRangesOfNodeFromText(node, currentText);
                         }
                     }
                 }
@@ -35806,7 +37192,7 @@ var ts;
                 // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments
                 if (node.parent) {
                     if (node.parent.kind === 248 /* SourceFile */ || node.end !== node.parent.end) {
-                        return ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
+                        return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
             }
@@ -35840,9 +37226,9 @@ var ts;
                         leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment);
             }
             function emitTrailingComments(node) {
                 if (compilerOptions.removeComments) {
@@ -35851,7 +37237,7 @@ var ts;
                 // Emit the trailing comments only if the parent's end doesn't match
                 var trailingComments = getTrailingCommentsToEmit(node);
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
             }
             /**
              * Emit trailing comments at the position. The term trailing comment is used here to describe following comment:
@@ -35862,9 +37248,9 @@ var ts;
                 if (compilerOptions.removeComments) {
                     return;
                 }
-                var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos);
+                var trailingComments = ts.getTrailingCommentRanges(currentText, pos);
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
             function emitLeadingCommentsOfPositionWorker(pos) {
                 if (compilerOptions.removeComments) {
@@ -35877,73 +37263,30 @@ var ts;
                 }
                 else {
                     // get the leading comments from the node
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
+                    leadingComments = ts.getLeadingCommentRanges(currentText, pos);
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
-            function emitDetachedComments(node) {
-                var leadingComments;
-                if (compilerOptions.removeComments) {
-                    // removeComments is true, only reserve pinned comment at the top of file
-                    // For example:
-                    //      /*! Pinned Comment */
-                    //
-                    //      var x = 10;
-                    if (node.pos === 0) {
-                        leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComments);
+            function emitDetachedCommentsAndUpdateCommentsInfo(node) {
+                var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
+                if (currentDetachedCommentInfo) {
+                    if (detachedCommentsInfo) {
+                        detachedCommentsInfo.push(currentDetachedCommentInfo);
                     }
-                }
-                else {
-                    // removeComments is false, just get detached as normal and bypass the process to filter comment
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
-                }
-                if (leadingComments) {
-                    var detachedComments = [];
-                    var lastComment;
-                    ts.forEach(leadingComments, function (comment) {
-                        if (lastComment) {
-                            var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, lastComment.end);
-                            var commentLine = ts.getLineOfLocalPosition(currentSourceFile, comment.pos);
-                            if (commentLine >= lastCommentLine + 2) {
-                                // There was a blank line between the last comment and this comment.  This
-                                // comment is not part of the copyright comments.  Return what we have so
-                                // far.
-                                return detachedComments;
-                            }
-                        }
-                        detachedComments.push(comment);
-                        lastComment = comment;
-                    });
-                    if (detachedComments.length) {
-                        // All comments look like they could have been part of the copyright header.  Make
-                        // sure there is at least one blank line between it and the node.  If not, it's not
-                        // a copyright header.
-                        var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end);
-                        var nodeLine = ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos));
-                        if (nodeLine >= lastCommentLine + 2) {
-                            // Valid detachedComments
-                            ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                            ts.emitComments(currentSourceFile, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                            if (detachedCommentsInfo) {
-                                detachedCommentsInfo.push(currentDetachedCommentInfo);
-                            }
-                            else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
-                            }
-                        }
+                    else {
+                        detachedCommentsInfo = [currentDetachedCommentInfo];
                     }
                 }
             }
             function emitShebang() {
-                var shebang = ts.getShebang(currentSourceFile.text);
+                var shebang = ts.getShebang(currentText);
                 if (shebang) {
                     write(shebang);
                 }
             }
-            var _a;
+            var _a, _b;
         }
         function emitFile(jsFilePath, sourceFile) {
             emitJavaScript(jsFilePath, sourceFile);
@@ -36003,11 +37346,11 @@ var ts;
         if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
             var failedLookupLocations = [];
             var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+            var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             if (resolvedFileName) {
                 return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
             }
-            resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+            resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             return resolvedFileName
                 ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
                 : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
@@ -36017,8 +37360,8 @@ var ts;
         }
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function loadNodeModuleFromFile(candidate, failedLookupLocation, host) {
-        return ts.forEach(ts.moduleFileExtensions, tryLoad);
+    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) {
+        return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
             if (host.fileExists(fileName)) {
@@ -36030,7 +37373,7 @@ var ts;
             }
         }
     }
-    function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
         if (host.fileExists(packageJsonPath)) {
             var jsonContent;
@@ -36043,7 +37386,7 @@ var ts;
                 jsonContent = { typings: undefined };
             }
             if (jsonContent.typings) {
-                var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
+                var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
                 if (result) {
                     return result;
                 }
@@ -36053,7 +37396,7 @@ var ts;
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host);
+        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host);
     }
     function loadModuleFromNodeModules(moduleName, directory, host) {
         var failedLookupLocations = [];
@@ -36063,11 +37406,11 @@ var ts;
             if (baseName !== "node_modules") {
                 var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
                 var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+                var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
-                result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+                result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
@@ -36093,9 +37436,10 @@ var ts;
         var searchName;
         var failedLookupLocations = [];
         var referencedSourceFile;
+        var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions;
         while (true) {
             searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) {
+            referencedSourceFile = ts.forEach(extensions, function (extension) {
                 if (extension === ".tsx" && !compilerOptions.jsx) {
                     // resolve .tsx files only if jsx support is enabled 
                     // 'logical not' handles both undefined and None cases
@@ -36126,14 +37470,11 @@ var ts;
     /* @internal */
     ts.defaultInitCompilerOptions = {
         module: 1 /* CommonJS */,
-        target: 0 /* ES3 */,
+        target: 1 /* ES5 */,
         noImplicitAny: false,
-        outDir: "built",
-        rootDir: ".",
         sourceMap: false
     };
     function createCompilerHost(options, setParentNodes) {
-        var currentDirectory;
         var existingDirectories = {};
         function getCanonicalFileName(fileName) {
             // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
@@ -36194,7 +37535,7 @@ var ts;
             getSourceFile: getSourceFile,
             getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
+            getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
             getCanonicalFileName: getCanonicalFileName,
             getNewLine: function () { return newLine; },
@@ -36246,10 +37587,14 @@ var ts;
         var skipDefaultLib = options.noLib;
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
+        var currentDirectory = host.getCurrentDirectory();
         var resolveModuleNamesWorker = host.resolveModuleNames
             ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
             : (function (moduleNames, containingFile) { return ts.map(moduleNames, function (moduleName) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; }); });
-        var filesByName = ts.createFileMap(function (fileName) { return host.getCanonicalFileName(fileName); });
+        var filesByName = ts.createFileMap();
+        // stores 'filename -> file association' ignoring case
+        // used to track cases when two file names differ only in casing 
+        var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
         if (oldProgram) {
             // check properties that can affect structure of the program or module resolution strategy
             // if any of these properties has changed - structure cannot be reused
@@ -36291,7 +37636,7 @@ var ts;
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
             getCommonSourceDirectory: function () { return commonSourceDirectory; },
             emit: emit,
-            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            getCurrentDirectory: function () { return currentDirectory; },
             getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
@@ -36304,8 +37649,8 @@ var ts;
                 // Initialize a checker so that all our files are bound.
                 getTypeChecker();
                 classifiableNames = {};
-                for (var _i = 0; _i < files.length; _i++) {
-                    var sourceFile = files[_i];
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var sourceFile = files_3[_i];
                     ts.copyMap(sourceFile.classifiableNames, classifiableNames);
                 }
             }
@@ -36323,6 +37668,7 @@ var ts;
             }
             // check if program source files has changed in the way that can affect structure of the program
             var newSourceFiles = [];
+            var filePaths = [];
             var modifiedSourceFiles = [];
             for (var _i = 0, _a = oldProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var oldSourceFile = _a[_i];
@@ -36330,6 +37676,8 @@ var ts;
                 if (!newSourceFile) {
                     return false;
                 }
+                newSourceFile.path = oldSourceFile.path;
+                filePaths.push(newSourceFile.path);
                 if (oldSourceFile !== newSourceFile) {
                     if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
                         // value of no-default-lib has changed
@@ -36349,7 +37697,7 @@ var ts;
                     }
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(newSourceFile.imports, function (name) { return name.text; });
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFile.fileName);
+                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
                         // ensure that module resolution results are still correct
                         for (var i = 0; i < moduleNames.length; ++i) {
                             var newResolution = resolutions[i];
@@ -36376,14 +37724,13 @@ var ts;
                 newSourceFiles.push(newSourceFile);
             }
             // update fileName -> file mapping
-            for (var _b = 0; _b < newSourceFiles.length; _b++) {
-                var file = newSourceFiles[_b];
-                filesByName.set(file.fileName, file);
+            for (var i = 0, len = newSourceFiles.length; i < len; ++i) {
+                filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _c = 0; _c < modifiedSourceFiles.length; _c++) {
-                var modifiedFile = modifiedSourceFiles[_c];
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
             oldProgram.structureIsReused = true;
@@ -36391,10 +37738,10 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return {
-                getCanonicalFileName: function (fileName) { return host.getCanonicalFileName(fileName); },
+                getCanonicalFileName: getCanonicalFileName,
                 getCommonSourceDirectory: program.getCommonSourceDirectory,
                 getCompilerOptions: program.getCompilerOptions,
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
@@ -36433,9 +37780,7 @@ var ts;
             return emitResult;
         }
         function getSourceFile(fileName) {
-            // first try to use file name as is to find file
-            // then try to convert relative file name to absolute and use it to retrieve source file
-            return filesByName.get(fileName) || filesByName.get(ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory()));
+            return filesByName.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
         }
         function getDiagnosticsHelper(sourceFile, getDiagnostics, cancellationToken) {
             if (sourceFile) {
@@ -36531,43 +37876,55 @@ var ts;
             if (file.imports) {
                 return;
             }
+            var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var imports;
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var node = _a[_i];
-                collect(node, /* allowRelativeModuleNames */ true);
+                collect(node, /* allowRelativeModuleNames */ true, /* collectOnlyRequireCalls */ false);
             }
             file.imports = imports || emptyArray;
-            function collect(node, allowRelativeModuleNames) {
-                switch (node.kind) {
-                    case 222 /* ImportDeclaration */:
-                    case 221 /* ImportEqualsDeclaration */:
-                    case 228 /* ExportDeclaration */:
-                        var moduleNameExpr = ts.getExternalModuleName(node);
-                        if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
+            return;
+            function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) {
+                if (!collectOnlyRequireCalls) {
+                    switch (node.kind) {
+                        case 222 /* ImportDeclaration */:
+                        case 221 /* ImportEqualsDeclaration */:
+                        case 228 /* ExportDeclaration */:
+                            var moduleNameExpr = ts.getExternalModuleName(node);
+                            if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
+                                break;
+                            }
+                            if (!moduleNameExpr.text) {
+                                break;
+                            }
+                            if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
+                                (imports || (imports = [])).push(moduleNameExpr);
+                            }
                             break;
-                        }
-                        if (!moduleNameExpr.text) {
-                            break;
-                        }
-                        if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
-                            (imports || (imports = [])).push(moduleNameExpr);
-                        }
-                        break;
-                    case 218 /* ModuleDeclaration */:
-                        if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 2 /* Ambient */ || ts.isDeclarationFile(file))) {
-                            // TypeScript 1.0 spec (April 2014): 12.1.6
-                            // 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
-                            ts.forEachChild(node.body, function (node) {
+                        case 218 /* ModuleDeclaration */:
+                            if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) {
                                 // 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);
-                            });
-                        }
-                        break;
+                                // 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
+                                ts.forEachChild(node.body, function (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 (ts.isRequireCall(node)) {
+                        (imports || (imports = [])).push(node.arguments[0]);
+                    }
+                    else {
+                        ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, /* collectOnlyRequireCalls */ true); });
+                    }
                 }
             }
         }
@@ -36579,7 +37936,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + ts.supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -36589,13 +37946,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -36611,18 +37968,23 @@ var ts;
                 }
             }
         }
-        // Get source file from normalized fileName
-        function findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
-            if (filesByName.contains(fileName)) {
-                // We've already looked for this file, use cached result
-                return getSourceFileFromCache(fileName, /*useAbsolutePath*/ false);
+        function reportFileNamesDifferOnlyInCasingError(fileName, existingFileName, refFile, refPos, refEnd) {
+            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
-            var normalizedAbsolutePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+            else {
+                fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+        }
+        // Get source file from normalized fileName
+        function findSourceFile(fileName, normalizedAbsolutePath, isDefaultLib, refFile, refPos, refEnd) {
             if (filesByName.contains(normalizedAbsolutePath)) {
-                var file_1 = getSourceFileFromCache(normalizedAbsolutePath, /*useAbsolutePath*/ true);
-                // we don't have resolution for this relative file name but the match was found by absolute file name
-                // store resolution for relative name as well 
-                filesByName.set(fileName, file_1);
+                var file_1 = filesByName.get(normalizedAbsolutePath);
+                // try to check if we've already seen this file but with a different casing in path
+                // NOTE: this only makes sense for case-insensitive file systems
+                if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== normalizedAbsolutePath) {
+                    reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
+                }
                 return file_1;
             }
             // We haven't looked for this file, do so now and cache result
@@ -36634,11 +37996,20 @@ var ts;
                     fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
                 }
             });
-            filesByName.set(fileName, file);
+            filesByName.set(normalizedAbsolutePath, file);
             if (file) {
+                file.path = normalizedAbsolutePath;
+                if (host.useCaseSensitiveFileNames()) {
+                    // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
+                    var existingFile = filesByNameIgnoreCase.get(normalizedAbsolutePath);
+                    if (existingFile) {
+                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
+                    }
+                    else {
+                        filesByNameIgnoreCase.set(normalizedAbsolutePath, file);
+                    }
+                }
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
-                // Set the source file for normalized absolute path
-                filesByName.set(normalizedAbsolutePath, file);
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
                     processReferencedFiles(file, basePath);
@@ -36646,7 +38017,6 @@ var ts;
                 // always process imported modules to record module name resolutions
                 processImportedModules(file, basePath);
                 if (isDefaultLib) {
-                    file.isDefaultLib = true;
                     files.unshift(file);
                 }
                 else {
@@ -36654,21 +38024,6 @@ var ts;
                 }
             }
             return file;
-            function getSourceFileFromCache(fileName, useAbsolutePath) {
-                var file = filesByName.get(fileName);
-                if (file && host.useCaseSensitiveFileNames()) {
-                    var sourceFileName = useAbsolutePath ? ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()) : file.fileName;
-                    if (ts.normalizeSlashes(fileName) !== ts.normalizeSlashes(sourceFileName)) {
-                        if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                            fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                        else {
-                            fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                    }
-                }
-                return file;
-            }
         }
         function processReferencedFiles(file, basePath) {
             ts.forEach(file.referencedFiles, function (ref) {
@@ -36676,26 +38031,25 @@ var ts;
                 processSourceFile(referencedFileName, /* isDefaultLib */ false, file, ref.pos, ref.end);
             });
         }
+        function getCanonicalFileName(fileName) {
+            return host.getCanonicalFileName(fileName);
+        }
         function processImportedModules(file, basePath) {
             collectExternalModuleReferences(file);
             if (file.imports.length) {
                 file.resolvedModules = {};
                 var moduleNames = ts.map(file.imports, function (name) { return name.text; });
-                var resolutions = resolveModuleNamesWorker(moduleNames, file.fileName);
+                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
                 for (var i = 0; i < file.imports.length; ++i) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
                     if (resolution && !options.noResolve) {
-                        var importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /* isDefaultLib */ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             if (!ts.isExternalModule(importedFile)) {
                                 var start_2 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_2, file.imports[i].end - start_2, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
-                            else if (!ts.fileExtensionIs(importedFile.fileName, ".d.ts")) {
-                                var start_3 = ts.getTokenPosOfNode(file.imports[i], file);
-                                fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_3, file.imports[i].end - start_3, ts.Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
-                            }
                             else if (importedFile.referencedFiles.length) {
                                 var firstRef = importedFile.referencedFiles[0];
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, ts.Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
@@ -36709,13 +38063,9 @@ var ts;
                 file.resolvedModules = undefined;
             }
             return;
-            function findModuleSourceFile(fileName, nameLiteral) {
-                return findSourceFile(fileName, /* isDefaultLib */ false, file, ts.skipTrivia(file.text, nameLiteral.pos), nameLiteral.end);
-            }
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var commonPathComponents;
-            var currentDirectory = host.getCurrentDirectory();
             ts.forEach(files, function (sourceFile) {
                 // Each file contributes into common source file path
                 if (ts.isDeclarationFile(sourceFile)) {
@@ -36744,15 +38094,17 @@ var ts;
                     commonPathComponents.length = sourcePathComponents.length;
                 }
             });
+            if (!commonPathComponents) {
+                return currentDirectory;
+            }
             return ts.getNormalizedPathFromPathComponents(commonPathComponents);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
-                var currentDirectory = host.getCurrentDirectory();
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+                    var sourceFile = sourceFiles_1[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -36813,7 +38165,7 @@ var ts;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
                 if (!options.module && languageVersion < 2 /* ES6 */) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher));
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
                 if (firstNonExternalModuleSourceFile) {
@@ -36828,17 +38180,20 @@ var ts;
             }
             // Cannot specify module gen target of es6 when below es6
             if (options.module === 5 /* ES6 */ && languageVersion < 2 /* ES6 */) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
+            }
+            // Cannot specify module gen that isn't amd or system with --out
+            if (outFile && options.module && !(options.module === 2 /* AMD */ || options.module === 4 /* System */)) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             // there has to be common source directory if user specified --outdir || --sourceRoot
             // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted
             if (options.outDir ||
                 options.sourceRoot ||
-                (options.mapRoot &&
-                    (!outFile || firstExternalModuleSourceFile !== undefined))) {
+                options.mapRoot) {
                 if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
                     // If a rootDir is specified and is valid use it as the commonSourceDirectory
-                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, host.getCurrentDirectory());
+                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
                     // Compute the commonSourceDirectory from the input files
@@ -36876,6 +38231,7 @@ var ts;
 /// <reference path="sys.ts"/>
 /// <reference path="types.ts"/>
 /// <reference path="core.ts"/>
+/// <reference path="diagnosticInformationMap.generated.ts"/>
 /// <reference path="scanner.ts"/>
 var ts;
 (function (ts) {
@@ -36954,9 +38310,9 @@ var ts;
                 "es6": 5 /* ES6 */,
                 "es2015": 5 /* ES2015 */
             },
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6,
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
             paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6
+            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
         },
         {
             name: "newLine",
@@ -37025,6 +38381,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
+        {
+            name: "pretty",
+            paramType: ts.Diagnostics.KIND,
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
         {
             name: "project",
             shortName: "p",
@@ -37087,9 +38449,9 @@ var ts;
                 "es6": 2 /* ES6 */,
                 "es2015": 2 /* ES2015 */
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
             paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES6
+            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
         },
         {
             name: "version",
@@ -37122,6 +38484,31 @@ var ts;
             },
             description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
             error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         }
     ];
     var optionNameMapCache;
@@ -37261,70 +38648,52 @@ var ts;
       */
     function parseConfigFileTextToJson(fileName, jsonText) {
         try {
-            return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} };
+            var jsonTextWithoutComments = removeComments(jsonText);
+            return { config: /\S/.test(jsonTextWithoutComments) ? JSON.parse(jsonTextWithoutComments) : {} };
         }
         catch (e) {
             return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
         }
     }
     ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    /**
+     * Remove the comments from a json like text.
+     * Comments can be single line comments (starting with # or //) or multiline comments using / * * /
+     *
+     * This method replace comment content by whitespace rather than completely remove them to keep positions in json parsing error reporting accurate.
+     */
+    function removeComments(jsonText) {
+        var output = "";
+        var scanner = ts.createScanner(1 /* ES5 */, /* skipTrivia */ false, 0 /* Standard */, jsonText);
+        var token;
+        while ((token = scanner.scan()) !== 1 /* EndOfFileToken */) {
+            switch (token) {
+                case 2 /* SingleLineCommentTrivia */:
+                case 3 /* MultiLineCommentTrivia */:
+                    // replace comments with whitespace to preserve original character positions
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
+      * @param host Instance of ParseConfigHost used to enumerate files in folder.
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
     function parseJsonConfigFileContent(json, host, basePath) {
-        var errors = [];
+        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), options = _a.options, errors = _a.errors;
         return {
-            options: getCompilerOptions(),
+            options: options,
             fileNames: getFileNames(),
             errors: errors
         };
-        function getCompilerOptions() {
-            var options = {};
-            var optionNameMap = {};
-            ts.forEach(ts.optionDeclarations, function (option) {
-                optionNameMap[option.name] = option;
-            });
-            var jsonOptions = json["compilerOptions"];
-            if (jsonOptions) {
-                for (var id in jsonOptions) {
-                    if (ts.hasProperty(optionNameMap, id)) {
-                        var opt = optionNameMap[id];
-                        var optType = opt.type;
-                        var value = jsonOptions[id];
-                        var expectedType = typeof optType === "string" ? optType : "string";
-                        if (typeof value === expectedType) {
-                            if (typeof optType !== "string") {
-                                var key = value.toLowerCase();
-                                if (ts.hasProperty(optType, key)) {
-                                    value = optType[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                    value = 0;
-                                }
-                            }
-                            if (opt.isFilePath) {
-                                value = ts.normalizePath(ts.combinePaths(basePath, value));
-                                if (value === "") {
-                                    value = ".";
-                                }
-                            }
-                            options[opt.name] = value;
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-                    }
-                }
-            }
-            return options;
-        }
         function getFileNames() {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
@@ -37339,20 +38708,20 @@ var ts;
                 var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
                 var sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
                 for (var i = 0; i < sysFiles.length; i++) {
-                    var name_28 = sysFiles[i];
-                    if (ts.fileExtensionIs(name_28, ".d.ts")) {
-                        var baseName = name_28.substr(0, name_28.length - ".d.ts".length);
+                    var name_31 = sysFiles[i];
+                    if (ts.fileExtensionIs(name_31, ".d.ts")) {
+                        var baseName = name_31.substr(0, name_31.length - ".d.ts".length);
                         if (!ts.contains(sysFiles, baseName + ".tsx") && !ts.contains(sysFiles, baseName + ".ts")) {
-                            fileNames.push(name_28);
+                            fileNames.push(name_31);
                         }
                     }
-                    else if (ts.fileExtensionIs(name_28, ".ts")) {
-                        if (!ts.contains(sysFiles, name_28 + "x")) {
-                            fileNames.push(name_28);
+                    else if (ts.fileExtensionIs(name_31, ".ts")) {
+                        if (!ts.contains(sysFiles, name_31 + "x")) {
+                            fileNames.push(name_31);
                         }
                     }
                     else {
-                        fileNames.push(name_28);
+                        fileNames.push(name_31);
                     }
                 }
             }
@@ -37360,6 +38729,49 @@ var ts;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
+        var options = {};
+        var errors = [];
+        if (!jsonOptions) {
+            return { options: options, errors: errors };
+        }
+        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                var optType = opt.type;
+                var value = jsonOptions[id];
+                var expectedType = typeof optType === "string" ? optType : "string";
+                if (typeof value === expectedType) {
+                    if (typeof optType !== "string") {
+                        var key = value.toLowerCase();
+                        if (ts.hasProperty(optType, key)) {
+                            value = optType[key];
+                        }
+                        else {
+                            errors.push(ts.createCompilerDiagnostic(opt.error));
+                            value = 0;
+                        }
+                    }
+                    if (opt.isFilePath) {
+                        value = ts.normalizePath(ts.combinePaths(basePath, value));
+                        if (value === "") {
+                            value = ".";
+                        }
+                    }
+                    options[opt.name] = value;
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
+                }
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
+            }
+        }
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -37398,8 +38810,8 @@ var ts;
                     var lastSingleLineCommentEnd = -1;
                     var isFirstSingleLineComment = true;
                     var singleLineCommentCount = 0;
-                    for (var _i = 0; _i < comments.length; _i++) {
-                        var currentComment = comments[_i];
+                    for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
+                        var currentComment = comments_2[_i];
                         // For single line comments, combine consecutive ones (2 or more) into
                         // a single span from the start of the first till the end of the last
                         if (currentComment.kind === 2 /* SingleLineCommentTrivia */) {
@@ -37531,21 +38943,23 @@ var ts;
         function getNavigateToItems(program, cancellationToken, searchValue, maxResultCount) {
             var patternMatcher = ts.createPatternMatcher(searchValue);
             var rawItems = [];
+            // This means "compare in a case insensitive manner."
+            var baseSensitivity = { sensitivity: "base" };
             // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[] 
             ts.forEach(program.getSourceFiles(), function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_29 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_29);
+                for (var name_32 in nameToDeclarations) {
+                    var declarations = ts.getProperty(nameToDeclarations, name_32);
                     if (declarations) {
                         // First do a quick check to see if the name of the declaration matches the 
                         // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_29);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_32);
                         if (!matches) {
                             continue;
                         }
-                        for (var _i = 0; _i < declarations.length; _i++) {
-                            var declaration = declarations[_i];
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
                             // It was a match!  If the pattern has dots in it, then also see if the 
                             // declaration container matches as well.
                             if (patternMatcher.patternContainsDots) {
@@ -37553,14 +38967,14 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_29);
+                                matches = patternMatcher.getMatches(containers, name_32);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_29, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_32, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -37574,8 +38988,8 @@ var ts;
             function allMatchesAreCaseSensitive(matches) {
                 ts.Debug.assert(matches.length > 0);
                 // This is a case sensitive match, only if all the submatches were case sensitive.
-                for (var _i = 0; _i < matches.length; _i++) {
-                    var match = matches[_i];
+                for (var _i = 0, matches_1 = matches; _i < matches_1.length; _i++) {
+                    var match = matches_1[_i];
                     if (!match.isCaseSensitive) {
                         return false;
                     }
@@ -37650,8 +39064,8 @@ var ts;
             function bestMatchKind(matches) {
                 ts.Debug.assert(matches.length > 0);
                 var bestMatchKind = ts.PatternMatchKind.camelCase;
-                for (var _i = 0; _i < matches.length; _i++) {
-                    var match = matches[_i];
+                for (var _i = 0, matches_2 = matches; _i < matches_2.length; _i++) {
+                    var match = matches_2[_i];
                     var kind = match.kind;
                     if (kind < bestMatchKind) {
                         bestMatchKind = kind;
@@ -37659,8 +39073,6 @@ var ts;
                 }
                 return bestMatchKind;
             }
-            // This means "compare in a case insensitive manner."
-            var baseSensitivity = { sensitivity: "base" };
             function compareNavigateToItems(i1, i2) {
                 // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
                 // Right now we just sort by kind first, and then by name of the item.
@@ -37823,8 +39235,8 @@ var ts;
             }
             function addTopLevelNodes(nodes, topLevelNodes) {
                 nodes = sortNodes(nodes);
-                for (var _i = 0; _i < nodes.length; _i++) {
-                    var node = nodes[_i];
+                for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
+                    var node = nodes_4[_i];
                     switch (node.kind) {
                         case 214 /* ClassDeclaration */:
                         case 217 /* EnumDeclaration */:
@@ -37867,8 +39279,8 @@ var ts;
             function getItemsWorker(nodes, createItem) {
                 var items = [];
                 var keyToItem = {};
-                for (var _i = 0; _i < nodes.length; _i++) {
-                    var child = nodes[_i];
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var child = nodes_5[_i];
                     var item = createItem(child);
                     if (item !== undefined) {
                         if (item.text.length > 0) {
@@ -37916,7 +39328,7 @@ var ts;
                         if (ts.isBindingPattern(node.name)) {
                             break;
                         }
-                        if ((node.flags & 2035 /* Modifier */) === 0) {
+                        if ((node.flags & 1022 /* Modifier */) === 0) {
                             return undefined;
                         }
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
@@ -37943,9 +39355,9 @@ var ts;
                     case 211 /* VariableDeclaration */:
                     case 163 /* BindingElement */:
                         var variableDeclarationNode;
-                        var name_30;
+                        var name_33;
                         if (node.kind === 163 /* BindingElement */) {
-                            name_30 = node.name;
+                            name_33 = node.name;
                             variableDeclarationNode = node;
                             // binding elements are added only for variable declarations
                             // bubble up to the containing variable declaration
@@ -37957,16 +39369,16 @@ var ts;
                         else {
                             ts.Debug.assert(!ts.isBindingPattern(node.name));
                             variableDeclarationNode = node;
-                            name_30 = node.name;
+                            name_33 = node.name;
                         }
                         if (ts.isConst(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.constElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.constElement);
                         }
                         else if (ts.isLet(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.letElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.letElement);
                         }
                         else {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.variableElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.variableElement);
                         }
                     case 144 /* Constructor */:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
@@ -38220,8 +39632,8 @@ var ts;
                     //    word part. That way we don't match something like 'Class' when the user types 'a'.
                     //    But we would match 'FooAttribute' (since 'Attribute' starts with 'a').
                     var wordSpans = getWordSpans(candidate);
-                    for (var _i = 0; _i < wordSpans.length; _i++) {
-                        var span = wordSpans[_i];
+                    for (var _i = 0, wordSpans_1 = wordSpans; _i < wordSpans_1.length; _i++) {
+                        var span = wordSpans_1[_i];
                         if (partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ true)) {
                             return createPatternMatch(PatternMatchKind.substring, punctuationStripped, 
                             /*isCaseSensitive:*/ partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ false));
@@ -38327,8 +39739,8 @@ var ts;
             // Only if all words have some sort of match is the pattern considered matched.
             var subWordTextChunks = segment.subWordTextChunks;
             var matches = undefined;
-            for (var _i = 0; _i < subWordTextChunks.length; _i++) {
-                var subWordTextChunk = subWordTextChunks[_i];
+            for (var _i = 0, subWordTextChunks_1 = subWordTextChunks; _i < subWordTextChunks_1.length; _i++) {
+                var subWordTextChunk = subWordTextChunks_1[_i];
                 // Try to match the candidate with this word
                 var result = matchTextChunk(candidate, subWordTextChunk, /*punctuationStripped:*/ true);
                 if (!result) {
@@ -38886,7 +40298,7 @@ var ts;
             if (!candidates.length) {
                 // We didn't have any sig help items produced by the TS compiler.  If this is a JS 
                 // file, then see if we can figure out anything better.
-                if (ts.isJavaScript(sourceFile.fileName)) {
+                if (ts.isSourceFileJavaScript(sourceFile)) {
                     return createJavaScriptSignatureHelpItems(argumentInfo);
                 }
                 return undefined;
@@ -38913,8 +40325,8 @@ var ts;
                     var nameToDeclarations = sourceFile_1.getNamedDeclarations();
                     var declarations = ts.getProperty(nameToDeclarations, name.text);
                     if (declarations) {
-                        for (var _b = 0; _b < declarations.length; _b++) {
-                            var declaration = declarations[_b];
+                        for (var _b = 0, declarations_7 = declarations; _b < declarations_7.length; _b++) {
+                            var declaration = declarations_7[_b];
                             var symbol = declaration.symbol;
                             if (symbol) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
@@ -39030,8 +40442,8 @@ var ts;
                 // arg index.
                 var argumentIndex = 0;
                 var listChildren = argumentsList.getChildren();
-                for (var _i = 0; _i < listChildren.length; _i++) {
-                    var child = listChildren[_i];
+                for (var _i = 0, listChildren_1 = listChildren; _i < listChildren_1.length; _i++) {
+                    var child = listChildren_1[_i];
                     if (child === node) {
                         break;
                     }
@@ -39576,8 +40988,8 @@ var ts;
                 return n;
             }
             var children = n.getChildren();
-            for (var _i = 0; _i < children.length; _i++) {
-                var child = children[_i];
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
                 var shouldDiveInChildNode = 
                 // previous token is enclosed somewhere in the child
                 (child.pos <= previousToken.pos && child.end > previousToken.end) ||
@@ -39739,17 +41151,17 @@ var ts;
     function getNodeModifiers(node) {
         var flags = ts.getCombinedNodeFlags(node);
         var result = [];
-        if (flags & 32 /* Private */)
+        if (flags & 16 /* Private */)
             result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 64 /* Protected */)
+        if (flags & 32 /* Protected */)
             result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
-        if (flags & 16 /* Public */)
+        if (flags & 8 /* Public */)
             result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 128 /* Static */)
+        if (flags & 64 /* Static */)
             result.push(ts.ScriptElementKindModifier.staticModifier);
-        if (flags & 256 /* Abstract */)
+        if (flags & 128 /* Abstract */)
             result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 1 /* Export */)
+        if (flags & 2 /* Export */)
             result.push(ts.ScriptElementKindModifier.exportedModifier);
         if (ts.isInAmbientContext(node))
             result.push(ts.ScriptElementKindModifier.ambientModifier);
@@ -40746,9 +42158,9 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_31 in o) {
-                    if (o[name_31] === rule) {
-                        return name_31;
+                for (var name_34 in o) {
+                    if (o[name_34] === rule) {
+                        return name_34;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -41180,7 +42592,7 @@ var ts;
                 function TokenRangeAccess(from, to, except) {
                     this.tokens = [];
                     for (var token = from; token <= to; token++) {
-                        if (except.indexOf(token) < 0) {
+                        if (ts.indexOf(except, token) < 0) {
                             this.tokens.push(token);
                         }
                     }
@@ -41893,8 +43305,8 @@ var ts;
                         }
                     }
                     var inheritedIndentation = -1 /* Unknown */;
-                    for (var _i = 0; _i < nodes.length; _i++) {
-                        var child = nodes[_i];
+                    for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
+                        var child = nodes_6[_i];
                         inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, /*isListElement*/ true);
                     }
                     if (listEndToken !== 0 /* Unknown */) {
@@ -41923,8 +43335,8 @@ var ts;
                     var tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
                     if (isTokenInRange) {
                         var rangeHasError = rangeContainsError(currentTokenInfo.token);
-                        // save prevStartLine since processRange will overwrite this value with current ones
-                        var prevStartLine = previousRangeStartLine;
+                        // save previousRange since processRange will overwrite this value with current one
+                        var savePreviousRange = previousRange;
                         lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
                         if (rangeHasError) {
                             // do not indent comments\token if token range overlaps with some error
@@ -41935,7 +43347,9 @@ var ts;
                                 indentToken = lineAdded;
                             }
                             else {
-                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                                // indent token only if end line of previous range does not match start line of the token
+                                var prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
+                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
                             }
                         }
                     }
@@ -41983,8 +43397,8 @@ var ts;
                 }
             }
             function processTrivia(trivia, parent, contextNode, dynamicIndentation) {
-                for (var _i = 0; _i < trivia.length; _i++) {
-                    var triviaItem = trivia[_i];
+                for (var _i = 0, trivia_1 = trivia; _i < trivia_1.length; _i++) {
+                    var triviaItem = trivia_1[_i];
                     if (ts.isComment(triviaItem.kind) && ts.rangeContainsRange(originalRange, triviaItem)) {
                         var triviaItemStart = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos);
                         processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
@@ -42581,7 +43995,6 @@ var ts;
                                 return node;
                         }
                     }
-                    return node;
                 }
             }
             function deriveActualIndentationFromList(list, index, sourceFile, options) {
@@ -42792,15 +44205,18 @@ var ts;
     ];
     var jsDocCompletionEntries;
     function createNode(kind, pos, end, flags, parent) {
-        var node = new (ts.getNodeConstructor(kind))();
-        node.pos = pos;
-        node.end = end;
+        var node = new NodeObject(kind, pos, end);
         node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
-        function NodeObject() {
+        function NodeObject(kind, pos, end) {
+            this.kind = kind;
+            this.pos = pos;
+            this.end = end;
+            this.flags = 0 /* None */;
+            this.parent = undefined;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -42834,17 +44250,17 @@ var ts;
             while (pos < end) {
                 var token = scanner.scan();
                 var textPos = scanner.getTextPos();
-                nodes.push(createNode(token, pos, textPos, 4096 /* Synthetic */, this));
+                nodes.push(createNode(token, pos, textPos, 2048 /* Synthetic */, this));
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(271 /* SyntaxList */, nodes.pos, nodes.end, 4096 /* Synthetic */, this);
+            var list = createNode(271 /* SyntaxList */, nodes.pos, nodes.end, 2048 /* Synthetic */, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+                var node = nodes_7[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -43283,8 +44699,8 @@ var ts;
     })();
     var SourceFileObject = (function (_super) {
         __extends(SourceFileObject, _super);
-        function SourceFileObject() {
-            _super.apply(this, arguments);
+        function SourceFileObject(kind, pos, end) {
+            _super.call(this, kind, pos, end);
         }
         SourceFileObject.prototype.update = function (newText, textChangeRange) {
             return ts.updateSourceFile(this, newText, textChangeRange);
@@ -43399,7 +44815,7 @@ var ts;
                         break;
                     case 138 /* Parameter */:
                         // Only consider properties defined as constructor parameters
-                        if (!(node.flags & 112 /* AccessibilityModifier */)) {
+                        if (!(node.flags & 56 /* AccessibilityModifier */)) {
                             break;
                         }
                     // fall through
@@ -43606,6 +45022,9 @@ var ts;
         ClassificationTypeNames.typeAliasName = "type alias name";
         ClassificationTypeNames.parameterName = "parameter name";
         ClassificationTypeNames.docCommentTagName = "doc comment tag name";
+        ClassificationTypeNames.jsxOpenTagName = "jsx open tag name";
+        ClassificationTypeNames.jsxCloseTagName = "jsx close tag name";
+        ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name";
         return ClassificationTypeNames;
     })();
     ts.ClassificationTypeNames = ClassificationTypeNames;
@@ -43628,6 +45047,9 @@ var ts;
         ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
         ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
         ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
+        ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
+        ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
+        ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
     })(ts.ClassificationType || (ts.ClassificationType = {}));
     var ClassificationType = ts.ClassificationType;
     function displayPartsToString(displayParts) {
@@ -43675,13 +45097,15 @@ var ts;
     var HostCache = (function () {
         function HostCache(host, getCanonicalFileName) {
             this.host = host;
+            this.getCanonicalFileName = getCanonicalFileName;
             // script id => script index
-            this.fileNameToEntry = ts.createFileMap(getCanonicalFileName);
+            this.currentDirectory = host.getCurrentDirectory();
+            this.fileNameToEntry = ts.createFileMap();
             // Initialize the list with the root file names
             var rootFileNames = host.getScriptFileNames();
-            for (var _i = 0; _i < rootFileNames.length; _i++) {
-                var fileName = rootFileNames[_i];
-                this.createEntry(fileName);
+            for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) {
+                var fileName = rootFileNames_1[_i];
+                this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
             }
             // store the compilation settings
             this._compilationSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
@@ -43689,7 +45113,7 @@ var ts;
         HostCache.prototype.compilationSettings = function () {
             return this._compilationSettings;
         };
-        HostCache.prototype.createEntry = function (fileName) {
+        HostCache.prototype.createEntry = function (fileName, path) {
             var entry;
             var scriptSnapshot = this.host.getScriptSnapshot(fileName);
             if (scriptSnapshot) {
@@ -43699,36 +45123,37 @@ var ts;
                     scriptSnapshot: scriptSnapshot
                 };
             }
-            this.fileNameToEntry.set(fileName, entry);
+            this.fileNameToEntry.set(path, entry);
             return entry;
         };
-        HostCache.prototype.getEntry = function (fileName) {
-            return this.fileNameToEntry.get(fileName);
+        HostCache.prototype.getEntry = function (path) {
+            return this.fileNameToEntry.get(path);
         };
-        HostCache.prototype.contains = function (fileName) {
-            return this.fileNameToEntry.contains(fileName);
+        HostCache.prototype.contains = function (path) {
+            return this.fileNameToEntry.contains(path);
         };
         HostCache.prototype.getOrCreateEntry = function (fileName) {
-            if (this.contains(fileName)) {
-                return this.getEntry(fileName);
+            var path = ts.toPath(fileName, this.currentDirectory, this.getCanonicalFileName);
+            if (this.contains(path)) {
+                return this.getEntry(path);
             }
-            return this.createEntry(fileName);
+            return this.createEntry(fileName, path);
         };
         HostCache.prototype.getRootFileNames = function () {
             var fileNames = [];
-            this.fileNameToEntry.forEachValue(function (value) {
+            this.fileNameToEntry.forEachValue(function (path, value) {
                 if (value) {
                     fileNames.push(value.hostFileName);
                 }
             });
             return fileNames;
         };
-        HostCache.prototype.getVersion = function (fileName) {
-            var file = this.getEntry(fileName);
+        HostCache.prototype.getVersion = function (path) {
+            var file = this.getEntry(path);
             return file && file.version;
         };
-        HostCache.prototype.getScriptSnapshot = function (fileName) {
-            var file = this.getEntry(fileName);
+        HostCache.prototype.getScriptSnapshot = function (path) {
+            var file = this.getEntry(path);
             return file && file.scriptSnapshot;
         };
         return HostCache;
@@ -43910,7 +45335,8 @@ var ts;
             : (function (fileName) { return fileName.toLowerCase(); });
     }
     ts.createGetCanonicalFileName = createGetCanonicalFileName;
-    function createDocumentRegistry(useCaseSensitiveFileNames) {
+    function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
+        if (currentDirectory === void 0) { currentDirectory = ""; }
         // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
         // for those settings.
         var buckets = {};
@@ -43922,7 +45348,7 @@ var ts;
             var key = getKeyFromCompilationSettings(settings);
             var bucket = ts.lookUp(buckets, key);
             if (!bucket && createIfMissing) {
-                buckets[key] = bucket = ts.createFileMap(getCanonicalFileName);
+                buckets[key] = bucket = ts.createFileMap();
             }
             return bucket;
         }
@@ -43930,14 +45356,13 @@ var ts;
             var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === '_'; }).map(function (name) {
                 var entries = ts.lookUp(buckets, name);
                 var sourceFiles = [];
-                for (var i in entries) {
-                    var entry = entries.get(i);
+                entries.forEachValue(function (key, entry) {
                     sourceFiles.push({
-                        name: i,
+                        name: key,
                         refCount: entry.languageServiceRefCount,
                         references: entry.owners.slice(0)
                     });
-                }
+                });
                 sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
                 return {
                     bucket: name,
@@ -43954,7 +45379,8 @@ var ts;
         }
         function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) {
             var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
-            var entry = bucket.get(fileName);
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var entry = bucket.get(path);
             if (!entry) {
                 ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
                 // Have never seen this file with these settings.  Create a new source file for it.
@@ -43964,7 +45390,7 @@ var ts;
                     languageServiceRefCount: 0,
                     owners: []
                 };
-                bucket.set(fileName, entry);
+                bucket.set(path, entry);
             }
             else {
                 // We have an entry for this file.  However, it may be for a different version of
@@ -43987,11 +45413,12 @@ var ts;
         function releaseDocument(fileName, compilationSettings) {
             var bucket = getBucketForCompilationSettings(compilationSettings, false);
             ts.Debug.assert(bucket !== undefined);
-            var entry = bucket.get(fileName);
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var entry = bucket.get(path);
             entry.languageServiceRefCount--;
             ts.Debug.assert(entry.languageServiceRefCount >= 0);
             if (entry.languageServiceRefCount === 0) {
-                bucket.remove(fileName);
+                bucket.remove(path);
             }
         }
         return {
@@ -44002,8 +45429,9 @@ var ts;
         };
     }
     ts.createDocumentRegistry = createDocumentRegistry;
-    function preProcessFile(sourceText, readImportFiles) {
+    function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) {
         if (readImportFiles === void 0) { readImportFiles = true; }
+        if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
         var referencedFiles = [];
         var importedFiles = [];
         var ambientExternalModules;
@@ -44037,9 +45465,207 @@ var ts;
                 end: pos + importPath.length
             });
         }
-        function processImport() {
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeDeclare() {
+            var token = scanner.getToken();
+            if (token === 122 /* DeclareKeyword */) {
+                // declare module "mod"
+                token = scanner.scan();
+                if (token === 125 /* ModuleKeyword */) {
+                    token = scanner.scan();
+                    if (token === 9 /* StringLiteral */) {
+                        recordAmbientExternalModule();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeImport() {
+            var token = scanner.getToken();
+            if (token === 89 /* ImportKeyword */) {
+                token = scanner.scan();
+                if (token === 9 /* StringLiteral */) {
+                    // import "mod";
+                    recordModuleName();
+                    return true;
+                }
+                else {
+                    if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === 133 /* FromKeyword */) {
+                            token = scanner.scan();
+                            if (token === 9 /* StringLiteral */) {
+                                // import d from "mod";
+                                recordModuleName();
+                                return true;
+                            }
+                        }
+                        else if (token === 56 /* EqualsToken */) {
+                            if (tryConsumeRequireCall(/* skipCurrentToken */ true)) {
+                                return true;
+                            }
+                        }
+                        else if (token === 24 /* CommaToken */) {
+                            // consume comma and keep going
+                            token = scanner.scan();
+                        }
+                        else {
+                            // unknown syntax
+                            return true;
+                        }
+                    }
+                    if (token === 15 /* OpenBraceToken */) {
+                        token = scanner.scan();
+                        // consume "{ a as B, c, d as D}" clauses
+                        // make sure that it stops on EOF
+                        while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
+                            token = scanner.scan();
+                        }
+                        if (token === 16 /* CloseBraceToken */) {
+                            token = scanner.scan();
+                            if (token === 133 /* FromKeyword */) {
+                                token = scanner.scan();
+                                if (token === 9 /* StringLiteral */) {
+                                    // import {a as A} from "mod";
+                                    // import d, {a, b as B} from "mod"
+                                    recordModuleName();
+                                }
+                            }
+                        }
+                    }
+                    else if (token === 37 /* AsteriskToken */) {
+                        token = scanner.scan();
+                        if (token === 116 /* AsKeyword */) {
+                            token = scanner.scan();
+                            if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
+                                token = scanner.scan();
+                                if (token === 133 /* FromKeyword */) {
+                                    token = scanner.scan();
+                                    if (token === 9 /* StringLiteral */) {
+                                        // import * as NS from "mod"
+                                        // import d, * as NS from "mod"
+                                        recordModuleName();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeExport() {
+            var token = scanner.getToken();
+            if (token === 82 /* ExportKeyword */) {
+                token = scanner.scan();
+                if (token === 15 /* OpenBraceToken */) {
+                    token = scanner.scan();
+                    // consume "{ a as B, c, d as D}" clauses
+                    // make sure it stops on EOF
+                    while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
+                        token = scanner.scan();
+                    }
+                    if (token === 16 /* CloseBraceToken */) {
+                        token = scanner.scan();
+                        if (token === 133 /* FromKeyword */) {
+                            token = scanner.scan();
+                            if (token === 9 /* StringLiteral */) {
+                                // export {a as A} from "mod";
+                                // export {a, b as B} from "mod"
+                                recordModuleName();
+                            }
+                        }
+                    }
+                }
+                else if (token === 37 /* AsteriskToken */) {
+                    token = scanner.scan();
+                    if (token === 133 /* FromKeyword */) {
+                        token = scanner.scan();
+                        if (token === 9 /* StringLiteral */) {
+                            // export * from "mod"
+                            recordModuleName();
+                        }
+                    }
+                }
+                else if (token === 89 /* ImportKeyword */) {
+                    token = scanner.scan();
+                    if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === 56 /* EqualsToken */) {
+                            if (tryConsumeRequireCall(/* skipCurrentToken */ true)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeRequireCall(skipCurrentToken) {
+            var token = skipCurrentToken ? scanner.scan() : scanner.getToken();
+            if (token === 127 /* RequireKeyword */) {
+                token = scanner.scan();
+                if (token === 17 /* OpenParenToken */) {
+                    token = scanner.scan();
+                    if (token === 9 /* StringLiteral */) {
+                        //  require("mod");
+                        recordModuleName();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeDefine() {
+            var token = scanner.getToken();
+            if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") {
+                token = scanner.scan();
+                if (token !== 17 /* OpenParenToken */) {
+                    return true;
+                }
+                token = scanner.scan();
+                if (token === 9 /* StringLiteral */) {
+                    // looks like define ("modname", ... - skip string literal and comma
+                    token = scanner.scan();
+                    if (token === 24 /* CommaToken */) {
+                        token = scanner.scan();
+                    }
+                    else {
+                        // unexpected token
+                        return true;
+                    }
+                }
+                // should be start of dependency list
+                if (token !== 19 /* OpenBracketToken */) {
+                    return true;
+                }
+                // skip open bracket
+                token = scanner.scan();
+                var i = 0;
+                // scan until ']' or EOF
+                while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) {
+                    // record string literals as module names
+                    if (token === 9 /* StringLiteral */) {
+                        recordModuleName();
+                        i++;
+                    }
+                    token = scanner.scan();
+                }
+                return true;
+            }
+            return false;
+        }
+        function processImports() {
             scanner.setText(sourceText);
-            var token = scanner.scan();
+            scanner.scan();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -44051,152 +45677,26 @@ var ts;
             //    export * from "mod"
             //    export {a as b} from "mod"
             //    export import i = require("mod")
-            while (token !== 1 /* EndOfFileToken */) {
-                if (token === 122 /* DeclareKeyword */) {
-                    // declare module "mod"
-                    token = scanner.scan();
-                    if (token === 125 /* ModuleKeyword */) {
-                        token = scanner.scan();
-                        if (token === 9 /* StringLiteral */) {
-                            recordAmbientExternalModule();
-                            continue;
-                        }
-                    }
+            //    (for JavaScript files) require("mod")
+            while (true) {
+                if (scanner.getToken() === 1 /* EndOfFileToken */) {
+                    break;
                 }
-                else if (token === 89 /* ImportKeyword */) {
-                    token = scanner.scan();
-                    if (token === 9 /* StringLiteral */) {
-                        // import "mod";
-                        recordModuleName();
-                        continue;
-                    }
-                    else {
-                        if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === 133 /* FromKeyword */) {
-                                token = scanner.scan();
-                                if (token === 9 /* StringLiteral */) {
-                                    // import d from "mod";
-                                    recordModuleName();
-                                    continue;
-                                }
-                            }
-                            else if (token === 56 /* EqualsToken */) {
-                                token = scanner.scan();
-                                if (token === 127 /* RequireKeyword */) {
-                                    token = scanner.scan();
-                                    if (token === 17 /* OpenParenToken */) {
-                                        token = scanner.scan();
-                                        if (token === 9 /* StringLiteral */) {
-                                            //  import i = require("mod");
-                                            recordModuleName();
-                                            continue;
-                                        }
-                                    }
-                                }
-                            }
-                            else if (token === 24 /* CommaToken */) {
-                                // consume comma and keep going
-                                token = scanner.scan();
-                            }
-                            else {
-                                // unknown syntax
-                                continue;
-                            }
-                        }
-                        if (token === 15 /* OpenBraceToken */) {
-                            token = scanner.scan();
-                            // consume "{ a as B, c, d as D}" clauses
-                            while (token !== 16 /* CloseBraceToken */) {
-                                token = scanner.scan();
-                            }
-                            if (token === 16 /* CloseBraceToken */) {
-                                token = scanner.scan();
-                                if (token === 133 /* FromKeyword */) {
-                                    token = scanner.scan();
-                                    if (token === 9 /* StringLiteral */) {
-                                        // import {a as A} from "mod";
-                                        // import d, {a, b as B} from "mod"
-                                        recordModuleName();
-                                    }
-                                }
-                            }
-                        }
-                        else if (token === 37 /* AsteriskToken */) {
-                            token = scanner.scan();
-                            if (token === 116 /* AsKeyword */) {
-                                token = scanner.scan();
-                                if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                                    token = scanner.scan();
-                                    if (token === 133 /* FromKeyword */) {
-                                        token = scanner.scan();
-                                        if (token === 9 /* StringLiteral */) {
-                                            // import * as NS from "mod"
-                                            // import d, * as NS from "mod"
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                // check if at least one of alternative have moved scanner forward
+                if (tryConsumeDeclare() ||
+                    tryConsumeImport() ||
+                    tryConsumeExport() ||
+                    (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) {
+                    continue;
                 }
-                else if (token === 82 /* ExportKeyword */) {
-                    token = scanner.scan();
-                    if (token === 15 /* OpenBraceToken */) {
-                        token = scanner.scan();
-                        // consume "{ a as B, c, d as D}" clauses
-                        while (token !== 16 /* CloseBraceToken */) {
-                            token = scanner.scan();
-                        }
-                        if (token === 16 /* CloseBraceToken */) {
-                            token = scanner.scan();
-                            if (token === 133 /* FromKeyword */) {
-                                token = scanner.scan();
-                                if (token === 9 /* StringLiteral */) {
-                                    // export {a as A} from "mod";
-                                    // export {a, b as B} from "mod"
-                                    recordModuleName();
-                                }
-                            }
-                        }
-                    }
-                    else if (token === 37 /* AsteriskToken */) {
-                        token = scanner.scan();
-                        if (token === 133 /* FromKeyword */) {
-                            token = scanner.scan();
-                            if (token === 9 /* StringLiteral */) {
-                                // export * from "mod"
-                                recordModuleName();
-                            }
-                        }
-                    }
-                    else if (token === 89 /* ImportKeyword */) {
-                        token = scanner.scan();
-                        if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === 56 /* EqualsToken */) {
-                                token = scanner.scan();
-                                if (token === 127 /* RequireKeyword */) {
-                                    token = scanner.scan();
-                                    if (token === 17 /* OpenParenToken */) {
-                                        token = scanner.scan();
-                                        if (token === 9 /* StringLiteral */) {
-                                            //  export import i = require("mod");
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                else {
+                    scanner.scan();
                 }
-                token = scanner.scan();
             }
             scanner.setText(undefined);
         }
         if (readImportFiles) {
-            processImport();
+            processImports();
         }
         processTripleSlashDirectives();
         return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules };
@@ -44398,7 +45898,7 @@ var ts;
             case 144 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
             case 137 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
             case 247 /* EnumMember */: return ScriptElementKind.variableElement;
-            case 138 /* Parameter */: return (node.flags & 112 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 138 /* Parameter */: return (node.flags & 56 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
             case 221 /* ImportEqualsDeclaration */:
             case 226 /* ImportSpecifier */:
             case 223 /* ImportClause */:
@@ -44424,13 +45924,14 @@ var ts;
         return CancellationTokenObject;
     })();
     function createLanguageService(host, documentRegistry) {
-        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(); }
+        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var ruleProvider;
         var program;
         var lastProjectVersion;
         var useCaseSensitivefileNames = false;
         var cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
+        var currentDirectory = host.getCurrentDirectory();
         // Check if the localized messages json is set, otherwise query the host for it
         if (!ts.localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
             ts.localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
@@ -44442,8 +45943,7 @@ var ts;
         }
         var getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames);
         function getValidSourceFile(fileName) {
-            fileName = ts.normalizeSlashes(fileName);
-            var sourceFile = program.getSourceFile(getCanonicalFileName(fileName));
+            var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
@@ -44495,7 +45995,7 @@ var ts;
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
                 writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     // stub missing host functionality
                     ts.Debug.assert(!host.resolveModuleNames);
@@ -44515,11 +46015,10 @@ var ts;
             // not part of the new program.
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
-                for (var _i = 0; _i < oldSourceFiles.length; _i++) {
-                    var oldSourceFile = oldSourceFiles[_i];
-                    var fileName = oldSourceFile.fileName;
-                    if (!newProgram.getSourceFile(fileName) || changesInCompilationSettingsAffectSyntax) {
-                        documentRegistry.releaseDocument(fileName, oldSettings);
+                for (var _i = 0, oldSourceFiles_1 = oldSourceFiles; _i < oldSourceFiles_1.length; _i++) {
+                    var oldSourceFile = oldSourceFiles_1[_i];
+                    if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) {
+                        documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings);
                     }
                 }
             }
@@ -44575,7 +46074,8 @@ var ts;
                 return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
             }
             function sourceFileUpToDate(sourceFile) {
-                return sourceFile && sourceFile.version === hostCache.getVersion(sourceFile.fileName);
+                var path = sourceFile.path || ts.toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName);
+                return sourceFile && sourceFile.version === hostCache.getVersion(path);
             }
             function programUpToDate() {
                 // If we haven't create a program yet, then it is not up-to-date
@@ -44588,8 +46088,8 @@ var ts;
                     return false;
                 }
                 // If any file is not up-to-date, then the whole program is not up-to-date
-                for (var _i = 0; _i < rootFileNames.length; _i++) {
-                    var fileName = rootFileNames[_i];
+                for (var _i = 0, rootFileNames_2 = rootFileNames; _i < rootFileNames_2.length; _i++) {
+                    var fileName = rootFileNames_2[_i];
                     if (!sourceFileUpToDate(program.getSourceFile(fileName))) {
                         return false;
                     }
@@ -44627,7 +46127,7 @@ var ts;
             // For JavaScript files, we don't want to report the normal typescript semantic errors.
             // Instead, we just report errors for using TypeScript-only constructs from within a
             // JavaScript file.
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(targetSourceFile)) {
                 return getJavaScriptSemanticDiagnostics(targetSourceFile);
             }
             // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file.
@@ -44764,8 +46264,8 @@ var ts;
             }
             function checkModifiers(modifiers) {
                 if (modifiers) {
-                    for (var _i = 0; _i < modifiers.length; _i++) {
-                        var modifier = modifiers[_i];
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
                             case 112 /* PublicKeyword */:
                             case 110 /* PrivateKeyword */:
@@ -44839,7 +46339,7 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var syntacticStart = new Date().getTime();
             var sourceFile = getValidSourceFile(fileName);
-            var isJavaScriptFile = ts.isJavaScript(fileName);
+            var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile);
             var isJsDocTagName = false;
             var start = new Date().getTime();
             var currentToken = ts.getTokenAtPosition(sourceFile, position);
@@ -44893,9 +46393,9 @@ var ts;
             // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
             // Skip this partial identifier and adjust the contextToken to the token that precedes it.
             if (contextToken && position <= contextToken.end && ts.isWord(contextToken.kind)) {
-                var start_4 = new Date().getTime();
+                var start_3 = new Date().getTime();
                 contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile);
-                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_4));
+                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_3));
             }
             // Find the node where completion is requested on.
             // Also determine whether we are trying to complete with members of that node
@@ -45170,13 +46670,13 @@ var ts;
                 if (contextToken.kind === 9 /* StringLiteral */
                     || contextToken.kind === 10 /* RegularExpressionLiteral */
                     || ts.isTemplateLiteralKind(contextToken.kind)) {
-                    var start_5 = contextToken.getStart();
+                    var start_4 = contextToken.getStart();
                     var end = contextToken.getEnd();
                     // To be "in" one of these literals, the position has to be:
                     //   1. entirely within the token text.
                     //   2. at the end position of an unterminated token.
                     //   3. at the end of a regular expression (due to trailing flags like '/foo/g').
-                    if (start_5 < position && position < end) {
+                    if (start_4 < position && position < end) {
                         return true;
                     }
                     if (position === end) {
@@ -45467,14 +46967,14 @@ var ts;
              */
             function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
                 var exisingImportsOrExports = {};
-                for (var _i = 0; _i < namedImportsOrExports.length; _i++) {
-                    var element = namedImportsOrExports[_i];
+                for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
+                    var element = namedImportsOrExports_1[_i];
                     // If this is the current item we are editing right now, do not filter it out
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_32 = element.propertyName || element.name;
-                    exisingImportsOrExports[name_32.text] = true;
+                    var name_35 = element.propertyName || element.name;
+                    exisingImportsOrExports[name_35.text] = true;
                 }
                 if (ts.isEmpty(exisingImportsOrExports)) {
                     return exportsOfModule;
@@ -45492,8 +46992,8 @@ var ts;
                     return contextualMemberSymbols;
                 }
                 var existingMemberNames = {};
-                for (var _i = 0; _i < existingMembers.length; _i++) {
-                    var m = existingMembers[_i];
+                for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
+                    var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
                     if (m.kind !== 245 /* PropertyAssignment */ &&
                         m.kind !== 246 /* ShorthandPropertyAssignment */ &&
@@ -45506,7 +47006,10 @@ var ts;
                     }
                     var existingName = void 0;
                     if (m.kind === 163 /* BindingElement */ && m.propertyName) {
-                        existingName = m.propertyName.text;
+                        // include only identifiers in completion list
+                        if (m.propertyName.kind === 69 /* Identifier */) {
+                            existingName = m.propertyName.text;
+                        }
                     }
                     else {
                         // TODO(jfreeman): Account for computed property name
@@ -45526,8 +47029,8 @@ var ts;
              */
             function filterJsxAttributes(symbols, attributes) {
                 var seenNames = {};
-                for (var _i = 0; _i < attributes.length; _i++) {
-                    var attr = attributes[_i];
+                for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
+                    var attr = attributes_1[_i];
                     // If this is the current item we are editing right now, do not filter it out
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
@@ -45546,46 +47049,43 @@ var ts;
                 return undefined;
             }
             var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName;
-            var entries;
             if (isJsDocTagName) {
                 // If the current position is a jsDoc tag name, only tag names should be provided for completion
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
-            if (isRightOfDot && ts.isJavaScript(fileName)) {
-                entries = getCompletionEntriesFromSymbols(symbols);
-                ts.addRange(entries, getJavaScriptCompletionEntries());
+            var sourceFile = getValidSourceFile(fileName);
+            var entries = [];
+            if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) {
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
+                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     return undefined;
                 }
-                entries = getCompletionEntriesFromSymbols(symbols);
+                getCompletionEntriesFromSymbols(symbols, entries);
             }
             // Add keywords if this is not a member completion list
             if (!isMemberCompletion && !isJsDocTagName) {
                 ts.addRange(entries, keywordCompletions);
             }
             return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries() {
+            function getJavaScriptCompletionEntries(sourceFile, uniqueNames) {
                 var entries = [];
-                var allNames = {};
                 var target = program.getCompilerOptions().target;
-                for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
-                    var sourceFile = _a[_i];
-                    var nameTable = getNameTable(sourceFile);
-                    for (var name_33 in nameTable) {
-                        if (!allNames[name_33]) {
-                            allNames[name_33] = name_33;
-                            var displayName = getCompletionEntryDisplayName(name_33, target, /*performCharacterChecks:*/ true);
-                            if (displayName) {
-                                var entry = {
-                                    name: displayName,
-                                    kind: ScriptElementKind.warning,
-                                    kindModifiers: "",
-                                    sortText: "1"
-                                };
-                                entries.push(entry);
-                            }
+                var nameTable = getNameTable(sourceFile);
+                for (var name_36 in nameTable) {
+                    if (!uniqueNames[name_36]) {
+                        uniqueNames[name_36] = name_36;
+                        var displayName = getCompletionEntryDisplayName(name_36, target, /*performCharacterChecks:*/ true);
+                        if (displayName) {
+                            var entry = {
+                                name: displayName,
+                                kind: ScriptElementKind.warning,
+                                kindModifiers: "",
+                                sortText: "1"
+                            };
+                            entries.push(entry);
                         }
                     }
                 }
@@ -45623,25 +47123,24 @@ var ts;
                     sortText: "0"
                 };
             }
-            function getCompletionEntriesFromSymbols(symbols) {
+            function getCompletionEntriesFromSymbols(symbols, entries) {
                 var start = new Date().getTime();
-                var entries = [];
+                var uniqueNames = {};
                 if (symbols) {
-                    var nameToSymbol = {};
-                    for (var _i = 0; _i < symbols.length; _i++) {
-                        var symbol = symbols[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var symbol = symbols_3[_i];
                         var entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             var id = ts.escapeIdentifier(entry.name);
-                            if (!ts.lookUp(nameToSymbol, id)) {
+                            if (!ts.lookUp(uniqueNames, id)) {
                                 entries.push(entry);
-                                nameToSymbol[id] = symbol;
+                                uniqueNames[id] = id;
                             }
                         }
                     }
                 }
                 log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
-                return entries;
+                return uniqueNames;
             }
         }
         function getCompletionEntryDetails(fileName, position, entryName) {
@@ -45842,16 +47341,16 @@ var ts;
                                 case ScriptElementKind.parameterElement:
                                 case ScriptElementKind.localVariableElement:
                                     // If it is call or construct signature of lambda's write type name
-                                    displayParts.push(ts.punctuationPart(54 /* ColonToken */));
+                                    displayParts.push(ts.punctuationPart(ts.SyntaxKind.ColonToken));
                                     displayParts.push(ts.spacePart());
                                     if (useConstructSignatures) {
-                                        displayParts.push(ts.keywordPart(92 /* NewKeyword */));
+                                        displayParts.push(ts.keywordPart(ts.SyntaxKind.NewKeyword));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 65536 /* Anonymous */)) {
-                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */));
+                                    if (!(type.flags & ts.TypeFlags.Anonymous)) {
+                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, ts.SymbolFormatFlags.WriteTypeParametersOrArguments));
                                     }
-                                    addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */);
+                                    addSignatureDisplayParts(signature, allSignatures, ts.TypeFormatFlags.WriteArrowStyleSignature);
                                     break;
                                 default:
                                     // Just signature
@@ -46371,8 +47870,8 @@ var ts;
                     }
                     var fileNameToDocumentHighlights = {};
                     var result = [];
-                    for (var _i = 0; _i < referencedSymbols.length; _i++) {
-                        var referencedSymbol = referencedSymbols[_i];
+                    for (var _i = 0, referencedSymbols_1 = referencedSymbols; _i < referencedSymbols_1.length; _i++) {
+                        var referencedSymbol = referencedSymbols_1[_i];
                         for (var _a = 0, _b = referencedSymbol.references; _a < _b.length; _a++) {
                             var referenceEntry = _b[_a];
                             var fileName_1 = referenceEntry.fileName;
@@ -46516,7 +48015,6 @@ var ts;
                             ts.forEachChild(node, aggregate);
                         }
                     }
-                    ;
                 }
                 /**
                  * For lack of a better name, this function takes a throw statement and returns the
@@ -46554,7 +48052,6 @@ var ts;
                             ts.forEachChild(node, aggregate);
                         }
                     }
-                    ;
                 }
                 function ownsBreakOrContinueStatement(owner, statement) {
                     var actualOwner = getBreakOrContinueOwner(statement);
@@ -46623,7 +48120,7 @@ var ts;
                         case 219 /* ModuleBlock */:
                         case 248 /* SourceFile */:
                             // Container is either a class declaration or the declaration is a classDeclaration
-                            if (modifierFlag & 256 /* Abstract */) {
+                            if (modifierFlag & 128 /* Abstract */) {
                                 nodes = declaration.members.concat(declaration);
                             }
                             else {
@@ -46638,7 +48135,7 @@ var ts;
                             nodes = container.members;
                             // If we're an accessibility modifier, we're in an instance member and should search
                             // the constructor's parameter list for instance members as well.
-                            if (modifierFlag & 112 /* AccessibilityModifier */) {
+                            if (modifierFlag & 56 /* AccessibilityModifier */) {
                                 var constructor = ts.forEach(container.members, function (member) {
                                     return member.kind === 144 /* Constructor */ && member;
                                 });
@@ -46646,7 +48143,7 @@ var ts;
                                     nodes = nodes.concat(constructor.parameters);
                                 }
                             }
-                            else if (modifierFlag & 256 /* Abstract */) {
+                            else if (modifierFlag & 128 /* Abstract */) {
                                 nodes = nodes.concat(container);
                             }
                             break;
@@ -46662,19 +48159,19 @@ var ts;
                     function getFlagFromModifier(modifier) {
                         switch (modifier) {
                             case 112 /* PublicKeyword */:
-                                return 16 /* Public */;
+                                return 8 /* Public */;
                             case 110 /* PrivateKeyword */:
-                                return 32 /* Private */;
+                                return 16 /* Private */;
                             case 111 /* ProtectedKeyword */:
-                                return 64 /* Protected */;
+                                return 32 /* Protected */;
                             case 113 /* StaticKeyword */:
-                                return 128 /* Static */;
+                                return 64 /* Static */;
                             case 82 /* ExportKeyword */:
-                                return 1 /* Export */;
+                                return 2 /* Export */;
                             case 122 /* DeclareKeyword */:
-                                return 2 /* Ambient */;
+                                return 4 /* Ambient */;
                             case 115 /* AbstractKeyword */:
-                                return 256 /* Abstract */;
+                                return 128 /* Abstract */;
                             default:
                                 ts.Debug.fail();
                         }
@@ -46873,8 +48370,8 @@ var ts;
                     return undefined;
                 }
                 var result = [];
-                for (var _i = 0; _i < documentHighlights.length; _i++) {
-                    var entry = documentHighlights[_i];
+                for (var _i = 0, documentHighlights_1 = documentHighlights; _i < documentHighlights_1.length; _i++) {
+                    var entry = documentHighlights_1[_i];
                     for (var _a = 0, _b = entry.highlightSpans; _a < _b.length; _a++) {
                         var highlightSpan = _b[_a];
                         result.push({
@@ -46892,8 +48389,8 @@ var ts;
                 return undefined;
             }
             var referenceEntries = [];
-            for (var _i = 0; _i < referenceSymbols.length; _i++) {
-                var referenceSymbol = referenceSymbols[_i];
+            for (var _i = 0, referenceSymbols_1 = referenceSymbols; _i < referenceSymbols_1.length; _i++) {
+                var referenceSymbol = referenceSymbols_1[_i];
                 ts.addRange(referenceEntries, referenceSymbol.references);
             }
             return referenceEntries;
@@ -46978,8 +48475,8 @@ var ts;
             }
             else {
                 var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                    var sourceFile = sourceFiles_2[_i];
                     cancellationToken.throwIfCancellationRequested();
                     var nameTable = getNameTable(sourceFile);
                     if (ts.lookUp(nameTable, internedName)) {
@@ -47039,7 +48536,7 @@ var ts;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32 /* Private */) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 16 /* Private */) ? d : undefined; });
                     if (privateDeclaration) {
                         return ts.getAncestor(privateDeclaration, 214 /* ClassDeclaration */);
                     }
@@ -47057,8 +48554,8 @@ var ts;
                 var scope = undefined;
                 var declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var _i = 0; _i < declarations.length; _i++) {
-                        var declaration = declarations[_i];
+                    for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                        var declaration = declarations_8[_i];
                         var container = getContainerNode(declaration);
                         if (!container) {
                             return undefined;
@@ -47238,7 +48735,7 @@ var ts;
                     return undefined;
                 }
                 // Whether 'super' occurs in a static context within a class.
-                var staticFlag = 128 /* Static */;
+                var staticFlag = 64 /* Static */;
                 switch (searchSpaceNode.kind) {
                     case 141 /* PropertyDeclaration */:
                     case 140 /* PropertySignature */:
@@ -47266,7 +48763,7 @@ var ts;
                     // If we have a 'super' container, we must have an enclosing class.
                     // Now make sure the owning class is the same as the search-space
                     // and has the same static qualifier as the original 'super's owner.
-                    if (container && (128 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (64 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -47276,7 +48773,7 @@ var ts;
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
-                var staticFlag = 128 /* Static */;
+                var staticFlag = 64 /* Static */;
                 switch (searchSpaceNode.kind) {
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
@@ -47354,7 +48851,7 @@ var ts;
                             case 214 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
-                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 128 /* Static */) === staticFlag) {
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 64 /* Static */) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -47478,19 +48975,19 @@ var ts;
                 if (isNameOfPropertyAssignment(node)) {
                     var objectLiteral = node.parent.parent;
                     var contextualType = typeChecker.getContextualType(objectLiteral);
-                    var name_34 = node.text;
+                    var name_37 = node.text;
                     if (contextualType) {
                         if (contextualType.flags & 16384 /* Union */) {
                             // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types)
                             // if not, search the constituent types for the property
-                            var unionProperty = contextualType.getProperty(name_34);
+                            var unionProperty = contextualType.getProperty(name_37);
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
                                 var result_4 = [];
                                 ts.forEach(contextualType.types, function (t) {
-                                    var symbol = t.getProperty(name_34);
+                                    var symbol = t.getProperty(name_37);
                                     if (symbol) {
                                         result_4.push(symbol);
                                     }
@@ -47499,7 +48996,7 @@ var ts;
                             }
                         }
                         else {
-                            var symbol_1 = contextualType.getProperty(name_34);
+                            var symbol_1 = contextualType.getProperty(name_37);
                             if (symbol_1) {
                                 return [symbol_1];
                             }
@@ -47525,8 +49022,8 @@ var ts;
                         // To achieve that we will keep iterating until the result stabilizes.
                         // Remember the last meaning
                         lastIterationMeaning = meaning;
-                        for (var _i = 0; _i < declarations.length; _i++) {
-                            var declaration = declarations[_i];
+                        for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                            var declaration = declarations_9[_i];
                             var declarationMeaning = getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -47642,7 +49139,6 @@ var ts;
                     return 4 /* Namespace */ | 1 /* Value */;
             }
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
-            ts.Debug.fail("Unknown declaration type");
         }
         function isTypeReference(node) {
             if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
@@ -47911,6 +49407,9 @@ var ts;
                 case 16 /* typeAliasName */: return ClassificationTypeNames.typeAliasName;
                 case 17 /* parameterName */: return ClassificationTypeNames.parameterName;
                 case 18 /* docCommentTagName */: return ClassificationTypeNames.docCommentTagName;
+                case 19 /* jsxOpenTagName */: return ClassificationTypeNames.jsxOpenTagName;
+                case 20 /* jsxCloseTagName */: return ClassificationTypeNames.jsxCloseTagName;
+                case 21 /* jsxSelfClosingTagName */: return ClassificationTypeNames.jsxSelfClosingTagName;
             }
         }
         function convertClassifications(classifications) {
@@ -48180,6 +49679,21 @@ var ts;
                                     return 17 /* parameterName */;
                                 }
                                 return;
+                            case 235 /* JsxOpeningElement */:
+                                if (token.parent.tagName === token) {
+                                    return 19 /* jsxOpenTagName */;
+                                }
+                                return;
+                            case 237 /* JsxClosingElement */:
+                                if (token.parent.tagName === token) {
+                                    return 20 /* jsxCloseTagName */;
+                                }
+                                return;
+                            case 234 /* JsxSelfClosingElement */:
+                                if (token.parent.tagName === token) {
+                                    return 21 /* jsxSelfClosingTagName */;
+                                }
+                                return;
                         }
                     }
                     return 2 /* identifier */;
@@ -48221,8 +49735,8 @@ var ts;
                 if (matchKind) {
                     var parentElement = token.parent;
                     var childNodes = parentElement.getChildren(sourceFile);
-                    for (var _i = 0; _i < childNodes.length; _i++) {
-                        var current = childNodes[_i];
+                    for (var _i = 0, childNodes_1 = childNodes; _i < childNodes_1.length; _i++) {
+                        var current = childNodes_1[_i];
                         if (current.kind === matchKind) {
                             var range1 = ts.createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile));
                             var range2 = ts.createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile));
@@ -48552,12 +50066,12 @@ var ts;
                         // Disallow rename for elements that are defined in the standard TypeScript library.
                         var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         if (defaultLibFileName) {
-                            for (var _i = 0; _i < declarations.length; _i++) {
-                                var current = declarations[_i];
+                            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                                var current = declarations_10[_i];
                                 var sourceFile_2 = current.getSourceFile();
                                 var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
                                 if (sourceFile_2 && getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) {
-                                    return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                                    return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
                             }
                         }
@@ -48577,7 +50091,7 @@ var ts;
                     }
                 }
             }
-            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element.key));
+            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element));
             function getRenameInfoError(localizedErrorMessage) {
                 return {
                     canRename: false,
@@ -49104,18 +50618,8 @@ var ts;
     ts.getDefaultLibFilePath = getDefaultLibFilePath;
     function initializeServices() {
         ts.objectAllocator = {
-            getNodeConstructor: function (kind) {
-                function Node() {
-                }
-                var proto = kind === 248 /* SourceFile */ ? new SourceFileObject() : new NodeObject();
-                proto.kind = kind;
-                proto.pos = -1;
-                proto.end = -1;
-                proto.flags = 0;
-                proto.parent = undefined;
-                Node.prototype = proto;
-                return Node;
-            },
+            getNodeConstructor: function () { return NodeObject; },
+            getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
             getSignatureConstructor: function () { return SignatureObject; }
@@ -49136,7 +50640,7 @@ var ts;
          */
         function spanInSourceFileAtLocation(sourceFile, position) {
             // Cannot set breakpoint in dts file
-            if (sourceFile.flags & 8192 /* DeclarationFile */) {
+            if (sourceFile.flags & 4096 /* DeclarationFile */) {
                 return undefined;
             }
             var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
@@ -49354,7 +50858,7 @@ var ts;
                             ? variableDeclaration.parent.parent.initializer.declarations
                             : undefined;
                     // Breakpoint is possible in variableDeclaration only if there is initialization
-                    if (variableDeclaration.initializer || (variableDeclaration.flags & 1 /* Export */)) {
+                    if (variableDeclaration.initializer || (variableDeclaration.flags & 2 /* Export */)) {
                         if (declarations && declarations[0] === variableDeclaration) {
                             if (isParentVariableStatement) {
                                 // First declaration - include let keyword
@@ -49380,7 +50884,7 @@ var ts;
                 function canHaveSpanInParameterDeclaration(parameter) {
                     // Breakpoint is possible on parameter only if it has initializer, is a rest parameter, or has public or private modifier
                     return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 16 /* Public */) || !!(parameter.flags & 32 /* Private */);
+                        !!(parameter.flags & 8 /* Public */) || !!(parameter.flags & 16 /* Private */);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (canHaveSpanInParameterDeclaration(parameter)) {
@@ -49400,7 +50904,7 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1 /* Export */) ||
+                    return !!(functionDeclaration.flags & 2 /* Export */) ||
                         (functionDeclaration.parent.kind === 214 /* ClassDeclaration */ && functionDeclaration.kind !== 144 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
@@ -49494,7 +50998,6 @@ var ts;
                         // fall through.
                         case 244 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                            ;
                         case 220 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
@@ -49535,8 +51038,6 @@ var ts;
                         default:
                             return spanInNode(node.parent);
                     }
-                    // Default to parent node
-                    return spanInNode(node.parent);
                 }
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
@@ -49665,7 +51166,6 @@ var ts;
             // TODO: should this be '==='?
             if (settingsJson == null || settingsJson == "") {
                 throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-                return null;
             }
             return JSON.parse(settingsJson);
         };
@@ -50189,7 +51689,8 @@ var ts;
         };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
             return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
-                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()));
+                // for now treat files as JavaScript 
+                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
                 var convertResult = {
                     referencedFiles: [],
                     importedFiles: [],
@@ -50253,7 +51754,7 @@ var ts;
         TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
             try {
                 if (this.documentRegistry === undefined) {
-                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
                 }
                 var hostAdapter = new LanguageServiceShimHostAdapter(host);
                 var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
@@ -50286,7 +51787,7 @@ var ts;
         TypeScriptServicesFactory.prototype.close = function () {
             // Forget all the registered shims
             this._shims = [];
-            this.documentRegistry = ts.createDocumentRegistry();
+            this.documentRegistry = undefined;
         };
         TypeScriptServicesFactory.prototype.registerShim = function (shim) {
             this._shims.push(shim);
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 98c4496d891..af9a8bffe35 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -17,19 +17,22 @@ declare namespace ts {
     interface Map<T> {
         [index: string]: T;
     }
+    type Path = string & {
+        __pathBrand: any;
+    };
     interface FileMap<T> {
-        get(fileName: string): T;
-        set(fileName: string, value: T): void;
-        contains(fileName: string): boolean;
-        remove(fileName: string): void;
-        forEachValue(f: (v: T) => void): void;
+        get(fileName: Path): T;
+        set(fileName: Path, value: T): void;
+        contains(fileName: Path): boolean;
+        remove(fileName: Path): void;
+        forEachValue(f: (key: Path, v: T) => void): void;
         clear(): void;
     }
     interface TextRange {
         pos: number;
         end: number;
     }
-    const enum SyntaxKind {
+    enum SyntaxKind {
         Unknown = 0,
         EndOfFileToken = 1,
         SingleLineCommentTrivia = 2,
@@ -327,30 +330,34 @@ declare namespace ts {
         LastBinaryOperator = 68,
         FirstNode = 135,
     }
-    const enum NodeFlags {
-        Export = 1,
-        Ambient = 2,
-        Public = 16,
-        Private = 32,
-        Protected = 64,
-        Static = 128,
-        Abstract = 256,
-        Async = 512,
-        Default = 1024,
-        MultiLine = 2048,
-        Synthetic = 4096,
-        DeclarationFile = 8192,
-        Let = 16384,
-        Const = 32768,
-        OctalLiteral = 65536,
-        Namespace = 131072,
-        ExportContext = 262144,
-        ContainsThis = 524288,
-        Modifier = 2035,
-        AccessibilityModifier = 112,
-        BlockScoped = 49152,
+    enum NodeFlags {
+        None = 0,
+        Export = 2,
+        Ambient = 4,
+        Public = 8,
+        Private = 16,
+        Protected = 32,
+        Static = 64,
+        Abstract = 128,
+        Async = 256,
+        Default = 512,
+        MultiLine = 1024,
+        Synthetic = 2048,
+        DeclarationFile = 4096,
+        Let = 8192,
+        Const = 16384,
+        OctalLiteral = 32768,
+        Namespace = 65536,
+        ExportContext = 131072,
+        ContainsThis = 262144,
+        HasImplicitReturn = 524288,
+        HasExplicitReturn = 1048576,
+        Modifier = 1022,
+        AccessibilityModifier = 56,
+        BlockScoped = 24576,
+        ReachabilityCheckFlags = 1572864,
     }
-    const enum JsxFlags {
+    enum JsxFlags {
         None = 0,
         IntrinsicNamedElement = 1,
         IntrinsicIndexedElement = 2,
@@ -380,6 +387,7 @@ declare namespace ts {
         right: Identifier;
     }
     type EntityName = Identifier | QualifiedName;
+    type PropertyName = Identifier | LiteralExpression | ComputedPropertyName;
     type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern;
     interface Declaration extends Node {
         _declarationBrand: any;
@@ -418,7 +426,7 @@ declare namespace ts {
         initializer?: Expression;
     }
     interface BindingElement extends Declaration {
-        propertyName?: Identifier;
+        propertyName?: PropertyName;
         dotDotDotToken?: Node;
         name: Identifier | BindingPattern;
         initializer?: Expression;
@@ -445,7 +453,7 @@ declare namespace ts {
         objectAssignmentInitializer?: Expression;
     }
     interface VariableLikeDeclaration extends Declaration {
-        propertyName?: Identifier;
+        propertyName?: PropertyName;
         dotDotDotToken?: Node;
         name: DeclarationName;
         questionToken?: Node;
@@ -574,7 +582,7 @@ declare namespace ts {
         asteriskToken?: Node;
         expression?: Expression;
     }
-    interface BinaryExpression extends Expression {
+    interface BinaryExpression extends Expression, Declaration {
         left: Expression;
         operatorToken: Node;
         right: Expression;
@@ -618,7 +626,7 @@ declare namespace ts {
     interface ObjectLiteralExpression extends PrimaryExpression, Declaration {
         properties: NodeArray<ObjectLiteralElement>;
     }
-    interface PropertyAccessExpression extends MemberExpression {
+    interface PropertyAccessExpression extends MemberExpression, Declaration {
         expression: LeftHandSideExpression;
         dotToken: Node;
         name: Identifier;
@@ -930,6 +938,7 @@ declare namespace ts {
         statements: NodeArray<Statement>;
         endOfFileToken: Node;
         fileName: string;
+        path: Path;
         text: string;
         amdDependencies: {
             path: string;
@@ -954,7 +963,7 @@ declare namespace ts {
         getSourceFile(fileName: string): SourceFile;
         getCurrentDirectory(): string;
     }
-    interface ParseConfigHost extends ModuleResolutionHost {
+    interface ParseConfigHost {
         readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
     }
     interface WriteFileCallback {
@@ -1092,7 +1101,7 @@ declare namespace ts {
         trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
         reportInaccessibleThisError(): void;
     }
-    const enum TypeFormatFlags {
+    enum TypeFormatFlags {
         None = 0,
         WriteArrayAsGenericType = 1,
         UseTypeOfFunction = 2,
@@ -1103,7 +1112,7 @@ declare namespace ts {
         InElementType = 64,
         UseFullyQualifiedType = 128,
     }
-    const enum SymbolFormatFlags {
+    enum SymbolFormatFlags {
         None = 0,
         WriteTypeParametersOrArguments = 1,
         UseOnlyExternalAliasing = 2,
@@ -1113,7 +1122,7 @@ declare namespace ts {
         parameterIndex: number;
         type: Type;
     }
-    const enum SymbolFlags {
+    enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
         BlockScopedVariable = 2,
@@ -1190,7 +1199,7 @@ declare namespace ts {
     interface SymbolTable {
         [index: string]: Symbol;
     }
-    const enum TypeFlags {
+    enum TypeFlags {
         Any = 1,
         String = 2,
         Number = 4,
@@ -1212,6 +1221,7 @@ declare namespace ts {
         ObjectLiteral = 524288,
         ESSymbol = 16777216,
         ThisType = 33554432,
+        ObjectLiteralPatternWithComputedProperties = 67108864,
         StringLike = 258,
         NumberLike = 132,
         ObjectType = 80896,
@@ -1261,7 +1271,7 @@ declare namespace ts {
     interface TypeParameter extends Type {
         constraint: Type;
     }
-    const enum SignatureKind {
+    enum SignatureKind {
         Call = 0,
         Construct = 1,
     }
@@ -1271,7 +1281,7 @@ declare namespace ts {
         parameters: Symbol[];
         typePredicate?: TypePredicate;
     }
-    const enum IndexKind {
+    enum IndexKind {
         String = 0,
         Number = 1,
     }
@@ -1279,6 +1289,7 @@ declare namespace ts {
         key: string;
         category: DiagnosticCategory;
         code: number;
+        message: string;
     }
     /**
      * A linked list of formatted diagnostic messages to be used as part of a multiline message.
@@ -1305,7 +1316,7 @@ declare namespace ts {
         Error = 1,
         Message = 2,
     }
-    const enum ModuleResolutionKind {
+    enum ModuleResolutionKind {
         Classic = 1,
         NodeJs = 2,
     }
@@ -1350,9 +1361,14 @@ declare namespace ts {
         experimentalDecorators?: boolean;
         emitDecoratorMetadata?: boolean;
         moduleResolution?: ModuleResolutionKind;
+        allowUnusedLabels?: boolean;
+        allowUnreachableCode?: boolean;
+        noImplicitReturns?: boolean;
+        noFallthroughCasesInSwitch?: boolean;
+        forceConsistentCasingInFileNames?: boolean;
         [option: string]: string | number | boolean;
     }
-    const enum ModuleKind {
+    enum ModuleKind {
         None = 0,
         CommonJS = 1,
         AMD = 2,
@@ -1361,12 +1377,12 @@ declare namespace ts {
         ES6 = 5,
         ES2015 = 5,
     }
-    const enum JsxEmit {
+    enum JsxEmit {
         None = 0,
         Preserve = 1,
         React = 2,
     }
-    const enum NewLineKind {
+    enum NewLineKind {
         CarriageReturnLineFeed = 0,
         LineFeed = 1,
     }
@@ -1374,14 +1390,14 @@ declare namespace ts {
         line: number;
         character: number;
     }
-    const enum ScriptTarget {
+    enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
         ES6 = 2,
         ES2015 = 2,
         Latest = 2,
     }
-    const enum LanguageVariant {
+    enum LanguageVariant {
         Standard = 0,
         JSX = 1,
     }
@@ -1521,11 +1537,9 @@ declare namespace ts {
      */
     function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
-    function arrayStructurallyIsEqualTo<T>(array1: Array<T>, array2: Array<T>): boolean;
 }
 declare namespace ts {
-    function getNodeConstructor(kind: SyntaxKind): new () => Node;
-    function createNode(kind: SyntaxKind): Node;
+    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
     function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
@@ -1564,10 +1578,15 @@ declare namespace ts {
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
+      * @param host Instance of ParseConfigHost used to enumerate files in folder.
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
     function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine;
+    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string): {
+        options: CompilerOptions;
+        errors: Diagnostic[];
+    };
 }
 declare namespace ts {
     /** The version of the language service API */
@@ -1931,7 +1950,7 @@ declare namespace ts {
         outputFiles: OutputFile[];
         emitSkipped: boolean;
     }
-    const enum OutputFileType {
+    enum OutputFileType {
         JavaScript = 0,
         SourceMap = 1,
         Declaration = 2,
@@ -1941,7 +1960,7 @@ declare namespace ts {
         writeByteOrderMark: boolean;
         text: string;
     }
-    const enum EndOfLineState {
+    enum EndOfLineState {
         None = 0,
         InMultiLineCommentTrivia = 1,
         InSingleQuoteStringLiteral = 2,
@@ -2108,8 +2127,11 @@ declare namespace ts {
         static typeAliasName: string;
         static parameterName: string;
         static docCommentTagName: string;
+        static jsxOpenTagName: string;
+        static jsxCloseTagName: string;
+        static jsxSelfClosingTagName: string;
     }
-    const enum ClassificationType {
+    enum ClassificationType {
         comment = 1,
         identifier = 2,
         keyword = 3,
@@ -2128,6 +2150,9 @@ declare namespace ts {
         typeAliasName = 16,
         parameterName = 17,
         docCommentTagName = 18,
+        jsxOpenTagName = 19,
+        jsxCloseTagName = 20,
+        jsxSelfClosingTagName = 21,
     }
     interface DisplayPartsSymbolWriter extends SymbolWriter {
         displayParts(): SymbolDisplayPart[];
@@ -2152,8 +2177,8 @@ declare namespace ts {
     let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string;
-    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean): DocumentRegistry;
-    function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
+    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry;
+    function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo;
     function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService;
     function createClassifier(): Classifier;
     /**
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index 7f9c5c293ad..498ddc37860 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -349,27 +349,31 @@ var ts;
     })(ts.SyntaxKind || (ts.SyntaxKind = {}));
     var SyntaxKind = ts.SyntaxKind;
     (function (NodeFlags) {
-        NodeFlags[NodeFlags["Export"] = 1] = "Export";
-        NodeFlags[NodeFlags["Ambient"] = 2] = "Ambient";
-        NodeFlags[NodeFlags["Public"] = 16] = "Public";
-        NodeFlags[NodeFlags["Private"] = 32] = "Private";
-        NodeFlags[NodeFlags["Protected"] = 64] = "Protected";
-        NodeFlags[NodeFlags["Static"] = 128] = "Static";
-        NodeFlags[NodeFlags["Abstract"] = 256] = "Abstract";
-        NodeFlags[NodeFlags["Async"] = 512] = "Async";
-        NodeFlags[NodeFlags["Default"] = 1024] = "Default";
-        NodeFlags[NodeFlags["MultiLine"] = 2048] = "MultiLine";
-        NodeFlags[NodeFlags["Synthetic"] = 4096] = "Synthetic";
-        NodeFlags[NodeFlags["DeclarationFile"] = 8192] = "DeclarationFile";
-        NodeFlags[NodeFlags["Let"] = 16384] = "Let";
-        NodeFlags[NodeFlags["Const"] = 32768] = "Const";
-        NodeFlags[NodeFlags["OctalLiteral"] = 65536] = "OctalLiteral";
-        NodeFlags[NodeFlags["Namespace"] = 131072] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 262144] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 524288] = "ContainsThis";
-        NodeFlags[NodeFlags["Modifier"] = 2035] = "Modifier";
-        NodeFlags[NodeFlags["AccessibilityModifier"] = 112] = "AccessibilityModifier";
-        NodeFlags[NodeFlags["BlockScoped"] = 49152] = "BlockScoped";
+        NodeFlags[NodeFlags["None"] = 0] = "None";
+        NodeFlags[NodeFlags["Export"] = 2] = "Export";
+        NodeFlags[NodeFlags["Ambient"] = 4] = "Ambient";
+        NodeFlags[NodeFlags["Public"] = 8] = "Public";
+        NodeFlags[NodeFlags["Private"] = 16] = "Private";
+        NodeFlags[NodeFlags["Protected"] = 32] = "Protected";
+        NodeFlags[NodeFlags["Static"] = 64] = "Static";
+        NodeFlags[NodeFlags["Abstract"] = 128] = "Abstract";
+        NodeFlags[NodeFlags["Async"] = 256] = "Async";
+        NodeFlags[NodeFlags["Default"] = 512] = "Default";
+        NodeFlags[NodeFlags["MultiLine"] = 1024] = "MultiLine";
+        NodeFlags[NodeFlags["Synthetic"] = 2048] = "Synthetic";
+        NodeFlags[NodeFlags["DeclarationFile"] = 4096] = "DeclarationFile";
+        NodeFlags[NodeFlags["Let"] = 8192] = "Let";
+        NodeFlags[NodeFlags["Const"] = 16384] = "Const";
+        NodeFlags[NodeFlags["OctalLiteral"] = 32768] = "OctalLiteral";
+        NodeFlags[NodeFlags["Namespace"] = 65536] = "Namespace";
+        NodeFlags[NodeFlags["ExportContext"] = 131072] = "ExportContext";
+        NodeFlags[NodeFlags["ContainsThis"] = 262144] = "ContainsThis";
+        NodeFlags[NodeFlags["HasImplicitReturn"] = 524288] = "HasImplicitReturn";
+        NodeFlags[NodeFlags["HasExplicitReturn"] = 1048576] = "HasExplicitReturn";
+        NodeFlags[NodeFlags["Modifier"] = 1022] = "Modifier";
+        NodeFlags[NodeFlags["AccessibilityModifier"] = 56] = "AccessibilityModifier";
+        NodeFlags[NodeFlags["BlockScoped"] = 24576] = "BlockScoped";
+        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 1572864] = "ReachabilityCheckFlags";
     })(ts.NodeFlags || (ts.NodeFlags = {}));
     var NodeFlags = ts.NodeFlags;
     /* @internal */
@@ -583,6 +587,7 @@ var ts;
         NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 8192] = "EnumValuesComputed";
         NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 16384] = "BlockScopedBindingInLoop";
         NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
+        NodeCheckFlags[NodeCheckFlags["LoopWithBlockScopedBindingCapturedInFunction"] = 65536] = "LoopWithBlockScopedBindingCapturedInFunction";
     })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
     var NodeCheckFlags = ts.NodeCheckFlags;
     (function (TypeFlags) {
@@ -617,6 +622,7 @@ var ts;
         TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType";
         TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol";
         TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType";
+        TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties";
         /* @internal */
         TypeFlags[TypeFlags["Intrinsic"] = 16777343] = "Intrinsic";
         /* @internal */
@@ -688,6 +694,12 @@ var ts;
     })(ts.LanguageVariant || (ts.LanguageVariant = {}));
     var LanguageVariant = ts.LanguageVariant;
     /* @internal */
+    (function (DiagnosticStyle) {
+        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
+        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
+    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
+    var DiagnosticStyle = ts.DiagnosticStyle;
+    /* @internal */
     (function (CharacterCodes) {
         CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
         CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
@@ -836,40 +848,50 @@ var ts;
         Ternary[Ternary["True"] = -1] = "True";
     })(ts.Ternary || (ts.Ternary = {}));
     var Ternary = ts.Ternary;
-    function createFileMap(getCanonicalFileName) {
+    function createFileMap(keyMapper) {
         var files = {};
         return {
             get: get,
             set: set,
             contains: contains,
             remove: remove,
-            clear: clear,
-            forEachValue: forEachValueInMap
+            forEachValue: forEachValueInMap,
+            clear: clear
         };
-        function set(fileName, value) {
-            files[normalizeKey(fileName)] = value;
-        }
-        function get(fileName) {
-            return files[normalizeKey(fileName)];
-        }
-        function contains(fileName) {
-            return hasProperty(files, normalizeKey(fileName));
-        }
-        function remove(fileName) {
-            var key = normalizeKey(fileName);
-            delete files[key];
-        }
         function forEachValueInMap(f) {
-            forEachValue(files, f);
+            for (var key in files) {
+                f(key, files[key]);
+            }
         }
-        function normalizeKey(key) {
-            return getCanonicalFileName(normalizeSlashes(key));
+        // path should already be well-formed so it does not need to be normalized
+        function get(path) {
+            return files[toKey(path)];
+        }
+        function set(path, value) {
+            files[toKey(path)] = value;
+        }
+        function contains(path) {
+            return hasProperty(files, toKey(path));
+        }
+        function remove(path) {
+            var key = toKey(path);
+            delete files[key];
         }
         function clear() {
             files = {};
         }
+        function toKey(path) {
+            return keyMapper ? keyMapper(path) : path;
+        }
     }
     ts.createFileMap = createFileMap;
+    function toPath(fileName, basePath, getCanonicalFileName) {
+        var nonCanonicalizedPath = isRootedDiskPath(fileName)
+            ? normalizePath(fileName)
+            : getNormalizedAbsolutePath(fileName, basePath);
+        return getCanonicalFileName(nonCanonicalizedPath);
+    }
+    ts.toPath = toPath;
     (function (Comparison) {
         Comparison[Comparison["LessThan"] = -1] = "LessThan";
         Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
@@ -895,8 +917,8 @@ var ts;
     ts.forEach = forEach;
     function contains(array, value) {
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
+                var v = array_1[_i];
                 if (v === value) {
                     return true;
                 }
@@ -919,8 +941,8 @@ var ts;
     function countWhere(array, predicate) {
         var count = 0;
         if (array) {
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+                var v = array_2[_i];
                 if (predicate(v)) {
                     count++;
                 }
@@ -933,8 +955,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_3 = array; _i < array_3.length; _i++) {
+                var item = array_3[_i];
                 if (f(item)) {
                     result.push(item);
                 }
@@ -947,8 +969,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var v = array[_i];
+            for (var _i = 0, array_4 = array; _i < array_4.length; _i++) {
+                var v = array_4[_i];
                 result.push(f(v));
             }
         }
@@ -967,8 +989,8 @@ var ts;
         var result;
         if (array) {
             result = [];
-            for (var _i = 0; _i < array.length; _i++) {
-                var item = array[_i];
+            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                var item = array_5[_i];
                 if (!contains(result, item)) {
                     result.push(item);
                 }
@@ -979,8 +1001,8 @@ var ts;
     ts.deduplicate = deduplicate;
     function sum(array, prop) {
         var result = 0;
-        for (var _i = 0; _i < array.length; _i++) {
-            var v = array[_i];
+        for (var _i = 0, array_6 = array; _i < array_6.length; _i++) {
+            var v = array_6[_i];
             result += v[prop];
         }
         return result;
@@ -988,8 +1010,8 @@ var ts;
     ts.sum = sum;
     function addRange(to, from) {
         if (to && from) {
-            for (var _i = 0; _i < from.length; _i++) {
-                var v = from[_i];
+            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+                var v = from_1[_i];
                 to.push(v);
             }
         }
@@ -1172,9 +1194,9 @@ var ts;
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key]
+            ? ts.localizedDiagnosticMessages[message.key]
+            : message.message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
@@ -1185,7 +1207,7 @@ var ts;
             Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
             Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         }
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
         }
@@ -1200,7 +1222,7 @@ var ts;
     }
     ts.createFileDiagnostic = createFileDiagnostic;
     function createCompilerDiagnostic(message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
             text = formatStringFromArgs(text, arguments, 1);
         }
@@ -1215,7 +1237,7 @@ var ts;
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
     function chainDiagnosticMessages(details, message) {
-        var text = getLocaleSpecificMessage(message.key);
+        var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
             text = formatStringFromArgs(text, arguments, 2);
         }
@@ -1339,8 +1361,8 @@ var ts;
     function getNormalizedParts(normalizedSlashedPath, rootLength) {
         var parts = normalizedSlashedPath.substr(rootLength).split(ts.directorySeparator);
         var normalized = [];
-        for (var _i = 0; _i < parts.length; _i++) {
-            var part = parts[_i];
+        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+            var part = parts_1[_i];
             if (part !== ".") {
                 if (part === ".." && normalized.length > 0 && lastOrUndefined(normalized) !== "..") {
                     normalized.pop();
@@ -1509,18 +1531,13 @@ var ts;
      *  List of supported extensions in order of file resolution precedence.
      */
     ts.supportedExtensions = [".ts", ".tsx", ".d.ts"];
-    /**
-     *  List of extensions that will be used to look for external modules.
-     *  This list is kept separate from supportedExtensions to for cases when we'll allow to include .js files in compilation,
-     *  but still would like to load only TypeScript files as modules
-     */
-    ts.moduleFileExtensions = ts.supportedExtensions;
+    ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx");
     function isSupportedSourceFileName(fileName) {
         if (!fileName) {
             return false;
         }
-        for (var _i = 0; _i < ts.supportedExtensions.length; _i++) {
-            var extension = ts.supportedExtensions[_i];
+        for (var _i = 0, supportedExtensions_1 = ts.supportedExtensions; _i < supportedExtensions_1.length; _i++) {
+            var extension = supportedExtensions_1[_i];
             if (fileExtensionIs(fileName, extension)) {
                 return true;
             }
@@ -1530,8 +1547,8 @@ var ts;
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
     var extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
     function removeFileExtension(path) {
-        for (var _i = 0; _i < extensionsToRemove.length; _i++) {
-            var ext = extensionsToRemove[_i];
+        for (var _i = 0, extensionsToRemove_1 = extensionsToRemove; _i < extensionsToRemove_1.length; _i++) {
+            var ext = extensionsToRemove_1[_i];
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
             }
@@ -1565,19 +1582,16 @@ var ts;
     }
     function Signature(checker) {
     }
+    function Node(kind, pos, end) {
+        this.kind = kind;
+        this.pos = pos;
+        this.end = end;
+        this.flags = 0 /* None */;
+        this.parent = undefined;
+    }
     ts.objectAllocator = {
-        getNodeConstructor: function (kind) {
-            function Node() {
-            }
-            Node.prototype = {
-                kind: kind,
-                pos: -1,
-                end: -1,
-                flags: 0,
-                parent: undefined
-            };
-            return Node;
-        },
+        getNodeConstructor: function () { return Node; },
+        getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
@@ -1602,6 +1616,7 @@ var ts;
                 if (verboseDebugInfo) {
                     verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
                 }
+                debugger;
                 throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
             }
         }
@@ -1613,9 +1628,10 @@ var ts;
     })(Debug = ts.Debug || (ts.Debug = {}));
     function copyListRemovingItem(item, list) {
         var copiedList = [];
-        for (var i = 0, len = list.length; i < len; i++) {
-            if (list[i] !== item) {
-                copiedList.push(list[i]);
+        for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
+            var e = list_1[_i];
+            if (e !== item) {
+                copiedList.push(e);
             }
         }
         return copiedList;
@@ -1707,16 +1723,16 @@ var ts;
                 function visitDirectory(path) {
                     var folder = fso.GetFolder(path || ".");
                     var files = getNames(folder.files);
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+                        var current = files_1[_i];
                         var name_1 = ts.combinePaths(path, current);
                         if ((!extension || ts.fileExtensionIs(name_1, extension)) && !ts.contains(exclude, getCanonicalPath(name_1))) {
                             result.push(name_1);
                         }
                     }
                     var subfolders = getNames(folder.subfolders);
-                    for (var _a = 0; _a < subfolders.length; _a++) {
-                        var current = subfolders[_a];
+                    for (var _a = 0, subfolders_1 = subfolders; _a < subfolders_1.length; _a++) {
+                        var current = subfolders_1[_a];
                         var name_2 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_2))) {
                             visitDirectory(name_2);
@@ -1767,6 +1783,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _tty = require("tty");
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
             function createWatchedFileSet(interval, chunkSize) {
@@ -1891,7 +1908,16 @@ var ts;
                 if (writeByteOrderMark) {
                     data = "\uFEFF" + data;
                 }
-                _fs.writeFileSync(fileName, data, "utf8");
+                var fd;
+                try {
+                    fd = _fs.openSync(fileName, "w");
+                    _fs.writeSync(fd, data, undefined, "utf8");
+                }
+                finally {
+                    if (fd !== undefined) {
+                        _fs.closeSync(fd);
+                    }
+                }
             }
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path.toLowerCase() : path;
@@ -1904,8 +1930,8 @@ var ts;
                 function visitDirectory(path) {
                     var files = _fs.readdirSync(path || ".").sort();
                     var directories = [];
-                    for (var _i = 0; _i < files.length; _i++) {
-                        var current = files[_i];
+                    for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
+                        var current = files_2[_i];
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -1919,8 +1945,8 @@ var ts;
                             }
                         }
                     }
-                    for (var _a = 0; _a < directories.length; _a++) {
-                        var current = directories[_a];
+                    for (var _a = 0, directories_1 = directories; _a < directories_1.length; _a++) {
+                        var current = directories_1[_a];
                         visitDirectory(current);
                     }
                 }
@@ -1930,15 +1956,7 @@ var ts;
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 write: function (s) {
-                    var buffer = new Buffer(s, "utf8");
-                    var offset = 0;
-                    var toWrite = buffer.length;
-                    var written = 0;
-                    // 1 is a standard descriptor for stdout
-                    while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
-                        offset += written;
-                        toWrite -= written;
-                    }
+                    process.stdout.write(s);
                 },
                 readFile: readFile,
                 writeFile: writeFile,
@@ -1959,7 +1977,7 @@ var ts;
                 watchDirectory: function (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)
-                    return _fs.watch(path, { persisten: true, recursive: !!recursive }, function (eventName, relativeFileName) {
+                    return _fs.watch(path, { persistent: true, recursive: !!recursive }, function (eventName, relativeFileName) {
                         // 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")
@@ -2021,624 +2039,634 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An index signature parameter type must be 'string' or 'number'." },
-        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a class element." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used in an ambient context." },
-        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with a class declaration." },
-        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used here." },
-        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a module element." },
-        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a valid async function return type." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An async function or method must have a valid awaitable return type." },
-        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand for 'await' does not have a valid callable 'then' member." },
-        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return expression in async function does not have a valid callable 'then' member." },
-        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression body for async arrow function does not have a valid callable 'then' member." },
-        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum member must have initializer." },
-        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
-        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a namespace." },
-        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In ambient enum declarations member initializer must be constant expression." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A '{0}' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression expected." },
-        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum member expected." },
-        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration expected." },
-        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An object member cannot be declared optional." },
-        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A 'yield' expression is only allowed in a generator body." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A destructuring declaration must have an initializer." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An import declaration cannot have modifiers." },
-        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no default export." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
-        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line terminator not permitted before arrow." },
-        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
-        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
-        Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot compile modules into 'es6' when targeting 'ES5' or lower." },
-        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators are not valid here." },
-        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
-        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
-        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
-        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A class declaration without the 'default' modifier must have a name" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
-        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid use of '{0}'. Modules are automatically in strict mode." },
-        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
-        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators are only available when targeting ECMAScript 6 or higher." },
-        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators are not allowed in an ambient context." },
-        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An overload signature cannot be declared as a generator." },
-        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "'{0}' tag already specified." },
-        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature '{0}' must have a type predicate." },
-        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot find parameter '{0}'." },
-        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type predicate '{0}' is not assignable to '{1}'." },
-        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' is not in the same position as parameter '{1}'." },
-        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A type predicate is only allowed in return type position for functions and methods." },
-        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference a rest parameter." },
-        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A type predicate cannot reference element '{0}' in a binding pattern." },
-        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An export assignment can only be used in a module." },
-        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An import declaration can only be used in a namespace or module." },
-        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An export declaration can only be used in a module." },
-        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An ambient module declaration is only allowed at the top level in a file." },
-        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A namespace declaration is only allowed in a namespace or module." },
-        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The return type of a property decorator function must be either 'void' or 'any'." },
-        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The return type of a parameter decorator function must be either 'void' or 'any'." },
-        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of class decorator when called as an expression." },
-        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of parameter decorator when called as an expression." },
-        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of property decorator when called as an expression." },
-        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "'abstract' modifier can only appear on a class or method declaration." },
-        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "'{0}' modifier cannot be used with '{1}' modifier." },
-        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract methods can only appear within an abstract class." },
-        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method '{0}' cannot have an implementation because it is marked abstract." },
-        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "'with' statements are not allowed in an async function block." },
-        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "'await' expression is only allowed within an async function." },
-        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async functions are only available when targeting ECMAScript 6 and higher." },
-        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "'=' can only be used in an object literal property inside a destructuring assignment." },
-        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
-        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not a module." },
-        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot find module '{0}'." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a module or namespace body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
-        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient modules cannot be nested in other modules or namespaces." },
-        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...of' statement." },
-        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
-        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An iterator must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
-        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
-        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not an array type or a string type." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
-        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
-        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
-        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An interface can only extend an identifier/qualified-name with optional type arguments." },
-        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A class can only implement an identifier/qualified-name with optional type arguments." },
-        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A rest element cannot contain a binding pattern." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own type annotation." },
-        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot find namespace '{0}'." },
-        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No best common type exists among yield expressions." },
-        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A generator cannot have a 'void' type annotation." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "'{0}' is referenced directly or indirectly in its own base expression." },
-        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type '{0}' is not a constructor function type." },
-        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No base constructor has the specified number of type arguments." },
-        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base constructor return type '{0}' is not a class or interface type." },
-        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base constructors must all have the same return type." },
-        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload signatures must all be abstract or not abstract." },
-        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
-        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes containing abstract methods must be marked abstract." },
-        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
-        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All declarations of an abstract method must be consecutive." },
-        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
-        Only_an_ambient_class_can_be_merged_with_an_interface: { code: 2518, category: ts.DiagnosticCategory.Error, key: "Only an ambient class can be merged with an interface." },
-        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
-        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
-        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
-        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "'yield' expressions cannot be used in a parameter initializer." },
-        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "'await' expressions cannot be used in a parameter initializer." },
-        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer provides no value for this binding element and the binding element has no default value." },
-        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A 'this' type is available only in a non-static member of a class or interface." },
-        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
-        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A module cannot have multiple default exports." },
-        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX element attributes type '{0}' must be an object type." },
-        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The return type of a JSX element constructor must return an object type." },
-        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
-        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
-        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' does not have any construct or call signatures." },
-        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX element type '{0}' is not a constructor function for JSX elements." },
-        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of JSX spread attribute is not assignable to target property." },
-        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX element class does not support attributes because it does not have a '{0}' property" },
-        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The global type 'JSX.{0}' may not have more than one property" },
-        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot emit namespaced JSX elements in React" },
-        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
-        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
-        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
-        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition: { code: 2655, category: ts.DiagnosticCategory.Error, key: "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: ts.DiagnosticCategory.Error, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported file encoding." },
-        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed to parse file '{0}': {1}." },
-        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could not write file '{0}': {1}" },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher." },
-        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
-        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified without specifying option '{1}'." },
-        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option '{0}' cannot be specified with option '{1}'." },
-        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A 'tsconfig.json' file is already defined at: '{0}'." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs if any errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es6'" },
-        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax: {0}" },
-        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options" },
-        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file" },
-        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options:" },
-        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND" },
-        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE" },
-        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION" },
-        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es6'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES6: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File '{0}' not found." },
-        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
-        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
-        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
-        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument for '--jsx' must be 'preserve' or 'react'." },
-        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 decorators." },
-        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for emitting type metadata for decorators." },
-        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
-        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes a TypeScript project and creates a tsconfig.json file." },
-        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully created a tsconfig.json file." },
-        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress excess property checks for object literals." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
-        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
-        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "'import ... =' can only be used in a .ts file." },
-        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "'export=' can only be used in a .ts file." },
-        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "'type parameter declarations' can only be used in a .ts file." },
-        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "'implements clauses' can only be used in a .ts file." },
-        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "'interface declarations' can only be used in a .ts file." },
-        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "'module declarations' can only be used in a .ts file." },
-        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "'type aliases' can only be used in a .ts file." },
-        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "'{0}' can only be used in a .ts file." },
-        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "'types' can only be used in a .ts file." },
-        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "'type arguments' can only be used in a .ts file." },
-        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "'parameter modifiers' can only be used in a .ts file." },
-        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "'property declarations' can only be used in a .ts file." },
-        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "'enum declarations' can only be used in a .ts file." },
-        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "'decorators' can only be used in a .ts file." },
-        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
-        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "'class' expressions are not currently supported." },
-        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX attributes must only be assigned a non-empty 'expression'." },
-        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX elements cannot have multiple attributes with the same name." },
-        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." },
-        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX attribute expected." },
-        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." },
-        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A constructor cannot contain a 'super' call when its class extends 'null'" },
-        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
+        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated_string_literal_1002", message: "Unterminated string literal." },
+        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_1003", message: "Identifier expected." },
+        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "_0_expected_1005", message: "'{0}' expected." },
+        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A_file_cannot_have_a_reference_to_itself_1006", message: "A file cannot have a reference to itself." },
+        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing_comma_not_allowed_1009", message: "Trailing comma not allowed." },
+        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "Asterisk_Slash_expected_1010", message: "'*/' expected." },
+        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_1012", message: "Unexpected token." },
+        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_last_in_a_parameter_list_1014", message: "A rest parameter must be last in a parameter list." },
+        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter_cannot_have_question_mark_and_initializer_1015", message: "Parameter cannot have question mark and initializer." },
+        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A_required_parameter_cannot_follow_an_optional_parameter_1016", message: "A required parameter cannot follow an optional parameter." },
+        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An_index_signature_cannot_have_a_rest_parameter_1017", message: "An index signature cannot have a rest parameter." },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018", message: "An index signature parameter cannot have an accessibility modifier." },
+        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_a_question_mark_1019", message: "An index signature parameter cannot have a question mark." },
+        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_initializer_1020", message: "An index signature parameter cannot have an initializer." },
+        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
+        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
+        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
+        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
+        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
+        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_class_element_1031", message: "'{0}' modifier cannot appear on a class element." },
+        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "super_must_be_followed_by_an_argument_list_or_member_access_1034", message: "'super' must be followed by an argument list or member access." },
+        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only_ambient_modules_can_use_quoted_names_1035", message: "Only ambient modules can use quoted names." },
+        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements_are_not_allowed_in_ambient_contexts_1036", message: "Statements are not allowed in ambient contexts." },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038", message: "A 'declare' modifier cannot be used in an already ambient context." },
+        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers_are_not_allowed_in_ambient_contexts_1039", message: "Initializers are not allowed in ambient contexts." },
+        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_in_an_ambient_context_1040", message: "'{0}' modifier cannot be used in an ambient context." },
+        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
+        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
+        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
+        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
+        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
+        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_have_an_initializer_1048", message: "A rest parameter cannot have an initializer." },
+        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_must_have_exactly_one_parameter_1049", message: "A 'set' accessor must have exactly one parameter." },
+        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_an_optional_parameter_1051", message: "A 'set' accessor cannot have an optional parameter." },
+        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
+        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
+        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
+        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
+        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
+        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
+        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return_expression_in_async_function_does_not_have_a_valid_callable_then_member_1059", message: "Return expression in async function does not have a valid callable 'then' member." },
+        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member_1060", message: "Expression body for async arrow function does not have a valid callable 'then' member." },
+        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
+        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
+        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
+        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
+        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_be_declared_in_an_ambient_context_1086", message: "An accessor cannot be declared in an ambient context." },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_constructor_declaration_1089", message: "'{0}' modifier cannot appear on a constructor declaration." },
+        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_parameter_1090", message: "'{0}' modifier cannot appear on a parameter." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091", message: "Only a single variable declaration is allowed in a 'for...in' statement." },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type_parameters_cannot_appear_on_a_constructor_declaration_1092", message: "Type parameters cannot appear on a constructor declaration." },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type_annotation_cannot_appear_on_a_constructor_declaration_1093", message: "Type annotation cannot appear on a constructor declaration." },
+        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_have_type_parameters_1094", message: "An accessor cannot have type parameters." },
+        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_a_return_type_annotation_1095", message: "A 'set' accessor cannot have a return type annotation." },
+        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_exactly_one_parameter_1096", message: "An index signature must have exactly one parameter." },
+        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "_0_list_cannot_be_empty_1097", message: "'{0}' list cannot be empty." },
+        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type_parameter_list_cannot_be_empty_1098", message: "Type parameter list cannot be empty." },
+        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type_argument_list_cannot_be_empty_1099", message: "Type argument list cannot be empty." },
+        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_in_strict_mode_1100", message: "Invalid use of '{0}' in strict mode." },
+        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_strict_mode_1101", message: "'with' statements are not allowed in strict mode." },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "delete_cannot_be_called_on_an_identifier_in_strict_mode_1102", message: "'delete' cannot be called on an identifier in strict mode." },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104", message: "A 'continue' statement can only be used within an enclosing iteration statement." },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105", message: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
+        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump_target_cannot_cross_function_boundary_1107", message: "Jump target cannot cross function boundary." },
+        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A_return_statement_can_only_be_used_within_a_function_body_1108", message: "A 'return' statement can only be used within a function body." },
+        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression_expected_1109", message: "Expression expected." },
+        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type_expected_1110", message: "Type expected." },
+        A_class_member_cannot_be_declared_optional: { code: 1112, category: ts.DiagnosticCategory.Error, key: "A_class_member_cannot_be_declared_optional_1112", message: "A class member cannot be declared optional." },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", message: "A 'default' clause cannot appear more than once in a 'switch' statement." },
+        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate_label_0_1114", message: "Duplicate label '{0}'" },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", message: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116", message: "A 'break' statement can only jump to a label of an enclosing statement." },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117", message: "An object literal cannot have multiple properties with the same name in strict mode." },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118", message: "An object literal cannot have multiple get/set accessors with the same name." },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119", message: "An object literal cannot have property and accessor with the same name." },
+        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_have_modifiers_1120", message: "An export assignment cannot have modifiers." },
+        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_allowed_in_strict_mode_1121", message: "Octal literals are not allowed in strict mode." },
+        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A_tuple_type_element_list_cannot_be_empty_1122", message: "A tuple type element list cannot be empty." },
+        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_list_cannot_be_empty_1123", message: "Variable declaration list cannot be empty." },
+        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit_expected_1124", message: "Digit expected." },
+        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal_digit_expected_1125", message: "Hexadecimal digit expected." },
+        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected_end_of_text_1126", message: "Unexpected end of text." },
+        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid_character_1127", message: "Invalid character." },
+        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration_or_statement_expected_1128", message: "Declaration or statement expected." },
+        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement_expected_1129", message: "Statement expected." },
+        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "case_or_default_expected_1130", message: "'case' or 'default' expected." },
+        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property_or_signature_expected_1131", message: "Property or signature expected." },
+        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum_member_expected_1132", message: "Enum member expected." },
+        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_expected_1134", message: "Variable declaration expected." },
+        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument_expression_expected_1135", message: "Argument expression expected." },
+        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property_assignment_expected_1136", message: "Property assignment expected." },
+        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression_or_comma_expected_1137", message: "Expression or comma expected." },
+        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter_declaration_expected_1138", message: "Parameter declaration expected." },
+        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type_parameter_declaration_expected_1139", message: "Type parameter declaration expected." },
+        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type_argument_expected_1140", message: "Type argument expected." },
+        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
+        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
+        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
+        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
+        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
+        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_1148", message: "Cannot compile modules unless the '--module' flag is provided." },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
+        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
+        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "const_declarations_can_only_be_declared_inside_a_block_1156", message: "'const' declarations can only be declared inside a block." },
+        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "let_declarations_can_only_be_declared_inside_a_block_1157", message: "'let' declarations can only be declared inside a block." },
+        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated_template_literal_1160", message: "Unterminated template literal." },
+        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated_regular_expression_literal_1161", message: "Unterminated regular expression literal." },
+        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An_object_member_cannot_be_declared_optional_1162", message: "An object member cannot be declared optional." },
+        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A_yield_expression_is_only_allowed_in_a_generator_body_1163", message: "A 'yield' expression is only allowed in a generator body." },
+        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed_property_names_are_not_allowed_in_enums_1164", message: "Computed property names are not allowed in enums." },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol_1165", message: "A computed property name in an ambient context must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol_1166", message: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol_1168", message: "A computed property name in a method overload must directly refer to a built-in symbol." },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol_1169", message: "A computed property name in an interface must directly refer to a built-in symbol." },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol_1170", message: "A computed property name in a type literal must directly refer to a built-in symbol." },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A_comma_expression_is_not_allowed_in_a_computed_property_name_1171", message: "A comma expression is not allowed in a computed property name." },
+        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "extends_clause_already_seen_1172", message: "'extends' clause already seen." },
+        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "extends_clause_must_precede_implements_clause_1173", message: "'extends' clause must precede 'implements' clause." },
+        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes_can_only_extend_a_single_class_1174", message: "Classes can only extend a single class." },
+        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "implements_clause_already_seen_1175", message: "'implements' clause already seen." },
+        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface_declaration_cannot_have_implements_clause_1176", message: "Interface declaration cannot have 'implements' clause." },
+        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary_digit_expected_1177", message: "Binary digit expected." },
+        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal_digit_expected_1178", message: "Octal digit expected." },
+        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_expected_1179", message: "Unexpected token. '{' expected." },
+        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property_destructuring_pattern_expected_1180", message: "Property destructuring pattern expected." },
+        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array_element_destructuring_pattern_expected_1181", message: "Array element destructuring pattern expected." },
+        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A_destructuring_declaration_must_have_an_initializer_1182", message: "A destructuring declaration must have an initializer." },
+        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An_implementation_cannot_be_declared_in_ambient_contexts_1183", message: "An implementation cannot be declared in ambient contexts." },
+        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers_cannot_appear_here_1184", message: "Modifiers cannot appear here." },
+        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge_conflict_marker_encountered_1185", message: "Merge conflict marker encountered." },
+        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_have_an_initializer_1186", message: "A rest element cannot have an initializer." },
+        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_may_not_be_a_binding_pattern_1187", message: "A parameter property may not be a binding pattern." },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188", message: "Only a single variable declaration is allowed in a 'for...of' statement." },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189", message: "The variable declaration of a 'for...in' statement cannot have an initializer." },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190", message: "The variable declaration of a 'for...of' statement cannot have an initializer." },
+        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_cannot_have_modifiers_1191", message: "An import declaration cannot have modifiers." },
+        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
+        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
+        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
+        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
+        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
+        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
+        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated_Unicode_escape_sequence_1199", message: "Unterminated Unicode escape sequence." },
+        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line_terminator_not_permitted_before_arrow_1200", message: "Line terminator not permitted before arrow." },
+        Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk__1202", message: "Import assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
+        Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_o_1203", message: "Export assignment cannot be used when targeting ECMAScript 6 modules. Consider using 'export default' or another module format instead." },
+        Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower: { code: 1204, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower_1204", message: "Cannot compile modules into 'es2015' when targeting 'ES5' or lower." },
+        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators_are_not_valid_here_1206", message: "Decorators are not valid here." },
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", message: "Decorators cannot be applied to multiple get/set accessors of the same name." },
+        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", message: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
+        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", message: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
+        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", message: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
+        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", message: "A class declaration without the 'default' modifier must have a name" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", message: "Identifier expected. '{0}' is a reserved word in strict mode" },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213", message: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
+        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
+        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
+        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
+        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
+        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "_0_tag_already_specified_1223", message: "'{0}' tag already specified." },
+        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature_0_must_have_a_type_predicate_1224", message: "Signature '{0}' must have a type predicate." },
+        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
+        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
+        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
+        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
+        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
+        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
+        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", message: "An import declaration can only be used in a namespace or module." },
+        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_can_only_be_used_in_a_module_1233", message: "An export declaration can only be used in a module." },
+        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", message: "An ambient module declaration is only allowed at the top level in a file." },
+        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235", message: "A namespace declaration is only allowed in a namespace or module." },
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236", message: "The return type of a property decorator function must be either 'void' or 'any'." },
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237", message: "The return type of a parameter decorator function must be either 'void' or 'any'." },
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238", message: "Unable to resolve signature of class decorator when called as an expression." },
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
+        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
+        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
+        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
+        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_an_async_function_block_1300", message: "'with' statements are not allowed in an async function block." },
+        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "await_expression_is_only_allowed_within_an_async_function_1308", message: "'await' expression is only allowed within an async function." },
+        Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
+        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
+        The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
+        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
+        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular_definition_of_import_alias_0_2303", message: "Circular definition of import alias '{0}'." },
+        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_2304", message: "Cannot find name '{0}'." },
+        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_exported_member_1_2305", message: "Module '{0}' has no exported member '{1}'." },
+        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_a_module_2306", message: "File '{0}' is not a module." },
+        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot_find_module_0_2307", message: "Cannot find module '{0}'." },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", message: "An export assignment cannot be used in a module with other exported elements." },
+        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type_0_recursively_references_itself_as_a_base_type_2310", message: "Type '{0}' recursively references itself as a base type." },
+        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_extend_another_class_2311", message: "A class may only extend another class." },
+        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An_interface_may_only_extend_a_class_or_another_interface_2312", message: "An interface may only extend a class or another interface." },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list_2313", message: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
+        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic_type_0_requires_1_type_argument_s_2314", message: "Generic type '{0}' requires {1} type argument(s)." },
+        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_generic_2315", message: "Type '{0}' is not generic." },
+        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_be_a_class_or_interface_type_2316", message: "Global type '{0}' must be a class or interface type." },
+        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_have_1_type_parameter_s_2317", message: "Global type '{0}' must have {1} type parameter(s)." },
+        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_type_0_2318", message: "Cannot find global type '{0}'." },
+        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named_property_0_of_types_1_and_2_are_not_identical_2319", message: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface_0_cannot_simultaneously_extend_types_1_and_2_2320", message: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
+        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive_stack_depth_comparing_types_0_and_1_2321", message: "Excessive stack depth comparing types '{0}' and '{1}'." },
+        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_2322", message: "Type '{0}' is not assignable to type '{1}'." },
+        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property_0_is_missing_in_type_1_2324", message: "Property '{0}' is missing in type '{1}'." },
+        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_in_type_1_but_not_in_type_2_2325", message: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
+        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types_of_property_0_are_incompatible_2326", message: "Types of property '{0}' are incompatible." },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property_0_is_optional_in_type_1_but_required_in_type_2_2327", message: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
+        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types_of_parameters_0_and_1_are_incompatible_2328", message: "Types of parameters '{0}' and '{1}' are incompatible." },
+        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index_signature_is_missing_in_type_0_2329", message: "Index signature is missing in type '{0}'." },
+        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index_signatures_are_incompatible_2330", message: "Index signatures are incompatible." },
+        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_module_or_namespace_body_2331", message: "'this' cannot be referenced in a module or namespace body." },
+        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_current_location_2332", message: "'this' cannot be referenced in current location." },
+        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_constructor_arguments_2333", message: "'this' cannot be referenced in constructor arguments." },
+        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_static_property_initializer_2334", message: "'this' cannot be referenced in a static property initializer." },
+        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "super_can_only_be_referenced_in_a_derived_class_2335", message: "'super' can only be referenced in a derived class." },
+        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_constructor_arguments_2336", message: "'super' cannot be referenced in constructor arguments." },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337", message: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338", message: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
+        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_type_1_2339", message: "Property '{0}' does not exist on type '{1}'." },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340", message: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
+        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_and_only_accessible_within_class_1_2341", message: "Property '{0}' is private and only accessible within class '{1}'." },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342", message: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
+        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type_0_does_not_satisfy_the_constraint_1_2344", message: "Type '{0}' does not satisfy the constraint '{1}'." },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", message: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied_parameters_do_not_match_any_signature_of_call_target_2346", message: "Supplied parameters do not match any signature of call target." },
+        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped_function_calls_may_not_accept_type_arguments_2347", message: "Untyped function calls may not accept type arguments." },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", message: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
+        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
+        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
+        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
+        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371", message: "A parameter initializer is only allowed in a function or constructor implementation." },
+        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter_0_cannot_be_referenced_in_its_initializer_2372", message: "Parameter '{0}' cannot be referenced in its initializer." },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373", message: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
+        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate_string_index_signature_2374", message: "Duplicate string index signature." },
+        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate_number_index_signature_2375", message: "Duplicate number index signature." },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", message: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
+        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors_for_derived_classes_must_contain_a_super_call_2377", message: "Constructors for derived classes must contain a 'super' call." },
+        A_get_accessor_must_return_a_value: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_must_return_a_value_2378", message: "A 'get' accessor must return a value." },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", message: "Getter and setter accessors do not agree in visibility." },
+        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
+        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
+        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
+        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
+        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_be_static_2387", message: "Function overload must be static." },
+        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_not_be_static_2388", message: "Function overload must not be static." },
+        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function_implementation_name_must_be_0_2389", message: "Function implementation name must be '{0}'." },
+        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor_implementation_is_missing_2390", message: "Constructor implementation is missing." },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", message: "Function implementation is missing or not immediately following the declaration." },
+        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple_constructor_implementations_are_not_allowed_2392", message: "Multiple constructor implementations are not allowed." },
+        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate_function_implementation_2393", message: "Duplicate function implementation." },
+        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload_signature_is_not_compatible_with_function_implementation_2394", message: "Overload signature is not compatible with function implementation." },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", message: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", message: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", message: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", message: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", message: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402", message: "Expression resolves to '_super' that compiler uses to capture base class reference." },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
+        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
+        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All_symbols_within_a_with_block_will_be_resolved_to_any_2410", message: "All symbols within a 'with' block will be resolved to 'any'." },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411", message: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412", message: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413", message: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
+        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
+        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
+        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
+        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
+        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
+        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
+        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433", message: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
+        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434", message: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
+        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435", message: "Ambient modules cannot be nested in other modules or namespaces." },
+        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient_module_declaration_cannot_specify_relative_module_name_2436", message: "Ambient module declaration cannot specify relative module name." },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437", message: "Module '{0}' is hidden by a local declaration with the same name" },
+        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import_name_cannot_be_0_2438", message: "Import name cannot be '{0}'" },
+        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439", message: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
+        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import_declaration_conflicts_with_local_declaration_of_0_2440", message: "Import declaration conflicts with local declaration of '{0}'" },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
+        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types_have_separate_declarations_of_a_private_property_0_2442", message: "Types have separate declarations of a private property '{0}'." },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", message: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", message: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", message: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
+        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
+        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
+        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
+        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
+        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An_AMD_module_cannot_have_multiple_name_assignments_2458", message: "An AMD module cannot have multiple name assignments." },
+        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
+        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
+        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
+        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
+        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_a_computed_property_name_2466", message: "'super' cannot be referenced in a computed property name." },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467", message: "A computed property name cannot reference a type parameter from its containing type." },
+        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_value_0_2468", message: "Cannot find global value '{0}'." },
+        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The_0_operator_cannot_be_applied_to_type_symbol_2469", message: "The '{0}' operator cannot be applied to type 'symbol'." },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470", message: "'Symbol' reference does not refer to the global Symbol constructor object." },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471", message: "A computed property name of the form '{0}' must be of type 'symbol'." },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472", message: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
+        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum_declarations_must_all_be_const_or_non_const_2473", message: "Enum declarations must all be const or non-const." },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In_const_enum_declarations_member_initializer_must_be_constant_expression_2474", message: "In 'const' enum declarations member initializer must be constant expression." },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475", message: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476", message: "A const enum member can only be accessed using a string literal." },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477", message: "'const' enum member initializer was evaluated to a non-finite value." },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478", message: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
+        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_const_enum_1_2479", message: "Property '{0}' does not exist on 'const' enum '{1}'." },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480", message: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
+        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
+        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", message: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
+        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_identifier_0_in_catch_clause_2492", message: "Cannot redeclare identifier '{0}' in catch clause" },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2_2493", message: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494", message: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
+        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_or_a_string_type_2495", message: "Type '{0}' is not an array type or a string type." },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496", message: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
+        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct_2497", message: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
+        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498", message: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499", message: "An interface can only extend an identifier/qualified-name with optional type arguments." },
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500", message: "A class can only implement an identifier/qualified-name with optional type arguments." },
+        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_contain_a_binding_pattern_2501", message: "A rest element cannot contain a binding pattern." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502", message: "'{0}' is referenced directly or indirectly in its own type annotation." },
+        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot_find_namespace_0_2503", message: "Cannot find namespace '{0}'." },
+        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_yield_expressions_2504", message: "No best common type exists among yield expressions." },
+        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A_generator_cannot_have_a_void_type_annotation_2505", message: "A generator cannot have a 'void' type annotation." },
+        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506", message: "'{0}' is referenced directly or indirectly in its own base expression." },
+        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_constructor_function_type_2507", message: "Type '{0}' is not a constructor function type." },
+        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No_base_constructor_has_the_specified_number_of_type_arguments_2508", message: "No base constructor has the specified number of type arguments." },
+        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
+        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
+        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
+        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
+        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
+        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
+        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_abstract_method_must_be_consecutive_2516", message: "All declarations of an abstract method must be consecutive." },
+        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", message: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
+        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520", message: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
+        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521", message: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
+        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_2522", message: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
+        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523", message: "'yield' expressions cannot be used in a parameter initializer." },
+        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "await_expressions_cannot_be_used_in_a_parameter_initializer_2524", message: "'await' expressions cannot be used in a parameter initializer." },
+        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525", message: "Initializer provides no value for this binding element and the binding element has no default value." },
+        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
+        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
+        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_must_be_an_object_type_2600", message: "JSX element attributes type '{0}' must be an object type." },
+        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
+        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
+        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property_0_in_type_1_is_not_assignable_to_type_2_2603", message: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
+        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604", message: "JSX element type '{0}' does not have any construct or call signatures." },
+        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605", message: "JSX element type '{0}' is not a constructor function for JSX elements." },
+        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606", message: "Property '{0}' of JSX spread attribute is not assignable to target property." },
+        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607", message: "JSX element class does not support attributes because it does not have a '{0}' property" },
+        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The_global_type_JSX_0_may_not_have_more_than_one_property_2608", message: "The global type 'JSX.{0}' may not have more than one property" },
+        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot_emit_namespaced_JSX_elements_in_React_2650", message: "Cannot emit namespaced JSX elements in React" },
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", message: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
+        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", message: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
+        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653", message: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
+        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654", message: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
+        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656", message: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
+        JSX_expressions_must_have_one_parent_element: { code: 2657, category: ts.DiagnosticCategory.Error, key: "JSX_expressions_must_have_one_parent_element_2657", message: "JSX expressions must have one parent element" },
+        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006", message: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008", message: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010", message: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012", message: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014", message: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", message: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", message: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", message: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", message: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", message: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", message: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
+        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_private_name_1_4025", message: "Exported variable '{0}' has or is using private name '{1}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026", message: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027", message: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028", message: "Public static property '{0}' of exported class has or is using private name '{1}'." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029", message: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030", message: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031", message: "Public property '{0}' of exported class has or is using private name '{1}'." },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032", message: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033", message: "Property '{0}' of exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_4034", message: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1_4035", message: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_4036", message: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1_4037", message: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_externa_4038", message: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_4039", message: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0_4040", message: "Return type of public static property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_modul_4041", message: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_4042", message: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0_4043", message: "Return type of public property getter from exported class has or is using private name '{0}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044", message: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045", message: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046", message: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047", message: "Return type of call signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048", message: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049", message: "Return type of index signature from exported interface has or is using private name '{0}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050", message: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051", message: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052", message: "Return type of public static method from exported class has or is using private name '{0}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053", message: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054", message: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055", message: "Return type of public method from exported class has or is using private name '{0}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056", message: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057", message: "Return type of method from exported interface has or is using private name '{0}'." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058", message: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059", message: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_private_name_0_4060", message: "Return type of exported function has or is using private name '{0}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063", message: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064", message: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065", message: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066", message: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067", message: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070", message: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073", message: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074", message: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075", message: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076", message: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077", message: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
+        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
+        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
+        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
+        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported_file_encoding_5013", message: "Unsupported file encoding." },
+        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed_to_parse_file_0_Colon_1_5014", message: "Failed to parse file '{0}': {1}." },
+        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown_compiler_option_0_5023", message: "Unknown compiler option '{0}'." },
+        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_requires_a_value_of_type_1_5024", message: "Compiler option '{0}' requires a value of type {1}." },
+        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could_not_write_file_0_Colon_1_5033", message: "Could not write file '{0}': {1}" },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042", message: "Option 'project' cannot be mixed with source files on a command line." },
+        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047", message: "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher." },
+        Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_prov_5051", message: "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
+        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_without_specifying_option_1_5052", message: "Option '{0}' cannot be specified without specifying option '{1}'." },
+        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_with_option_1_5053", message: "Option '{0}' cannot be specified with option '{1}'." },
+        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054", message: "A 'tsconfig.json' file is already defined at: '{0}'." },
+        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
+        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
+        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
+        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
+        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_if_any_errors_were_reported_6008", message: "Do not emit outputs if any errors were reported." },
+        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
+        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
+        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
+        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
+        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile_the_project_in_the_given_directory_6020", message: "Compile the project in the given directory." },
+        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax_Colon_0_6023", message: "Syntax: {0}" },
+        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options_6024", message: "options" },
+        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file_6025", message: "file" },
+        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples_Colon_0_6026", message: "Examples: {0}" },
+        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options_Colon_6027", message: "Options:" },
+        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version_0_6029", message: "Version {0}" },
+        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert_command_line_options_and_files_from_a_file_6030", message: "Insert command line options and files from a file." },
+        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File_change_detected_Starting_incremental_compilation_6032", message: "File change detected. Starting incremental compilation..." },
+        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND_6034", message: "KIND" },
+        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE_6035", message: "FILE" },
+        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION_6036", message: "VERSION" },
+        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION_6037", message: "LOCATION" },
+        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY_6038", message: "DIRECTORY" },
+        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation_complete_Watching_for_file_changes_6042", message: "Compilation complete. Watching for file changes." },
+        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
+        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
+        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
+        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
+        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
+        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
+        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
+        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted_locale_file_0_6051", message: "Corrupted locale file {0}." },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052", message: "Raise error on expressions and declarations with an implied 'any' type." },
+        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File_0_not_found_6053", message: "File '{0}' not found." },
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
+        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
+        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
+        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
+        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
+        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
+        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
+        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
+        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
+        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
+        Stylize_errors_and_messages_using_color_and_context_experimental: { code: 6073, category: ts.DiagnosticCategory.Message, key: "Stylize_errors_and_messages_using_color_and_context_experimental_6073", message: "Stylize errors and messages using color and context. (experimental)" },
+        Do_not_report_errors_on_unused_labels: { code: 6074, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unused_labels_6074", message: "Do not report errors on unused labels." },
+        Report_error_when_not_all_code_paths_in_function_return_a_value: { code: 6075, category: ts.DiagnosticCategory.Message, key: "Report_error_when_not_all_code_paths_in_function_return_a_value_6075", message: "Report error when not all code paths in function return a value." },
+        Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
+        Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
+        Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
+        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
+        Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
+        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
+        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
+        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009", message: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010", message: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation_7016", message: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
+        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
+        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", message: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", message: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", message: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
+        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", message: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
+        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", message: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
+        Unreachable_code_detected: { code: 7027, category: ts.DiagnosticCategory.Error, key: "Unreachable_code_detected_7027", message: "Unreachable code detected." },
+        Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
+        Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
+        Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
+        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
+        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "export_can_only_be_used_in_a_ts_file_8003", message: "'export=' can only be used in a .ts file." },
+        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "type_parameter_declarations_can_only_be_used_in_a_ts_file_8004", message: "'type parameter declarations' can only be used in a .ts file." },
+        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "implements_clauses_can_only_be_used_in_a_ts_file_8005", message: "'implements clauses' can only be used in a .ts file." },
+        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "interface_declarations_can_only_be_used_in_a_ts_file_8006", message: "'interface declarations' can only be used in a .ts file." },
+        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "module_declarations_can_only_be_used_in_a_ts_file_8007", message: "'module declarations' can only be used in a .ts file." },
+        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "type_aliases_can_only_be_used_in_a_ts_file_8008", message: "'type aliases' can only be used in a .ts file." },
+        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "_0_can_only_be_used_in_a_ts_file_8009", message: "'{0}' can only be used in a .ts file." },
+        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "types_can_only_be_used_in_a_ts_file_8010", message: "'types' can only be used in a .ts file." },
+        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "type_arguments_can_only_be_used_in_a_ts_file_8011", message: "'type arguments' can only be used in a .ts file." },
+        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "parameter_modifiers_can_only_be_used_in_a_ts_file_8012", message: "'parameter modifiers' can only be used in a .ts file." },
+        property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
+        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
+        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
+        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
+        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
+        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
+        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", message: "JSX elements cannot have multiple attributes with the same name." },
+        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected_corresponding_JSX_closing_tag_for_0_17002", message: "Expected corresponding JSX closing tag for '{0}'." },
+        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX_attribute_expected_17003", message: "JSX attribute expected." },
+        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004", message: "Cannot use JSX unless the '--jsx' flag is provided." },
+        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
+        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
+        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." }
     };
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
@@ -3150,7 +3178,7 @@ var ts;
     function getCommentRanges(text, pos, trailing) {
         var result;
         var collecting = trailing || pos === 0;
-        while (true) {
+        while (pos < text.length) {
             var ch = text.charCodeAt(pos);
             switch (ch) {
                 case 13 /* carriageReturn */:
@@ -3219,6 +3247,7 @@ var ts;
             }
             return result;
         }
+        return result;
     }
     function getLeadingCommentRanges(text, pos) {
         return getCommentRanges(text, pos, /*trailing*/ false);
@@ -3320,7 +3349,7 @@ var ts;
                     error(ts.Diagnostics.Digit_expected);
                 }
             }
-            return +(text.substring(start, end));
+            return "" + +(text.substring(start, end));
         }
         function scanOctalDigits() {
             var start = pos;
@@ -3747,7 +3776,7 @@ var ts;
                         return pos++, token = 36 /* MinusToken */;
                     case 46 /* dot */:
                         if (isDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = "" + scanNumber();
+                            tokenValue = scanNumber();
                             return token = 8 /* NumericLiteral */;
                         }
                         if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) {
@@ -3850,7 +3879,7 @@ var ts;
                     case 55 /* _7 */:
                     case 56 /* _8 */:
                     case 57 /* _9 */:
-                        tokenValue = "" + scanNumber();
+                        tokenValue = scanNumber();
                         return token = 8 /* NumericLiteral */;
                     case 58 /* colon */:
                         return pos++, token = 54 /* ColonToken */;
@@ -4154,971 +4183,6 @@ var ts;
     }
     ts.createScanner = createScanner;
 })(ts || (ts = {}));
-/// <reference path="parser.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    ts.bindTime = 0;
-    (function (ModuleInstanceState) {
-        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
-        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
-        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
-    function getModuleInstanceState(node) {
-        // A module is uninstantiated if it contains only
-        // 1. interface declarations, type alias declarations
-        if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) {
-            return 0 /* NonInstantiated */;
-        }
-        else if (ts.isConstEnumDeclaration(node)) {
-            return 2 /* ConstEnumOnly */;
-        }
-        else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 1 /* Export */)) {
-            return 0 /* NonInstantiated */;
-        }
-        else if (node.kind === 219 /* ModuleBlock */) {
-            var state = 0 /* NonInstantiated */;
-            ts.forEachChild(node, function (n) {
-                switch (getModuleInstanceState(n)) {
-                    case 0 /* NonInstantiated */:
-                        // child is non-instantiated - continue searching
-                        return false;
-                    case 2 /* ConstEnumOnly */:
-                        // child is const enum only - record state and continue searching
-                        state = 2 /* ConstEnumOnly */;
-                        return false;
-                    case 1 /* Instantiated */:
-                        // child is instantiated - record state and stop
-                        state = 1 /* Instantiated */;
-                        return true;
-                }
-            });
-            return state;
-        }
-        else if (node.kind === 218 /* ModuleDeclaration */) {
-            return getModuleInstanceState(node.body);
-        }
-        else {
-            return 1 /* Instantiated */;
-        }
-    }
-    ts.getModuleInstanceState = getModuleInstanceState;
-    var ContainerFlags;
-    (function (ContainerFlags) {
-        // The current node is not a container, and no container manipulation should happen before
-        // recursing into it.
-        ContainerFlags[ContainerFlags["None"] = 0] = "None";
-        // The current node is a container.  It should be set as the current container (and block-
-        // container) before recursing into it.  The current node does not have locals.  Examples:
-        //
-        //      Classes, ObjectLiterals, TypeLiterals, Interfaces...
-        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
-        // The current node is a block-scoped-container.  It should be set as the current block-
-        // container before recursing into it.  Examples:
-        //
-        //      Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements...
-        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
-        ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals";
-        // If the current node is a container that also container that also contains locals.  Examples:
-        //
-        //      Functions, Methods, Modules, Source-files.
-        ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals";
-    })(ContainerFlags || (ContainerFlags = {}));
-    function bindSourceFile(file) {
-        var start = new Date().getTime();
-        bindSourceFileWorker(file);
-        ts.bindTime += new Date().getTime() - start;
-    }
-    ts.bindSourceFile = bindSourceFile;
-    function bindSourceFileWorker(file) {
-        var parent;
-        var container;
-        var blockScopeContainer;
-        var lastContainer;
-        var seenThisKeyword;
-        // If this file is an external module, then it is automatically in strict-mode according to
-        // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
-        // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
-        var inStrictMode = !!file.externalModuleIndicator;
-        var symbolCount = 0;
-        var Symbol = ts.objectAllocator.getSymbolConstructor();
-        var classifiableNames = {};
-        if (!file.locals) {
-            bind(file);
-            file.symbolCount = symbolCount;
-            file.classifiableNames = classifiableNames;
-        }
-        return;
-        function createSymbol(flags, name) {
-            symbolCount++;
-            return new Symbol(flags, name);
-        }
-        function addDeclarationToSymbol(symbol, node, symbolFlags) {
-            symbol.flags |= symbolFlags;
-            node.symbol = symbol;
-            if (!symbol.declarations) {
-                symbol.declarations = [];
-            }
-            symbol.declarations.push(node);
-            if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) {
-                symbol.exports = {};
-            }
-            if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) {
-                symbol.members = {};
-            }
-            if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) {
-                symbol.valueDeclaration = node;
-            }
-        }
-        // Should not be called on a declaration with a computed property name,
-        // unless it is a well known Symbol.
-        function getDeclarationName(node) {
-            if (node.name) {
-                if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
-                    return "\"" + node.name.text + "\"";
-                }
-                if (node.name.kind === 136 /* ComputedPropertyName */) {
-                    var nameExpression = node.name.expression;
-                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
-                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
-                }
-                return node.name.text;
-            }
-            switch (node.kind) {
-                case 144 /* Constructor */:
-                    return "__constructor";
-                case 152 /* FunctionType */:
-                case 147 /* CallSignature */:
-                    return "__call";
-                case 153 /* ConstructorType */:
-                case 148 /* ConstructSignature */:
-                    return "__new";
-                case 149 /* IndexSignature */:
-                    return "__index";
-                case 228 /* ExportDeclaration */:
-                    return "__export";
-                case 227 /* ExportAssignment */:
-                    return node.isExportEquals ? "export=" : "default";
-                case 213 /* FunctionDeclaration */:
-                case 214 /* ClassDeclaration */:
-                    return node.flags & 1024 /* Default */ ? "default" : undefined;
-            }
-        }
-        function getDisplayName(node) {
-            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
-        }
-        /**
-         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
-         * @param symbolTable - The symbol table which node will be added to.
-         * @param parent - node's parent declaration.
-         * @param node - The declaration to be added to the symbol table
-         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
-         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations.
-         */
-        function declareSymbol(symbolTable, parent, node, includes, excludes) {
-            ts.Debug.assert(!ts.hasDynamicName(node));
-            var isDefaultExport = node.flags & 1024 /* Default */;
-            // The exported symbol for an export default function/class node is always named "default"
-            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
-            var symbol;
-            if (name !== undefined) {
-                // Check and see if the symbol table already has a symbol with this name.  If not,
-                // create a new symbol with this name and add it to the table.  Note that we don't
-                // give the new symbol any flags *yet*.  This ensures that it will not conflict
-                // with the 'excludes' flags we pass in.
-                //
-                // If we do get an existing symbol, see if it conflicts with the new symbol we're
-                // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
-                // the same symbol table.  If we have a conflict, report the issue on each
-                // declaration we have for this symbol, and then create a new symbol for this
-                // declaration.
-                //
-                // If we created a new symbol, either because we didn't have a symbol with this name
-                // in the symbol table, or we conflicted with an existing symbol, then just add this
-                // node as the sole declaration of the new symbol.
-                //
-                // Otherwise, we'll be merging into a compatible existing symbol (for example when
-                // you have multiple 'vars' with the same name in the same container).  In this case
-                // just add this node into the declarations list of the symbol.
-                symbol = ts.hasProperty(symbolTable, name)
-                    ? symbolTable[name]
-                    : (symbolTable[name] = createSymbol(0 /* None */, name));
-                if (name && (includes & 788448 /* Classifiable */)) {
-                    classifiableNames[name] = name;
-                }
-                if (symbol.flags & excludes) {
-                    if (node.name) {
-                        node.name.parent = node;
-                    }
-                    // Report errors every position with duplicate declaration
-                    // Report errors on previous encountered declarations
-                    var message = symbol.flags & 2 /* BlockScopedVariable */
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        if (declaration.flags & 1024 /* Default */) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
-                        }
-                    });
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
-                    });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
-                    symbol = createSymbol(0 /* None */, name);
-                }
-            }
-            else {
-                symbol = createSymbol(0 /* None */, "__missing");
-            }
-            addDeclarationToSymbol(symbol, node, includes);
-            symbol.parent = parent;
-            return symbol;
-        }
-        function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1 /* Export */;
-            if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 230 /* ExportSpecifier */ || (node.kind === 221 /* ImportEqualsDeclaration */ && hasExportModifier)) {
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-            else {
-                // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue,
-                // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set
-                // on it. There are 2 main reasons:
-                //
-                //   1. We treat locals and exports of the same name as mutually exclusive within a container.
-                //      That means the binder will issue a Duplicate Identifier error if you mix locals and exports
-                //      with the same name in the same container.
-                //      TODO: Make this a more specific error and decouple it from the exclusion logic.
-                //   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 & 262144 /* ExportContext */) {
-                    var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
-                        (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
-                        (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
-                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
-                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                    node.localSymbol = local;
-                    return local;
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-        }
-        // All container nodes are kept on a linked list in declaration order. This list is used by
-        // the getLocalNameOfContainer function in the type checker to validate that the local name
-        // used for a container is unique.
-        function bindChildren(node) {
-            // Before we recurse into a node's chilren, we first save the existing parent, container
-            // and block-container.  Then after we pop out of processing the children, we restore
-            // these saved values.
-            var saveParent = parent;
-            var saveContainer = container;
-            var savedBlockScopeContainer = blockScopeContainer;
-            // This node will now be set as the parent of all of its children as we recurse into them.
-            parent = node;
-            // Depending on what kind of node this is, we may have to adjust the current container
-            // and block-container.   If the current node is a container, then it is automatically
-            // considered the current block-container as well.  Also, for containers that we know
-            // may contain locals, we proactively initialize the .locals field. We do this because
-            // it's highly likely that the .locals will be needed to place some child in (for example,
-            // a parameter, or variable declaration).
-            //
-            // However, we do not proactively create the .locals for block-containers because it's
-            // totally normal and common for block-containers to never actually have a block-scoped
-            // variable in them.  We don't want to end up allocating an object for every 'block' we
-            // run into when most of them won't be necessary.
-            //
-            // Finally, if this is a block-container, then we clear out any existing .locals object
-            // it may contain within it.  This happens in incremental scenarios.  Because we can be
-            // reusing a node from a previous compilation, that node may have had 'locals' created
-            // for it.  We must clear this so we don't accidently move any stale data forward from
-            // a previous compilation.
-            var containerFlags = getContainerFlags(node);
-            if (containerFlags & 1 /* IsContainer */) {
-                container = blockScopeContainer = node;
-                if (containerFlags & 4 /* HasLocals */) {
-                    container.locals = {};
-                }
-                addToContainerChain(container);
-            }
-            else if (containerFlags & 2 /* IsBlockScopedContainer */) {
-                blockScopeContainer = node;
-                blockScopeContainer.locals = undefined;
-            }
-            if (node.kind === 215 /* InterfaceDeclaration */) {
-                seenThisKeyword = false;
-                ts.forEachChild(node, bind);
-                node.flags = seenThisKeyword ? node.flags | 524288 /* ContainsThis */ : node.flags & ~524288 /* ContainsThis */;
-            }
-            else {
-                ts.forEachChild(node, bind);
-            }
-            container = saveContainer;
-            parent = saveParent;
-            blockScopeContainer = savedBlockScopeContainer;
-        }
-        function getContainerFlags(node) {
-            switch (node.kind) {
-                case 186 /* ClassExpression */:
-                case 214 /* ClassDeclaration */:
-                case 215 /* InterfaceDeclaration */:
-                case 217 /* EnumDeclaration */:
-                case 155 /* TypeLiteral */:
-                case 165 /* ObjectLiteralExpression */:
-                    return 1 /* IsContainer */;
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                case 213 /* FunctionDeclaration */:
-                case 144 /* Constructor */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                case 173 /* FunctionExpression */:
-                case 174 /* ArrowFunction */:
-                case 218 /* ModuleDeclaration */:
-                case 248 /* SourceFile */:
-                case 216 /* TypeAliasDeclaration */:
-                    return 5 /* IsContainerWithLocals */;
-                case 244 /* CatchClause */:
-                case 199 /* ForStatement */:
-                case 200 /* ForInStatement */:
-                case 201 /* ForOfStatement */:
-                case 220 /* CaseBlock */:
-                    return 2 /* IsBlockScopedContainer */;
-                case 192 /* Block */:
-                    // do not treat blocks directly inside a function as a block-scoped-container.
-                    // Locals that reside in this block should go to the function locals. Othewise 'x'
-                    // would not appear to be a redeclaration of a block scoped local in the following
-                    // example:
-                    //
-                    //      function foo() {
-                    //          var x;
-                    //          let x;
-                    //      }
-                    //
-                    // If we placed 'var x' into the function locals and 'let x' into the locals of
-                    // the block, then there would be no collision.
-                    //
-                    // By not creating a new block-scoped-container here, we ensure that both 'var x'
-                    // and 'let x' go into the Function-container's locals, and we do get a collision
-                    // conflict.
-                    return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */;
-            }
-            return 0 /* None */;
-        }
-        function addToContainerChain(next) {
-            if (lastContainer) {
-                lastContainer.nextContainer = next;
-            }
-            lastContainer = next;
-        }
-        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
-            // Just call this directly so that the return type of this function stays "void".
-            declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
-        }
-        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
-            switch (container.kind) {
-                // Modules, source files, and classes need specialized handling for how their
-                // members are declared (for example, a member of a class will go into a specific
-                // symbol table depending on if it is static or not). We defer to specialized
-                // handlers to take care of declaring these child members.
-                case 218 /* ModuleDeclaration */:
-                    return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 248 /* SourceFile */:
-                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 186 /* ClassExpression */:
-                case 214 /* ClassDeclaration */:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 217 /* EnumDeclaration */:
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 155 /* TypeLiteral */:
-                case 165 /* ObjectLiteralExpression */:
-                case 215 /* InterfaceDeclaration */:
-                    // Interface/Object-types always have their children added to the 'members' of
-                    // their container. They are only accessible through an instance of their
-                    // container, and are never in scope otherwise (even inside the body of the
-                    // object / type / interface declaring them). An exception is type parameters,
-                    // which are in scope without qualification (similar to 'locals').
-                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                case 144 /* Constructor */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                case 213 /* FunctionDeclaration */:
-                case 173 /* FunctionExpression */:
-                case 174 /* ArrowFunction */:
-                case 216 /* TypeAliasDeclaration */:
-                    // All the children of these container types are never visible through another
-                    // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
-                    // they're only accessed 'lexically' (i.e. from code that exists underneath
-                    // their container in the tree.  To accomplish this, we simply add their declared
-                    // symbol to the 'locals' of the container.  These symbols can then be found as
-                    // the type checker walks up the containers, checking them for matching names.
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 128 /* Static */
-                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
-                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-        }
-        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
-            return ts.isExternalModule(file)
-                ? declareModuleMember(node, symbolFlags, symbolExcludes)
-                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
-        }
-        function isAmbientContext(node) {
-            while (node) {
-                if (node.flags & 2 /* Ambient */) {
-                    return true;
-                }
-                node = node.parent;
-            }
-            return false;
-        }
-        function hasExportDeclarations(node) {
-            var body = node.kind === 248 /* SourceFile */ ? node : node.body;
-            if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function setExportContextFlag(node) {
-            // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
-            // declarations with export modifiers) is an export context in which declarations are implicitly exported.
-            if (isAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 262144 /* ExportContext */;
-            }
-            else {
-                node.flags &= ~262144 /* ExportContext */;
-            }
-        }
-        function bindModuleDeclaration(node) {
-            setExportContextFlag(node);
-            if (node.name.kind === 9 /* StringLiteral */) {
-                declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
-            }
-            else {
-                var state = getModuleInstanceState(node);
-                if (state === 0 /* NonInstantiated */) {
-                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
-                    if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) {
-                        // if module was already merged with some function, class or non-const enum
-                        // treat is a non-const-enum-only
-                        node.symbol.constEnumOnlyModule = false;
-                    }
-                    else {
-                        var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */;
-                        if (node.symbol.constEnumOnlyModule === undefined) {
-                            // non-merged case - use the current state
-                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
-                        }
-                        else {
-                            // merged case: module is const enum only if all its pieces are non-instantiated or const enum
-                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
-                        }
-                    }
-                }
-            }
-        }
-        function bindFunctionOrConstructorType(node) {
-            // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
-            // to the one we would get for: { <...>(...): T }
-            //
-            // We do that by making an anonymous type literal symbol, and then setting the function
-            // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable
-            // from an actual type literal symbol you would have gotten had you used the long form.
-            var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node));
-            addDeclarationToSymbol(symbol, node, 131072 /* Signature */);
-            var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type");
-            addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */);
-            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
-            var _a;
-        }
-        function bindObjectLiteralExpression(node) {
-            var ElementKind;
-            (function (ElementKind) {
-                ElementKind[ElementKind["Property"] = 1] = "Property";
-                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
-            })(ElementKind || (ElementKind = {}));
-            if (inStrictMode) {
-                var seen = {};
-                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (prop.name.kind !== 69 /* Identifier */) {
-                        continue;
-                    }
-                    var identifier = prop.name;
-                    // ECMA-262 11.1.5 Object Initialiser
-                    // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
-                    // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
-                    // IsDataDescriptor(propId.descriptor) is true.
-                    //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
-                    //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
-                    //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
-                    // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */
-                        ? 1 /* Property */
-                        : 2 /* Accessor */;
-                    var existingKind = seen[identifier.text];
-                    if (!existingKind) {
-                        seen[identifier.text] = currentKind;
-                        continue;
-                    }
-                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
-                        var span = ts.getErrorSpanForNode(file, identifier);
-                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
-                    }
-                }
-            }
-            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object");
-        }
-        function bindAnonymousDeclaration(node, symbolFlags, name) {
-            var symbol = createSymbol(symbolFlags, name);
-            addDeclarationToSymbol(symbol, node, symbolFlags);
-        }
-        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
-            switch (blockScopeContainer.kind) {
-                case 218 /* ModuleDeclaration */:
-                    declareModuleMember(node, symbolFlags, symbolExcludes);
-                    break;
-                case 248 /* SourceFile */:
-                    if (ts.isExternalModule(container)) {
-                        declareModuleMember(node, symbolFlags, symbolExcludes);
-                        break;
-                    }
-                // fall through.
-                default:
-                    if (!blockScopeContainer.locals) {
-                        blockScopeContainer.locals = {};
-                        addToContainerChain(blockScopeContainer);
-                    }
-                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function bindBlockScopedVariableDeclaration(node) {
-            bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */);
-        }
-        // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized
-        // check for reserved words used as identifiers in strict mode code.
-        function checkStrictModeIdentifier(node) {
-            if (inStrictMode &&
-                node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 114 /* LastFutureReservedWord */ &&
-                !ts.isIdentifierName(node)) {
-                // Report error only if there are no parse errors in file
-                if (!file.parseDiagnostics.length) {
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
-                }
-            }
-        }
-        function getStrictModeIdentifierMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
-        }
-        function checkStrictModeBinaryExpression(node) {
-            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
-                // Assignment operator(11.13) or of a PostfixExpression(11.3)
-                checkStrictModeEvalOrArguments(node, node.left);
-            }
-        }
-        function checkStrictModeCatchClause(node) {
-            // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the
-            // Catch production is eval or arguments
-            if (inStrictMode && node.variableDeclaration) {
-                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
-            }
-        }
-        function checkStrictModeDeleteExpression(node) {
-            // Grammar checking
-            if (inStrictMode && node.expression.kind === 69 /* Identifier */) {
-                // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
-                // UnaryExpression is a direct reference to a variable, function argument, or function name
-                var span = ts.getErrorSpanForNode(file, node.expression);
-                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
-            }
-        }
-        function isEvalOrArgumentsIdentifier(node) {
-            return node.kind === 69 /* Identifier */ &&
-                (node.text === "eval" || node.text === "arguments");
-        }
-        function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 69 /* Identifier */) {
-                var identifier = name;
-                if (isEvalOrArgumentsIdentifier(identifier)) {
-                    // We check first if the name is inside class declaration or class expression; if so give explicit message
-                    // otherwise report generic error message.
-                    var span = ts.getErrorSpanForNode(file, name);
-                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
-                }
-            }
-        }
-        function getStrictModeEvalOrArgumentsMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
-        }
-        function checkStrictModeFunctionName(node) {
-            if (inStrictMode) {
-                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1))
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-        }
-        function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 65536 /* OctalLiteral */) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
-            }
-        }
-        function checkStrictModePostfixUnaryExpression(node) {
-            // Grammar checking
-            // The identifier eval or arguments may not appear as the LeftHandSideExpression of an
-            // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression
-            // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.operand);
-            }
-        }
-        function checkStrictModePrefixUnaryExpression(node) {
-            // Grammar checking
-            if (inStrictMode) {
-                if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) {
-                    checkStrictModeEvalOrArguments(node, node.operand);
-                }
-            }
-        }
-        function checkStrictModeWithStatement(node) {
-            // Grammar checking for withStatement
-            if (inStrictMode) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
-            }
-        }
-        function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) {
-            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
-            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
-        }
-        function getDestructuringParameterName(node) {
-            return "__" + ts.indexOf(node.parent.parameters, node);
-        }
-        function bind(node) {
-            node.parent = parent;
-            var savedInStrictMode = inStrictMode;
-            if (!savedInStrictMode) {
-                updateStrictMode(node);
-            }
-            // First we bind declaration nodes to a symbol if possible.  We'll both create a symbol
-            // and then potentially add the symbol to an appropriate symbol table. Possible
-            // destination symbol tables are:
-            //
-            //  1) The 'exports' table of the current container's symbol.
-            //  2) The 'members' table of the current container's symbol.
-            //  3) The 'locals' table of the current container.
-            //
-            // However, not all symbols will end up in any of these tables.  'Anonymous' symbols
-            // (like TypeLiterals for example) will not be put in any table.
-            bindWorker(node);
-            // Then we recurse into the children of the node to bind them as well.  For certain
-            // symbols we do specialized work when we recurse.  For example, we'll keep track of
-            // the current 'container' node when it changes.  This helps us know which symbol table
-            // a local should go into for example.
-            bindChildren(node);
-            inStrictMode = savedInStrictMode;
-        }
-        function updateStrictMode(node) {
-            switch (node.kind) {
-                case 248 /* SourceFile */:
-                case 219 /* ModuleBlock */:
-                    updateStrictModeStatementList(node.statements);
-                    return;
-                case 192 /* Block */:
-                    if (ts.isFunctionLike(node.parent)) {
-                        updateStrictModeStatementList(node.statements);
-                    }
-                    return;
-                case 214 /* ClassDeclaration */:
-                case 186 /* ClassExpression */:
-                    // All classes are automatically in strict mode in ES6.
-                    inStrictMode = true;
-                    return;
-            }
-        }
-        function updateStrictModeStatementList(statements) {
-            for (var _i = 0; _i < statements.length; _i++) {
-                var statement = statements[_i];
-                if (!ts.isPrologueDirective(statement)) {
-                    return;
-                }
-                if (isUseStrictPrologueDirective(statement)) {
-                    inStrictMode = true;
-                    return;
-                }
-            }
-        }
-        /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
-        function isUseStrictPrologueDirective(node) {
-            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
-            // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
-            // string to contain unicode escapes (as per ES5).
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
-        }
-        function bindWorker(node) {
-            switch (node.kind) {
-                case 69 /* Identifier */:
-                    return checkStrictModeIdentifier(node);
-                case 181 /* BinaryExpression */:
-                    return checkStrictModeBinaryExpression(node);
-                case 244 /* CatchClause */:
-                    return checkStrictModeCatchClause(node);
-                case 175 /* DeleteExpression */:
-                    return checkStrictModeDeleteExpression(node);
-                case 8 /* NumericLiteral */:
-                    return checkStrictModeNumericLiteral(node);
-                case 180 /* PostfixUnaryExpression */:
-                    return checkStrictModePostfixUnaryExpression(node);
-                case 179 /* PrefixUnaryExpression */:
-                    return checkStrictModePrefixUnaryExpression(node);
-                case 205 /* WithStatement */:
-                    return checkStrictModeWithStatement(node);
-                case 97 /* ThisKeyword */:
-                    seenThisKeyword = true;
-                    return;
-                case 137 /* TypeParameter */:
-                    return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
-                case 138 /* Parameter */:
-                    return bindParameter(node);
-                case 211 /* VariableDeclaration */:
-                case 163 /* BindingElement */:
-                    return bindVariableDeclarationOrBindingElement(node);
-                case 141 /* PropertyDeclaration */:
-                case 140 /* PropertySignature */:
-                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */);
-                case 245 /* PropertyAssignment */:
-                case 246 /* ShorthandPropertyAssignment */:
-                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */);
-                case 247 /* EnumMember */:
-                    return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                    return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                    // If this is an ObjectLiteralExpression method, then it sits in the same space
-                    // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
-                    // so that it will conflict with any other object literal members with the same
-                    // name.
-                    return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 213 /* FunctionDeclaration */:
-                    checkStrictModeFunctionName(node);
-                    return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */);
-                case 144 /* Constructor */:
-                    return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 145 /* GetAccessor */:
-                    return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 146 /* SetAccessor */:
-                    return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                    return bindFunctionOrConstructorType(node);
-                case 155 /* TypeLiteral */:
-                    return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 165 /* ObjectLiteralExpression */:
-                    return bindObjectLiteralExpression(node);
-                case 173 /* FunctionExpression */:
-                case 174 /* ArrowFunction */:
-                    checkStrictModeFunctionName(node);
-                    var bindingName = node.name ? node.name.text : "__function";
-                    return bindAnonymousDeclaration(node, 16 /* Function */, bindingName);
-                case 186 /* ClassExpression */:
-                case 214 /* ClassDeclaration */:
-                    return bindClassLikeDeclaration(node);
-                case 215 /* InterfaceDeclaration */:
-                    return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
-                case 216 /* TypeAliasDeclaration */:
-                    return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
-                case 217 /* EnumDeclaration */:
-                    return bindEnumDeclaration(node);
-                case 218 /* ModuleDeclaration */:
-                    return bindModuleDeclaration(node);
-                case 221 /* ImportEqualsDeclaration */:
-                case 224 /* NamespaceImport */:
-                case 226 /* ImportSpecifier */:
-                case 230 /* ExportSpecifier */:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 223 /* ImportClause */:
-                    return bindImportClause(node);
-                case 228 /* ExportDeclaration */:
-                    return bindExportDeclaration(node);
-                case 227 /* ExportAssignment */:
-                    return bindExportAssignment(node);
-                case 248 /* SourceFile */:
-                    return bindSourceFileIfExternalModule();
-            }
-        }
-        function bindSourceFileIfExternalModule() {
-            setExportContextFlag(file);
-            if (ts.isExternalModule(file)) {
-                bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
-            }
-        }
-        function bindExportAssignment(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                // Export assignment in some sort of block construct
-                bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
-            }
-            else if (node.expression.kind === 69 /* Identifier */) {
-                // An export default clause with an identifier exports all meanings of that identifier
-                declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
-            }
-            else {
-                // An export default clause with an expression exports a value
-                declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
-            }
-        }
-        function bindExportDeclaration(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                // Export * in some sort of block construct
-                bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node));
-            }
-            else if (!node.exportClause) {
-                // All export * declarations are collected in an __export symbol
-                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */);
-            }
-        }
-        function bindImportClause(node) {
-            if (node.name) {
-                declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-            }
-        }
-        function bindClassLikeDeclaration(node) {
-            if (node.kind === 214 /* ClassDeclaration */) {
-                bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
-            }
-            else {
-                var bindingName = node.name ? node.name.text : "__class";
-                bindAnonymousDeclaration(node, 32 /* Class */, bindingName);
-                // Add name of class expression into the map for semantic classifier
-                if (node.name) {
-                    classifiableNames[node.name.text] = node.name.text;
-                }
-            }
-            var symbol = node.symbol;
-            // TypeScript 1.0 spec (April 2014): 8.4
-            // Every class automatically contains a static property member named 'prototype', the
-            // type of which is an instantiation of the class type with type Any supplied as a type
-            // argument for each type parameter. It is an error to explicitly declare a static
-            // property member with the name 'prototype'.
-            //
-            // Note: we check for this here because this class may be merging into a module.  The
-            // module might have an exported variable called 'prototype'.  We can't allow that as
-            // that would clash with the built-in 'prototype' for the class.
-            var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype");
-            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
-                if (node.name) {
-                    node.name.parent = node;
-                }
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
-            }
-            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
-            prototypeSymbol.parent = symbol;
-        }
-        function bindEnumDeclaration(node) {
-            return ts.isConst(node)
-                ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */)
-                : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */);
-        }
-        function bindVariableDeclarationOrBindingElement(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (!ts.isBindingPattern(node.name)) {
-                if (ts.isBlockOrCatchScoped(node)) {
-                    bindBlockScopedVariableDeclaration(node);
-                }
-                else if (ts.isParameterDeclaration(node)) {
-                    // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration
-                    // because its parent chain has already been set up, since parents are set before descending into children.
-                    //
-                    // If node is a binding element in parameter declaration, we need to use ParameterExcludes.
-                    // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration
-                    // For example:
-                    //      function foo([a,a]) {} // Duplicate Identifier error
-                    //      function bar(a,a) {}   // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter
-                    //                             // which correctly set excluded symbols
-                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */);
-                }
-            }
-        }
-        function bindParameter(node) {
-            if (inStrictMode) {
-                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
-                // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (ts.isBindingPattern(node.name)) {
-                bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node));
-            }
-            else {
-                declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
-            }
-            // If this is a property-parameter, then also declare the property symbol into the
-            // containing class.
-            if (node.flags & 112 /* AccessibilityModifier */ &&
-                node.parent.kind === 144 /* Constructor */ &&
-                ts.isClassLike(node.parent.parent)) {
-                var classDeclaration = node.parent.parent;
-                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */);
-            }
-        }
-        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
-            return ts.hasDynamicName(node)
-                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
-                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
-        }
-    }
-})(ts || (ts = {}));
-/// <reference path="binder.ts" />
 /// <reference path="sys.ts" />
 /* @internal */
 var ts;
@@ -5126,8 +4190,8 @@ var ts;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
                 if (declaration.kind === kind) {
                     return declaration;
                 }
@@ -5173,15 +4237,15 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(arr1, arr2, comparer) {
-        if (!arr1 || !arr2) {
-            return arr1 === arr2;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
         }
-        if (arr1.length !== arr2.length) {
+        if (array1.length !== array2.length) {
             return false;
         }
-        for (var i = 0; i < arr1.length; ++i) {
-            var equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];
+        for (var i = 0; i < array1.length; ++i) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
             if (!equals) {
                 return false;
             }
@@ -5327,7 +4391,7 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 49152 /* BlockScoped */) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
@@ -5439,8 +4503,12 @@ var ts;
         return file.externalModuleIndicator !== undefined;
     }
     ts.isExternalModule = isExternalModule;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 8192 /* DeclarationFile */) !== 0;
+        return (file.flags & 4096 /* DeclarationFile */) !== 0;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
@@ -5477,11 +4545,11 @@ var ts;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 32768 /* Const */);
+        return !!(getCombinedNodeFlags(node) & 16384 /* Const */);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 16384 /* Let */);
+        return !!(getCombinedNodeFlags(node) & 8192 /* Let */);
     }
     ts.isLet = isLet;
     function isPrologueDirective(node) {
@@ -5492,19 +4560,27 @@ var ts;
         return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getLeadingCommentRangesOfNodeFromText(node, text) {
+        return ts.getLeadingCommentRanges(text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
     function getJsDocComments(node, sourceFileOfNode) {
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
+    }
+    ts.getJsDocComments = getJsDocComments;
+    function getJsDocCommentsFromText(node, text) {
         var commentRanges = (node.kind === 138 /* Parameter */ || node.kind === 137 /* TypeParameter */) ?
-            ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) :
-            getLeadingCommentRangesOfNode(node, sourceFileOfNode);
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
         function isJsDocComment(comment) {
             // True if the comment starts with '/**' but not if it is '/**/'
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47 /* slash */;
+            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 3) !== 47 /* slash */;
         }
     }
-    ts.getJsDocComments = getJsDocComments;
+    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
@@ -5682,27 +4758,28 @@ var ts;
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 144 /* Constructor */:
-                case 173 /* FunctionExpression */:
-                case 213 /* FunctionDeclaration */:
-                case 174 /* ArrowFunction */:
-                case 143 /* MethodDeclaration */:
-                case 142 /* MethodSignature */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                case 147 /* CallSignature */:
-                case 148 /* ConstructSignature */:
-                case 149 /* IndexSignature */:
-                case 152 /* FunctionType */:
-                case 153 /* ConstructorType */:
-                    return true;
-            }
-        }
-        return false;
+        return node && isFunctionLikeKind(node.kind);
     }
     ts.isFunctionLike = isFunctionLike;
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 144 /* Constructor */:
+            case 173 /* FunctionExpression */:
+            case 213 /* FunctionDeclaration */:
+            case 174 /* ArrowFunction */:
+            case 143 /* MethodDeclaration */:
+            case 142 /* MethodSignature */:
+            case 145 /* GetAccessor */:
+            case 146 /* SetAccessor */:
+            case 147 /* CallSignature */:
+            case 148 /* ConstructSignature */:
+            case 149 /* IndexSignature */:
+            case 152 /* FunctionType */:
+            case 153 /* ConstructorType */:
+                return true;
+        }
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
             case 143 /* MethodDeclaration */:
@@ -5717,6 +4794,20 @@ var ts;
         return false;
     }
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 199 /* ForStatement */:
+            case 200 /* ForInStatement */:
+            case 201 /* ForOfStatement */:
+            case 197 /* DoStatement */:
+            case 198 /* WhileStatement */:
+                return true;
+            case 207 /* LabeledStatement */:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
         return node && node.kind === 192 /* Block */ && isFunctionLike(node.parent);
     }
@@ -6076,6 +5167,57 @@ var ts;
         return node.kind === 221 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 232 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJavaScript(file) {
+        return isInJavaScriptFile(file);
+    }
+    ts.isSourceFileJavaScript = isSourceFileJavaScript;
+    function isInJavaScriptFile(node) {
+        return node && !!(node.parserContextFlags & 32 /* JavaScriptFile */);
+    }
+    ts.isInJavaScriptFile = isInJavaScriptFile;
+    /**
+     * Returns true if the node is a CallExpression to the identifier 'require' with
+     * exactly one string literal argument.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    function isRequireCall(expression) {
+        // of the form 'require("name")'
+        return expression.kind === 168 /* CallExpression */ &&
+            expression.expression.kind === 69 /* Identifier */ &&
+            expression.expression.text === "require" &&
+            expression.arguments.length === 1 &&
+            expression.arguments[0].kind === 9 /* StringLiteral */;
+    }
+    ts.isRequireCall = isRequireCall;
+    /**
+     * Returns true if the node is an assignment to a property on the identifier 'exports'.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    function isExportsPropertyAssignment(expression) {
+        // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181 /* BinaryExpression */) &&
+            (expression.operatorToken.kind === 56 /* EqualsToken */) &&
+            (expression.left.kind === 166 /* PropertyAccessExpression */) &&
+            (expression.left.expression.kind === 69 /* Identifier */) &&
+            ((expression.left.expression).text === "exports");
+    }
+    ts.isExportsPropertyAssignment = isExportsPropertyAssignment;
+    /**
+     * Returns true if the node is an assignment to the property access expression 'module.exports'.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    function isModuleExportsAssignment(expression) {
+        // of the form 'module.exports = expr' where 'expr' is arbitrary
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === 181 /* BinaryExpression */) &&
+            (expression.operatorToken.kind === 56 /* EqualsToken */) &&
+            (expression.left.kind === 166 /* PropertyAccessExpression */) &&
+            (expression.left.expression.kind === 69 /* Identifier */) &&
+            ((expression.left.expression).text === "module") &&
+            (expression.left.name.text === "exports");
+    }
+    ts.isModuleExportsAssignment = isModuleExportsAssignment;
     function getExternalModuleName(node) {
         if (node.kind === 222 /* ImportDeclaration */) {
             return node.moduleSpecifier;
@@ -6191,9 +5333,18 @@ var ts;
         return !!node && (node.kind === 162 /* ArrayBindingPattern */ || node.kind === 161 /* ObjectBindingPattern */);
     }
     ts.isBindingPattern = isBindingPattern;
+    function isNodeDescendentOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (2 /* Ambient */ | 8192 /* DeclarationFile */)) {
+            if (node.flags & (4 /* Ambient */ | 4096 /* DeclarationFile */)) {
                 return true;
             }
             node = node.parent;
@@ -6251,7 +5402,7 @@ var ts;
             case 207 /* LabeledStatement */:
             case 204 /* ReturnStatement */:
             case 206 /* SwitchStatement */:
-            case 98 /* ThrowKeyword */:
+            case 208 /* ThrowStatement */:
             case 209 /* TryStatement */:
             case 193 /* VariableStatement */:
             case 198 /* WhileStatement */:
@@ -6364,8 +5515,8 @@ var ts;
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
     function getHeritageClause(clauses, kind) {
         if (clauses) {
-            for (var _i = 0; _i < clauses.length; _i++) {
-                var clause = clauses[_i];
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
                 if (clause.token === kind) {
                     return clause;
                 }
@@ -6377,7 +5528,6 @@ var ts;
     function tryResolveScriptReference(host, sourceFile, reference) {
         if (!host.getCompilerOptions().noResolve) {
             var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            referenceFileName = ts.getNormalizedAbsolutePath(referenceFileName, host.getCurrentDirectory());
             return host.getSourceFile(referenceFileName);
         }
     }
@@ -6395,8 +5545,8 @@ var ts;
     function getFileReferenceFromReferencePath(comment, commentRange) {
         var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
         var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.exec(comment)) {
-            if (isNoDefaultLibRegEx.exec(comment)) {
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
                 return {
                     isNoDefaultLib: true
                 };
@@ -6435,9 +5585,13 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && (node.flags & 512 /* Async */) !== 0 && !isAccessor(node);
+        return isFunctionLike(node) && (node.flags & 256 /* Async */) !== 0 && !isAccessor(node);
     }
     ts.isAsyncFunctionLike = isAsyncFunctionLike;
+    function isStringOrNumericLiteral(kind) {
+        return kind === 9 /* StringLiteral */ || kind === 8 /* NumericLiteral */;
+    }
+    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
     /**
      * A declaration has a dynamic name if both of the following are true:
      *   1. The declaration has a computed property name
@@ -6446,11 +5600,15 @@ var ts;
      *      Symbol.
      */
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 136 /* ComputedPropertyName */ &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && isDynamicName(declaration.name);
     }
     ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 136 /* ComputedPropertyName */ &&
+            !isStringOrNumericLiteral(name.expression.kind) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
     /**
      * Checks if the expression is of the form:
      *    Symbol.name
@@ -6539,7 +5697,7 @@ var ts;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
-        var node = ts.createNode(kind);
+        var node = ts.createNode(kind, /* pos */ -1, /* end */ -1);
         node.startsOnNewLine = startsOnNewLine;
         return node;
     }
@@ -6691,11 +5849,11 @@ var ts;
     }
     ts.getIndentSize = getIndentSize;
     function createTextWriter(newLine) {
-        var output = "";
-        var indent = 0;
-        var lineStart = true;
-        var lineCount = 0;
-        var linePos = 0;
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
         function write(s) {
             if (s && s.length) {
                 if (lineStart) {
@@ -6705,6 +5863,13 @@ var ts;
                 output += s;
             }
         }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
         function rawWrite(s) {
             if (s !== undefined) {
                 if (lineStart) {
@@ -6731,9 +5896,10 @@ var ts;
                 lineStart = true;
             }
         }
-        function writeTextOfNode(sourceFile, node) {
-            write(getSourceTextOfNodeFromSourceFile(sourceFile, node));
+        function writeTextOfNode(text, node) {
+            write(getTextOfNodeFromSourceText(text, node));
         }
+        reset();
         return {
             write: write,
             rawWrite: rawWrite,
@@ -6746,10 +5912,20 @@ var ts;
             getTextPos: function () { return output.length; },
             getLine: function () { return lineCount + 1; },
             getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            getText: function () { return output; },
+            reset: reset
         };
     }
     ts.createTextWriter = createTextWriter;
+    /**
+     * Resolves a local path to a path which is absolute to the base of the emit
+     */
+    function getExternalModuleNameFromPath(host, fileName) {
+        var dir = host.getCurrentDirectory();
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, /*isAbsolutePathAnUrl*/ false);
+        return ts.removeFileExtension(relativePath);
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
     function getOwnEmitOutputFilePath(sourceFile, host, extension) {
         var compilerOptions = host.getCompilerOptions();
         var emitOutputFilePathWithoutExtension;
@@ -6778,6 +5954,10 @@ var ts;
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
             if (member.kind === 144 /* Constructor */ && nodeIsPresent(member.body)) {
@@ -6822,7 +6002,7 @@ var ts;
         else {
             ts.forEach(declarations, function (member) {
                 if ((member.kind === 145 /* GetAccessor */ || member.kind === 146 /* SetAccessor */)
-                    && (member.flags & 128 /* Static */) === (accessor.flags & 128 /* Static */)) {
+                    && (member.flags & 64 /* Static */) === (accessor.flags & 64 /* Static */)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -6850,22 +6030,22 @@ var ts;
         };
     }
     ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
         // If the leading comments start on different line than the start of node, write new line
         if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
     ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) {
+    function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) {
         var emitLeadingSpace = !trailingSeparator;
         ts.forEach(comments, function (comment) {
             if (emitLeadingSpace) {
                 writer.write(" ");
                 emitLeadingSpace = false;
             }
-            writeComment(currentSourceFile, writer, comment, newLine);
+            writeComment(text, lineMap, writer, comment, newLine);
             if (comment.hasTrailingNewLine) {
                 writer.writeLine();
             }
@@ -6879,19 +6059,79 @@ var ts;
         });
     }
     ts.emitComments = emitComments;
-    function writeCommentRange(currentSourceFile, writer, comment, newLine) {
-        if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
-            var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
-            var lineCount = ts.getLineStarts(currentSourceFile).length;
+    /**
+     * Detached comment is a comment at the top of file or function body that is separated from
+     * the next statement by space.
+     */
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            // removeComments is true, only reserve pinned comment at the top of file
+            // For example:
+            //      /*! Pinned Comment */
+            //
+            //      var x = 10;
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            // removeComments is false, just get detached as normal and bypass the process to filter comment
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        // There was a blank line between the last comment and this comment.  This
+                        // comment is not part of the copyright comments.  Return what we have so
+                        // far.
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                // All comments look like they could have been part of the copyright header.  Make
+                // sure there is at least one blank line between it and the node.  If not, it's not
+                // a copyright header.
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    // Valid detachedComments
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 2) === 33 /* exclamation */;
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, comment, newLine) {
+        if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
+            var lineCount = lineMap.length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
                 if (pos !== comment.pos) {
                     // If we are not emitting first line, we need to write the spaces to adjust the alignment
                     if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
                     }
                     // These are number of spaces writer is going to write at current indent
                     var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
@@ -6909,7 +6149,7 @@ var ts;
                     //            More right indented comment */                  --4 = 8 - 4 + 11
                     //     class c { }
                     // }
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
                     if (spacesToEmit > 0) {
                         var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
                         var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
@@ -6927,57 +6167,57 @@ var ts;
                     }
                 }
                 // Write the comment line text
-                writeTrimmedCurrentLine(pos, nextLineStart);
+                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
                 pos = nextLineStart;
             }
         }
         else {
             // Single line comment of style //....
-            writer.write(currentSourceFile.text.substring(comment.pos, comment.end));
-        }
-        function writeTrimmedCurrentLine(pos, nextLineStart) {
-            var end = Math.min(comment.end, nextLineStart - 1);
-            var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-            if (currentLineText) {
-                // trimmed forward and ending spaces text
-                writer.write(currentLineText);
-                if (end !== comment.end) {
-                    writer.writeLine();
-                }
-            }
-            else {
-                // Empty string - make sure we write empty line
-                writer.writeLiteral(newLine);
-            }
-        }
-        function calculateIndent(pos, end) {
-            var currentLineIndent = 0;
-            for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) {
-                if (currentSourceFile.text.charCodeAt(pos) === 9 /* tab */) {
-                    // Tabs = TabSize = indent size and go to next tabStop
-                    currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-                }
-                else {
-                    // Single space
-                    currentLineIndent++;
-                }
-            }
-            return currentLineIndent;
+            writer.write(text.substring(comment.pos, comment.end));
         }
     }
     ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(comment.end, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            // trimmed forward and ending spaces text
+            writer.write(currentLineText);
+            if (end !== comment.end) {
+                writer.writeLine();
+            }
+        }
+        else {
+            // Empty string - make sure we write empty line
+            writer.writeLiteral(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9 /* tab */) {
+                // Tabs = TabSize = indent size and go to next tabStop
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                // Single space
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
     function modifierToFlag(token) {
         switch (token) {
-            case 113 /* StaticKeyword */: return 128 /* Static */;
-            case 112 /* PublicKeyword */: return 16 /* Public */;
-            case 111 /* ProtectedKeyword */: return 64 /* Protected */;
-            case 110 /* PrivateKeyword */: return 32 /* Private */;
-            case 115 /* AbstractKeyword */: return 256 /* Abstract */;
-            case 82 /* ExportKeyword */: return 1 /* Export */;
-            case 122 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 74 /* ConstKeyword */: return 32768 /* Const */;
-            case 77 /* DefaultKeyword */: return 1024 /* Default */;
-            case 118 /* AsyncKeyword */: return 512 /* Async */;
+            case 113 /* StaticKeyword */: return 64 /* Static */;
+            case 112 /* PublicKeyword */: return 8 /* Public */;
+            case 111 /* ProtectedKeyword */: return 32 /* Protected */;
+            case 110 /* PrivateKeyword */: return 16 /* Private */;
+            case 115 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 82 /* ExportKeyword */: return 2 /* Export */;
+            case 122 /* DeclareKeyword */: return 4 /* Ambient */;
+            case 74 /* ConstKeyword */: return 16384 /* Const */;
+            case 77 /* DefaultKeyword */: return 512 /* Default */;
+            case 118 /* AsyncKeyword */: return 256 /* Async */;
         }
         return 0;
     }
@@ -7058,17 +6298,17 @@ var ts;
     }
     ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
     function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 1024 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined;
+        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined;
     }
     ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function isJavaScript(fileName) {
-        return ts.fileExtensionIs(fileName, ".js");
+    function hasJavaScriptFileExtension(fileName) {
+        return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isJavaScript = isJavaScript;
-    function isTsx(fileName) {
-        return ts.fileExtensionIs(fileName, ".tsx");
+    ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension;
+    function allowsJsxExpressions(fileName) {
+        return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx");
     }
-    ts.isTsx = isTsx;
+    ts.allowsJsxExpressions = allowsJsxExpressions;
     /**
      * Replace each instance of non-ascii characters by one, two, three, or four escape sequences
      * representing the UTF-8 encoding of the character, and return the expanded char code list.
@@ -7135,6 +6375,12 @@ var ts;
         return result;
     }
     ts.convertToBase64 = convertToBase64;
+    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
+        return !ts.isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /* isAbsolutePathAnUrl */ false);
+    }
+    ts.convertToRelativePath = convertToRelativePath;
     var carriageReturnLineFeed = "\r\n";
     var lineFeed = "\n";
     function getNewLineCharacter(options) {
@@ -7372,29 +6618,21 @@ var ts;
         }
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
-    function arrayStructurallyIsEqualTo(array1, array2) {
-        if (!array1 || !array2) {
-            return false;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        return ts.arrayIsEqualTo(array1.sort(), array2.sort());
-    }
-    ts.arrayStructurallyIsEqualTo = arrayStructurallyIsEqualTo;
 })(ts || (ts = {}));
-/// <reference path="scanner.ts"/>
 /// <reference path="utilities.ts"/>
+/// <reference path="scanner.ts"/>
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(272 /* Count */);
     /* @internal */ ts.parseTime = 0;
-    function getNodeConstructor(kind) {
-        return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
-    }
-    ts.getNodeConstructor = getNodeConstructor;
-    function createNode(kind) {
-        return new (getNodeConstructor(kind))();
+    var NodeConstructor;
+    var SourceFileConstructor;
+    function createNode(kind, pos, end) {
+        if (kind === 248 /* SourceFile */) {
+            return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
+        }
+        else {
+            return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
+        }
     }
     ts.createNode = createNode;
     function visitNode(cbNode, node) {
@@ -7409,8 +6647,8 @@ var ts;
     }
     function visitEachNode(cbNode, nodes) {
         if (nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                var node = nodes_1[_i];
                 var result = cbNode(node);
                 if (result) {
                     return result;
@@ -7817,6 +7055,9 @@ var ts;
         // up by avoiding the cost of creating/compiling scanners over and over again.
         var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 1 /* DisallowIn */ | 4 /* Decorator */;
+        // capture constructors in 'initializeState' to avoid null checks
+        var NodeConstructor;
+        var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
         var syntaxCursor;
@@ -7902,13 +7143,16 @@ var ts;
         // attached to the EOF token.
         var parseErrorBeforeNextFinishedNode = false;
         function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor);
+            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
+            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
             var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+            NodeConstructor = ts.objectAllocator.getNodeConstructor();
+            SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
             parseDiagnostics = [];
@@ -7916,13 +7160,13 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = ts.isJavaScript(fileName) ? 32 /* JavaScriptFile */ : 0 /* None */;
+            contextFlags = isJavaScriptFile ? 32 /* JavaScriptFile */ : 0 /* None */;
             parseErrorBeforeNextFinishedNode = false;
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 /* JSX */ : 0 /* Standard */);
+            scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 /* JSX */ : 0 /* Standard */);
         }
         function clearState() {
             // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily.
@@ -7937,6 +7181,9 @@ var ts;
         }
         function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
             sourceFile = createSourceFile(fileName, languageVersion);
+            if (contextFlags & 32 /* JavaScriptFile */) {
+                sourceFile.parserContextFlags = 32 /* JavaScriptFile */;
+            }
             // Prime the scanner.
             token = nextToken();
             processReferenceComments(sourceFile);
@@ -7954,7 +7201,7 @@ var ts;
             // If this is a javascript file, proactively see if we can get JSDoc comments for
             // relevant nodes in the file.  We'll use these to provide typing informaion if they're
             // available.
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 addJSDocComments();
             }
             return sourceFile;
@@ -7977,8 +7224,8 @@ var ts;
         function addJSDocComment(node) {
             var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
             if (comments) {
-                for (var _i = 0; _i < comments.length; _i++) {
-                    var comment = comments[_i];
+                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                    var comment = comments_1[_i];
                     var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
                     if (jsDocComment) {
                         node.jsDocComment = jsDocComment;
@@ -8009,15 +7256,16 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion) {
-            var sourceFile = createNode(248 /* SourceFile */, /*pos*/ 0);
-            sourceFile.pos = 0;
-            sourceFile.end = sourceText.length;
+            // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
+            // this is quite rare comparing to other nodes and createNode should be as fast as possible
+            var sourceFile = new SourceFileConstructor(248 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 8192 /* DeclarationFile */ : 0;
-            sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */;
+            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 /* DeclarationFile */ : 0;
+            sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -8282,15 +7530,13 @@ var ts;
                 return parseExpected(23 /* SemicolonToken */);
             }
         }
+        // note: this function creates only node
         function createNode(kind, pos) {
             nodeCount++;
-            var node = new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))();
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            node.pos = pos;
-            node.end = pos;
-            return node;
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -8455,7 +7701,7 @@ var ts;
                 case 12 /* ObjectLiteralMembers */:
                     return token === 19 /* OpenBracketToken */ || token === 37 /* AsteriskToken */ || isLiteralPropertyName();
                 case 9 /* ObjectBindingElements */:
-                    return isLiteralPropertyName();
+                    return token === 19 /* OpenBracketToken */ || isLiteralPropertyName();
                 case 7 /* HeritageClauseElement */:
                     // If we see { } then only consume it as an expression if it is followed by , or {
                     // That way we won't consume the body of a class in its heritage clause.
@@ -9077,7 +8323,7 @@ var ts;
             if (node.kind === 8 /* NumericLiteral */
                 && sourceText.charCodeAt(tokenPos) === 48 /* _0 */
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 65536 /* OctalLiteral */;
+                node.flags |= 32768 /* OctalLiteral */;
             }
             return node;
         }
@@ -9135,9 +8381,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(54 /* ColonToken */)) {
-                return token === 9 /* StringLiteral */
-                    ? parseLiteralNode(/*internName*/ true)
-                    : parseType();
+                return parseType();
             }
             return undefined;
         }
@@ -9468,6 +8712,8 @@ var ts;
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReferenceOrTypePredicate();
+                case 9 /* StringLiteral */:
+                    return parseLiteralNode(/*internName*/ true);
                 case 103 /* VoidKeyword */:
                 case 97 /* ThisKeyword */:
                     return parseTokenNode();
@@ -9497,6 +8743,7 @@ var ts;
                 case 19 /* OpenBracketToken */:
                 case 25 /* LessThanToken */:
                 case 92 /* NewKeyword */:
+                case 9 /* StringLiteral */:
                     return true;
                 case 17 /* OpenParenToken */:
                     // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier,
@@ -9830,7 +9077,7 @@ var ts;
                 // Didn't appear to actually be a parenthesized arrow function.  Just bail out.
                 return undefined;
             }
-            var isAsync = !!(arrowFunction.flags & 512 /* Async */);
+            var isAsync = !!(arrowFunction.flags & 256 /* Async */);
             // If we have an arrow, then try to parse the body. Even if not, try to parse if we
             // have an opening brace, just in case we're in an error state.
             var lastToken = token;
@@ -9913,7 +9160,7 @@ var ts;
                     return 1 /* True */;
                 }
                 // This *could* be a parenthesized arrow function.
-                // Return Unknown to let the caller know.
+                // Return Unknown to const the caller know.
                 return 2 /* Unknown */;
             }
             else {
@@ -9957,7 +9204,7 @@ var ts;
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
             var node = createNode(174 /* ArrowFunction */);
             setModifiers(node, parseModifiersForArrowFunction());
-            var isAsync = !!(node.flags & 512 /* Async */);
+            var isAsync = !!(node.flags & 256 /* Async */);
             // Arrow functions are never generators.
             //
             // If we're speculatively parsing a signature for a parenthesized arrow function, then
@@ -9999,7 +9246,7 @@ var ts;
                 // user meant to supply a block. For example, if the user wrote:
                 //
                 //  a =>
-                //      let v = 0;
+                //      const v = 0;
                 //  }
                 //
                 // they may be missing an open brace.  Check to see if that's the case so we can
@@ -10215,7 +9462,6 @@ var ts;
             var unaryOperator = token;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38 /* AsteriskAsteriskToken */) {
-                var diagnostic;
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 if (simpleUnaryExpression.kind === 171 /* TypeAssertionExpression */) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
@@ -10432,18 +9678,40 @@ var ts;
         }
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
+            var result;
             if (opening.kind === 235 /* JsxOpeningElement */) {
                 var node = createNode(233 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
-                return finishNode(node);
+                result = finishNode(node);
             }
             else {
                 ts.Debug.assert(opening.kind === 234 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
-                return opening;
+                result = opening;
             }
+            // If the user writes the invalid code '<div></div><div></div>' in an expression context (i.e. not wrapped in
+            // an enclosing tag), we'll naively try to parse   ^ this as a 'less than' operator and the remainder of the tag
+            // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX
+            // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter
+            // does less damage and we can report a better error.
+            // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios
+            // of one sort or another.
+            if (inExpressionContext && token === 25 /* LessThanToken */) {
+                var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
+                if (invalidElement) {
+                    parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
+                    var badNode = createNode(181 /* BinaryExpression */, result.pos);
+                    badNode.end = invalidElement.end;
+                    badNode.left = result;
+                    badNode.right = invalidElement;
+                    badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined);
+                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
+                    return badNode;
+                }
+            }
+            return result;
         }
         function parseJsxText() {
             var node = createNode(236 /* JsxText */, scanner.getStartPos());
@@ -10778,7 +10046,7 @@ var ts;
             var node = createNode(164 /* ArrayLiteralExpression */);
             parseExpected(19 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak())
-                node.flags |= 2048 /* MultiLine */;
+                node.flags |= 1024 /* MultiLine */;
             node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
             parseExpected(20 /* CloseBracketToken */);
             return finishNode(node);
@@ -10839,7 +10107,7 @@ var ts;
             var node = createNode(165 /* ObjectLiteralExpression */);
             parseExpected(15 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 2048 /* MultiLine */;
+                node.flags |= 1024 /* MultiLine */;
             }
             node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true);
             parseExpected(16 /* CloseBraceToken */);
@@ -10860,7 +10128,7 @@ var ts;
             parseExpected(87 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512 /* Async */);
+            var isAsync = !!(node.flags & 256 /* Async */);
             node.name =
                 isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
                     isGenerator ? doInYieldContext(parseOptionalIdentifier) :
@@ -11397,7 +10665,6 @@ var ts;
         }
         function parseObjectBindingElement() {
             var node = createNode(163 /* BindingElement */);
-            // TODO(andersh): Handle computed properties
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== 54 /* ColonToken */) {
@@ -11452,10 +10719,10 @@ var ts;
                 case 102 /* VarKeyword */:
                     break;
                 case 108 /* LetKeyword */:
-                    node.flags |= 16384 /* Let */;
+                    node.flags |= 8192 /* Let */;
                     break;
                 case 74 /* ConstKeyword */:
-                    node.flags |= 32768 /* Const */;
+                    node.flags |= 16384 /* Const */;
                     break;
                 default:
                     ts.Debug.fail();
@@ -11498,9 +10765,9 @@ var ts;
             setModifiers(node, modifiers);
             parseExpected(87 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-            node.name = node.flags & 1024 /* Default */ ? parseOptionalIdentifier() : parseIdentifier();
+            node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 512 /* Async */);
+            var isAsync = !!(node.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
@@ -11522,7 +10789,7 @@ var ts;
             method.name = name;
             method.questionToken = questionToken;
             var isGenerator = !!asteriskToken;
-            var isAsync = !!(method.flags & 512 /* Async */);
+            var isAsync = !!(method.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
             return finishNode(method);
@@ -11543,7 +10810,7 @@ var ts;
             //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initialiser_opt[In, ?Yield];
             //
             // The checker may still error in the static case to explicitly disallow the yield expression.
-            property.initializer = modifiers && modifiers.flags & 128 /* Static */
+            property.initializer = modifiers && modifiers.flags & 64 /* Static */
                 ? allowInAnd(parseNonParameterInitializer)
                 : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer);
             parseSemicolon();
@@ -11876,13 +11143,13 @@ var ts;
             var node = createNode(218 /* ModuleDeclaration */, fullStart);
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
-            var namespaceFlag = flags & 131072 /* Namespace */;
+            var namespaceFlag = flags & 65536 /* Namespace */;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21 /* DotToken */)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 1 /* Export */ | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
@@ -11897,7 +11164,7 @@ var ts;
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
             if (parseOptional(126 /* NamespaceKeyword */)) {
-                flags |= 131072 /* Namespace */;
+                flags |= 65536 /* Namespace */;
             }
             else {
                 parseExpected(125 /* ModuleKeyword */);
@@ -12155,7 +11422,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1 /* Export */
+                return node.flags & 2 /* Export */
                     || node.kind === 221 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 232 /* ExternalModuleReference */
                     || node.kind === 222 /* ImportDeclaration */
                     || node.kind === 227 /* ExportAssignment */
@@ -12220,7 +11487,7 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined);
+                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
                 var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -12315,6 +11582,7 @@ var ts;
                     case 103 /* VoidKeyword */:
                         return parseTokenNode();
                 }
+                // TODO (drosen): Parse string literal types in JSDoc as well.
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
@@ -12486,7 +11754,7 @@ var ts;
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined);
+                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
                 var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
@@ -12844,8 +12112,8 @@ var ts;
                 array._children = undefined;
                 array.pos += delta;
                 array.end += delta;
-                for (var _i = 0; _i < array.length; _i++) {
-                    var node = array[_i];
+                for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
+                    var node = array_7[_i];
                     visitNode(node);
                 }
             }
@@ -12982,8 +12250,8 @@ var ts;
                     array._children = undefined;
                     // Adjust the pos or end (or both) of the intersecting array accordingly.
                     adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    for (var _i = 0; _i < array.length; _i++) {
-                        var node = array[_i];
+                    for (var _i = 0, array_8 = array; _i < array_8.length; _i++) {
+                        var node = array_8[_i];
                         visitNode(node);
                     }
                     return;
@@ -13211,6 +12479,1372 @@ var ts;
         })(InvalidPosition || (InvalidPosition = {}));
     })(IncrementalParser || (IncrementalParser = {}));
 })(ts || (ts = {}));
+/// <reference path="utilities.ts"/>
+/// <reference path="parser.ts"/>
+/* @internal */
+var ts;
+(function (ts) {
+    ts.bindTime = 0;
+    (function (ModuleInstanceState) {
+        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
+        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
+        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
+    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
+    var ModuleInstanceState = ts.ModuleInstanceState;
+    var Reachability;
+    (function (Reachability) {
+        Reachability[Reachability["Unintialized"] = 1] = "Unintialized";
+        Reachability[Reachability["Reachable"] = 2] = "Reachable";
+        Reachability[Reachability["Unreachable"] = 4] = "Unreachable";
+        Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable";
+    })(Reachability || (Reachability = {}));
+    function or(state1, state2) {
+        return (state1 | state2) & 2 /* Reachable */
+            ? 2 /* Reachable */
+            : (state1 & state2) & 8 /* ReportedUnreachable */
+                ? 8 /* ReportedUnreachable */
+                : 4 /* Unreachable */;
+    }
+    function getModuleInstanceState(node) {
+        // A module is uninstantiated if it contains only
+        // 1. interface declarations, type alias declarations
+        if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) {
+            return 0 /* NonInstantiated */;
+        }
+        else if (ts.isConstEnumDeclaration(node)) {
+            return 2 /* ConstEnumOnly */;
+        }
+        else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) {
+            return 0 /* NonInstantiated */;
+        }
+        else if (node.kind === 219 /* ModuleBlock */) {
+            var state = 0 /* NonInstantiated */;
+            ts.forEachChild(node, function (n) {
+                switch (getModuleInstanceState(n)) {
+                    case 0 /* NonInstantiated */:
+                        // child is non-instantiated - continue searching
+                        return false;
+                    case 2 /* ConstEnumOnly */:
+                        // child is const enum only - record state and continue searching
+                        state = 2 /* ConstEnumOnly */;
+                        return false;
+                    case 1 /* Instantiated */:
+                        // child is instantiated - record state and stop
+                        state = 1 /* Instantiated */;
+                        return true;
+                }
+            });
+            return state;
+        }
+        else if (node.kind === 218 /* ModuleDeclaration */) {
+            return getModuleInstanceState(node.body);
+        }
+        else {
+            return 1 /* Instantiated */;
+        }
+    }
+    ts.getModuleInstanceState = getModuleInstanceState;
+    var ContainerFlags;
+    (function (ContainerFlags) {
+        // The current node is not a container, and no container manipulation should happen before
+        // recursing into it.
+        ContainerFlags[ContainerFlags["None"] = 0] = "None";
+        // The current node is a container.  It should be set as the current container (and block-
+        // container) before recursing into it.  The current node does not have locals.  Examples:
+        //
+        //      Classes, ObjectLiterals, TypeLiterals, Interfaces...
+        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
+        // The current node is a block-scoped-container.  It should be set as the current block-
+        // container before recursing into it.  Examples:
+        //
+        //      Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements...
+        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
+        ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals";
+        // If the current node is a container that also container that also contains locals.  Examples:
+        //
+        //      Functions, Methods, Modules, Source-files.
+        ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals";
+    })(ContainerFlags || (ContainerFlags = {}));
+    var binder = createBinder();
+    function bindSourceFile(file, options) {
+        var start = new Date().getTime();
+        binder(file, options);
+        ts.bindTime += new Date().getTime() - start;
+    }
+    ts.bindSourceFile = bindSourceFile;
+    function createBinder() {
+        var file;
+        var options;
+        var parent;
+        var container;
+        var blockScopeContainer;
+        var lastContainer;
+        var seenThisKeyword;
+        // state used by reachability checks
+        var hasExplicitReturn;
+        var currentReachabilityState;
+        var labelStack;
+        var labelIndexMap;
+        var implicitLabels;
+        // If this file is an external module, then it is automatically in strict-mode according to
+        // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
+        // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
+        var inStrictMode;
+        var symbolCount = 0;
+        var Symbol;
+        var classifiableNames;
+        function bindSourceFile(f, opts) {
+            file = f;
+            options = opts;
+            inStrictMode = !!file.externalModuleIndicator;
+            classifiableNames = {};
+            Symbol = ts.objectAllocator.getSymbolConstructor();
+            if (!file.locals) {
+                bind(file);
+                file.symbolCount = symbolCount;
+                file.classifiableNames = classifiableNames;
+            }
+            parent = undefined;
+            container = undefined;
+            blockScopeContainer = undefined;
+            lastContainer = undefined;
+            seenThisKeyword = false;
+            hasExplicitReturn = false;
+            labelStack = undefined;
+            labelIndexMap = undefined;
+            implicitLabels = undefined;
+        }
+        return bindSourceFile;
+        function createSymbol(flags, name) {
+            symbolCount++;
+            return new Symbol(flags, name);
+        }
+        function addDeclarationToSymbol(symbol, node, symbolFlags) {
+            symbol.flags |= symbolFlags;
+            node.symbol = symbol;
+            if (!symbol.declarations) {
+                symbol.declarations = [];
+            }
+            symbol.declarations.push(node);
+            if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) {
+                symbol.exports = {};
+            }
+            if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) {
+                symbol.members = {};
+            }
+            if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) {
+                symbol.valueDeclaration = node;
+            }
+        }
+        // Should not be called on a declaration with a computed property name,
+        // unless it is a well known Symbol.
+        function getDeclarationName(node) {
+            if (node.name) {
+                if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
+                    return "\"" + node.name.text + "\"";
+                }
+                if (node.name.kind === 136 /* ComputedPropertyName */) {
+                    var nameExpression = node.name.expression;
+                    // treat computed property names where expression is string/numeric literal as just string/numeric literal 
+                    if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
+                        return nameExpression.text;
+                    }
+                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
+                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
+                }
+                return node.name.text;
+            }
+            switch (node.kind) {
+                case 144 /* Constructor */:
+                    return "__constructor";
+                case 152 /* FunctionType */:
+                case 147 /* CallSignature */:
+                    return "__call";
+                case 153 /* ConstructorType */:
+                case 148 /* ConstructSignature */:
+                    return "__new";
+                case 149 /* IndexSignature */:
+                    return "__index";
+                case 228 /* ExportDeclaration */:
+                    return "__export";
+                case 227 /* ExportAssignment */:
+                    return node.isExportEquals ? "export=" : "default";
+                case 181 /* BinaryExpression */:
+                    // Binary expression case is for JS module 'module.exports = expr'
+                    return "export=";
+                case 213 /* FunctionDeclaration */:
+                case 214 /* ClassDeclaration */:
+                    return node.flags & 512 /* Default */ ? "default" : undefined;
+            }
+        }
+        function getDisplayName(node) {
+            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
+        }
+        /**
+         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
+         * @param symbolTable - The symbol table which node will be added to.
+         * @param parent - node's parent declaration.
+         * @param node - The declaration to be added to the symbol table
+         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
+         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations.
+         */
+        function declareSymbol(symbolTable, parent, node, includes, excludes) {
+            ts.Debug.assert(!ts.hasDynamicName(node));
+            var isDefaultExport = node.flags & 512 /* Default */;
+            // The exported symbol for an export default function/class node is always named "default"
+            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
+            var symbol;
+            if (name !== undefined) {
+                // Check and see if the symbol table already has a symbol with this name.  If not,
+                // create a new symbol with this name and add it to the table.  Note that we don't
+                // give the new symbol any flags *yet*.  This ensures that it will not conflict
+                // with the 'excludes' flags we pass in.
+                //
+                // If we do get an existing symbol, see if it conflicts with the new symbol we're
+                // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
+                // the same symbol table.  If we have a conflict, report the issue on each
+                // declaration we have for this symbol, and then create a new symbol for this
+                // declaration.
+                //
+                // If we created a new symbol, either because we didn't have a symbol with this name
+                // in the symbol table, or we conflicted with an existing symbol, then just add this
+                // node as the sole declaration of the new symbol.
+                //
+                // Otherwise, we'll be merging into a compatible existing symbol (for example when
+                // you have multiple 'vars' with the same name in the same container).  In this case
+                // just add this node into the declarations list of the symbol.
+                symbol = ts.hasProperty(symbolTable, name)
+                    ? symbolTable[name]
+                    : (symbolTable[name] = createSymbol(0 /* None */, name));
+                if (name && (includes & 788448 /* Classifiable */)) {
+                    classifiableNames[name] = name;
+                }
+                if (symbol.flags & excludes) {
+                    if (node.name) {
+                        node.name.parent = node;
+                    }
+                    // Report errors every position with duplicate declaration
+                    // Report errors on previous encountered declarations
+                    var message = symbol.flags & 2 /* BlockScopedVariable */
+                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
+                        : ts.Diagnostics.Duplicate_identifier_0;
+                    ts.forEach(symbol.declarations, function (declaration) {
+                        if (declaration.flags & 512 /* Default */) {
+                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                        }
+                    });
+                    ts.forEach(symbol.declarations, function (declaration) {
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                    });
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    symbol = createSymbol(0 /* None */, name);
+                }
+            }
+            else {
+                symbol = createSymbol(0 /* None */, "__missing");
+            }
+            addDeclarationToSymbol(symbol, node, includes);
+            symbol.parent = parent;
+            return symbol;
+        }
+        function declareModuleMember(node, symbolFlags, symbolExcludes) {
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2 /* Export */;
+            if (symbolFlags & 8388608 /* Alias */) {
+                if (node.kind === 230 /* ExportSpecifier */ || (node.kind === 221 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                }
+                else {
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+            else {
+                // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue,
+                // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set
+                // on it. There are 2 main reasons:
+                //
+                //   1. We treat locals and exports of the same name as mutually exclusive within a container.
+                //      That means the binder will issue a Duplicate Identifier error if you mix locals and exports
+                //      with the same name in the same container.
+                //      TODO: Make this a more specific error and decouple it from the exclusion logic.
+                //   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 & 131072 /* ExportContext */) {
+                    var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
+                        (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
+                        (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
+                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
+                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                    node.localSymbol = local;
+                    return local;
+                }
+                else {
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+        }
+        // All container nodes are kept on a linked list in declaration order. This list is used by
+        // the getLocalNameOfContainer function in the type checker to validate that the local name
+        // used for a container is unique.
+        function bindChildren(node) {
+            // Before we recurse into a node's chilren, we first save the existing parent, container
+            // and block-container.  Then after we pop out of processing the children, we restore
+            // these saved values.
+            var saveParent = parent;
+            var saveContainer = container;
+            var savedBlockScopeContainer = blockScopeContainer;
+            // This node will now be set as the parent of all of its children as we recurse into them.
+            parent = node;
+            // Depending on what kind of node this is, we may have to adjust the current container
+            // and block-container.   If the current node is a container, then it is automatically
+            // considered the current block-container as well.  Also, for containers that we know
+            // may contain locals, we proactively initialize the .locals field. We do this because
+            // it's highly likely that the .locals will be needed to place some child in (for example,
+            // a parameter, or variable declaration).
+            //
+            // However, we do not proactively create the .locals for block-containers because it's
+            // totally normal and common for block-containers to never actually have a block-scoped
+            // variable in them.  We don't want to end up allocating an object for every 'block' we
+            // run into when most of them won't be necessary.
+            //
+            // Finally, if this is a block-container, then we clear out any existing .locals object
+            // it may contain within it.  This happens in incremental scenarios.  Because we can be
+            // reusing a node from a previous compilation, that node may have had 'locals' created
+            // for it.  We must clear this so we don't accidently move any stale data forward from
+            // a previous compilation.
+            var containerFlags = getContainerFlags(node);
+            if (containerFlags & 1 /* IsContainer */) {
+                container = blockScopeContainer = node;
+                if (containerFlags & 4 /* HasLocals */) {
+                    container.locals = {};
+                }
+                addToContainerChain(container);
+            }
+            else if (containerFlags & 2 /* IsBlockScopedContainer */) {
+                blockScopeContainer = node;
+                blockScopeContainer.locals = undefined;
+            }
+            var savedReachabilityState;
+            var savedLabelStack;
+            var savedLabels;
+            var savedImplicitLabels;
+            var savedHasExplicitReturn;
+            var kind = node.kind;
+            var flags = node.flags;
+            // reset all reachability check related flags on node (for incremental scenarios)
+            flags &= ~1572864 /* ReachabilityCheckFlags */;
+            if (kind === 215 /* InterfaceDeclaration */) {
+                seenThisKeyword = false;
+            }
+            var saveState = kind === 248 /* SourceFile */ || kind === 219 /* ModuleBlock */ || ts.isFunctionLikeKind(kind);
+            if (saveState) {
+                savedReachabilityState = currentReachabilityState;
+                savedLabelStack = labelStack;
+                savedLabels = labelIndexMap;
+                savedImplicitLabels = implicitLabels;
+                savedHasExplicitReturn = hasExplicitReturn;
+                currentReachabilityState = 2 /* Reachable */;
+                hasExplicitReturn = false;
+                labelStack = labelIndexMap = implicitLabels = undefined;
+            }
+            bindReachableStatement(node);
+            if (currentReachabilityState === 2 /* Reachable */ && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
+                flags |= 524288 /* HasImplicitReturn */;
+                if (hasExplicitReturn) {
+                    flags |= 1048576 /* HasExplicitReturn */;
+                }
+            }
+            if (kind === 215 /* InterfaceDeclaration */) {
+                flags = seenThisKeyword ? flags | 262144 /* ContainsThis */ : flags & ~262144 /* ContainsThis */;
+            }
+            node.flags = flags;
+            if (saveState) {
+                hasExplicitReturn = savedHasExplicitReturn;
+                currentReachabilityState = savedReachabilityState;
+                labelStack = savedLabelStack;
+                labelIndexMap = savedLabels;
+                implicitLabels = savedImplicitLabels;
+            }
+            container = saveContainer;
+            parent = saveParent;
+            blockScopeContainer = savedBlockScopeContainer;
+        }
+        /**
+         * Returns true if node and its subnodes were successfully traversed.
+         * Returning false means that node was not examined and caller needs to dive into the node himself.
+         */
+        function bindReachableStatement(node) {
+            if (checkUnreachable(node)) {
+                ts.forEachChild(node, bind);
+                return;
+            }
+            switch (node.kind) {
+                case 198 /* WhileStatement */:
+                    bindWhileStatement(node);
+                    break;
+                case 197 /* DoStatement */:
+                    bindDoStatement(node);
+                    break;
+                case 199 /* ForStatement */:
+                    bindForStatement(node);
+                    break;
+                case 200 /* ForInStatement */:
+                case 201 /* ForOfStatement */:
+                    bindForInOrForOfStatement(node);
+                    break;
+                case 196 /* IfStatement */:
+                    bindIfStatement(node);
+                    break;
+                case 204 /* ReturnStatement */:
+                case 208 /* ThrowStatement */:
+                    bindReturnOrThrow(node);
+                    break;
+                case 203 /* BreakStatement */:
+                case 202 /* ContinueStatement */:
+                    bindBreakOrContinueStatement(node);
+                    break;
+                case 209 /* TryStatement */:
+                    bindTryStatement(node);
+                    break;
+                case 206 /* SwitchStatement */:
+                    bindSwitchStatement(node);
+                    break;
+                case 220 /* CaseBlock */:
+                    bindCaseBlock(node);
+                    break;
+                case 207 /* LabeledStatement */:
+                    bindLabeledStatement(node);
+                    break;
+                default:
+                    ts.forEachChild(node, bind);
+                    break;
+            }
+        }
+        function bindWhileStatement(n) {
+            var preWhileState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            var postWhileState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            // bind expressions (don't affect reachability)
+            bind(n.expression);
+            currentReachabilityState = preWhileState;
+            var postWhileLabel = pushImplicitLabel();
+            bind(n.statement);
+            popImplicitLabel(postWhileLabel, postWhileState);
+        }
+        function bindDoStatement(n) {
+            var preDoState = currentReachabilityState;
+            var postDoLabel = pushImplicitLabel();
+            bind(n.statement);
+            var postDoState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : preDoState;
+            popImplicitLabel(postDoLabel, postDoState);
+            // bind expressions (don't affect reachability)
+            bind(n.expression);
+        }
+        function bindForStatement(n) {
+            var preForState = currentReachabilityState;
+            var postForLabel = pushImplicitLabel();
+            // bind expressions (don't affect reachability)
+            bind(n.initializer);
+            bind(n.condition);
+            bind(n.incrementor);
+            bind(n.statement);
+            // for statement is considered infinite when it condition is either omitted or is true keyword
+            // - for(..;;..)
+            // - for(..;true;..)
+            var isInfiniteLoop = (!n.condition || n.condition.kind === 99 /* TrueKeyword */);
+            var postForState = isInfiniteLoop ? 4 /* Unreachable */ : preForState;
+            popImplicitLabel(postForLabel, postForState);
+        }
+        function bindForInOrForOfStatement(n) {
+            var preStatementState = currentReachabilityState;
+            var postStatementLabel = pushImplicitLabel();
+            // bind expressions (don't affect reachability)
+            bind(n.initializer);
+            bind(n.expression);
+            bind(n.statement);
+            popImplicitLabel(postStatementLabel, preStatementState);
+        }
+        function bindIfStatement(n) {
+            // denotes reachability state when entering 'thenStatement' part of the if statement: 
+            // i.e. if condition is false then thenStatement is unreachable
+            var ifTrueState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            // denotes reachability state when entering 'elseStatement':
+            // i.e. if condition is true then elseStatement is unreachable
+            var ifFalseState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState;
+            currentReachabilityState = ifTrueState;
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            bind(n.thenStatement);
+            if (n.elseStatement) {
+                var preElseState = currentReachabilityState;
+                currentReachabilityState = ifFalseState;
+                bind(n.elseStatement);
+                currentReachabilityState = or(currentReachabilityState, preElseState);
+            }
+            else {
+                currentReachabilityState = or(currentReachabilityState, ifFalseState);
+            }
+        }
+        function bindReturnOrThrow(n) {
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            if (n.kind === 204 /* ReturnStatement */) {
+                hasExplicitReturn = true;
+            }
+            currentReachabilityState = 4 /* Unreachable */;
+        }
+        function bindBreakOrContinueStatement(n) {
+            // call bind on label (don't affect reachability)
+            bind(n.label);
+            // for continue case touch label so it will be marked a used
+            var isValidJump = jumpToLabel(n.label, n.kind === 203 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */);
+            if (isValidJump) {
+                currentReachabilityState = 4 /* Unreachable */;
+            }
+        }
+        function bindTryStatement(n) {
+            // catch\finally blocks has the same reachability as try block
+            var preTryState = currentReachabilityState;
+            bind(n.tryBlock);
+            var postTryState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.catchClause);
+            var postCatchState = currentReachabilityState;
+            currentReachabilityState = preTryState;
+            bind(n.finallyBlock);
+            // post catch/finally state is reachable if
+            // - post try state is reachable - control flow can fall out of try block
+            // - post catch state is reachable - control flow can fall out of catch block
+            currentReachabilityState = or(postTryState, postCatchState);
+        }
+        function bindSwitchStatement(n) {
+            var preSwitchState = currentReachabilityState;
+            var postSwitchLabel = pushImplicitLabel();
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            bind(n.caseBlock);
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242 /* DefaultClause */; });
+            // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case
+            var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState;
+            popImplicitLabel(postSwitchLabel, postSwitchState);
+        }
+        function bindCaseBlock(n) {
+            var startState = currentReachabilityState;
+            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
+                var clause = _a[_i];
+                currentReachabilityState = startState;
+                bind(clause);
+                if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) {
+                    errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
+                }
+            }
+        }
+        function bindLabeledStatement(n) {
+            // call bind on label (don't affect reachability)
+            bind(n.label);
+            var ok = pushNamedLabel(n.label);
+            bind(n.statement);
+            if (ok) {
+                popNamedLabel(n.label, currentReachabilityState);
+            }
+        }
+        function getContainerFlags(node) {
+            switch (node.kind) {
+                case 186 /* ClassExpression */:
+                case 214 /* ClassDeclaration */:
+                case 215 /* InterfaceDeclaration */:
+                case 217 /* EnumDeclaration */:
+                case 155 /* TypeLiteral */:
+                case 165 /* ObjectLiteralExpression */:
+                    return 1 /* IsContainer */;
+                case 147 /* CallSignature */:
+                case 148 /* ConstructSignature */:
+                case 149 /* IndexSignature */:
+                case 143 /* MethodDeclaration */:
+                case 142 /* MethodSignature */:
+                case 213 /* FunctionDeclaration */:
+                case 144 /* Constructor */:
+                case 145 /* GetAccessor */:
+                case 146 /* SetAccessor */:
+                case 152 /* FunctionType */:
+                case 153 /* ConstructorType */:
+                case 173 /* FunctionExpression */:
+                case 174 /* ArrowFunction */:
+                case 218 /* ModuleDeclaration */:
+                case 248 /* SourceFile */:
+                case 216 /* TypeAliasDeclaration */:
+                    return 5 /* IsContainerWithLocals */;
+                case 244 /* CatchClause */:
+                case 199 /* ForStatement */:
+                case 200 /* ForInStatement */:
+                case 201 /* ForOfStatement */:
+                case 220 /* CaseBlock */:
+                    return 2 /* IsBlockScopedContainer */;
+                case 192 /* Block */:
+                    // do not treat blocks directly inside a function as a block-scoped-container.
+                    // Locals that reside in this block should go to the function locals. Othewise 'x'
+                    // would not appear to be a redeclaration of a block scoped local in the following
+                    // example:
+                    //
+                    //      function foo() {
+                    //          var x;
+                    //          let x;
+                    //      }
+                    //
+                    // If we placed 'var x' into the function locals and 'let x' into the locals of
+                    // the block, then there would be no collision.
+                    //
+                    // By not creating a new block-scoped-container here, we ensure that both 'var x'
+                    // and 'let x' go into the Function-container's locals, and we do get a collision
+                    // conflict.
+                    return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */;
+            }
+            return 0 /* None */;
+        }
+        function addToContainerChain(next) {
+            if (lastContainer) {
+                lastContainer.nextContainer = next;
+            }
+            lastContainer = next;
+        }
+        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
+            // Just call this directly so that the return type of this function stays "void".
+            declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
+        }
+        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
+            switch (container.kind) {
+                // Modules, source files, and classes need specialized handling for how their
+                // members are declared (for example, a member of a class will go into a specific
+                // symbol table depending on if it is static or not). We defer to specialized
+                // handlers to take care of declaring these child members.
+                case 218 /* ModuleDeclaration */:
+                    return declareModuleMember(node, symbolFlags, symbolExcludes);
+                case 248 /* SourceFile */:
+                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
+                case 186 /* ClassExpression */:
+                case 214 /* ClassDeclaration */:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 217 /* EnumDeclaration */:
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                case 155 /* TypeLiteral */:
+                case 165 /* ObjectLiteralExpression */:
+                case 215 /* InterfaceDeclaration */:
+                    // Interface/Object-types always have their children added to the 'members' of
+                    // their container. They are only accessible through an instance of their
+                    // container, and are never in scope otherwise (even inside the body of the
+                    // object / type / interface declaring them). An exception is type parameters,
+                    // which are in scope without qualification (similar to 'locals').
+                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+                case 152 /* FunctionType */:
+                case 153 /* ConstructorType */:
+                case 147 /* CallSignature */:
+                case 148 /* ConstructSignature */:
+                case 149 /* IndexSignature */:
+                case 143 /* MethodDeclaration */:
+                case 142 /* MethodSignature */:
+                case 144 /* Constructor */:
+                case 145 /* GetAccessor */:
+                case 146 /* SetAccessor */:
+                case 213 /* FunctionDeclaration */:
+                case 173 /* FunctionExpression */:
+                case 174 /* ArrowFunction */:
+                case 216 /* TypeAliasDeclaration */:
+                    // All the children of these container types are never visible through another
+                    // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
+                    // they're only accessed 'lexically' (i.e. from code that exists underneath
+                    // their container in the tree.  To accomplish this, we simply add their declared
+                    // symbol to the 'locals' of the container.  These symbols can then be found as
+                    // the type checker walks up the containers, checking them for matching names.
+                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function declareClassMember(node, symbolFlags, symbolExcludes) {
+            return node.flags & 64 /* Static */
+                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
+                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+        }
+        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
+            return ts.isExternalModule(file)
+                ? declareModuleMember(node, symbolFlags, symbolExcludes)
+                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
+        }
+        function hasExportDeclarations(node) {
+            var body = node.kind === 248 /* SourceFile */ ? node : node.body;
+            if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) {
+                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
+                    var stat = _a[_i];
+                    if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function setExportContextFlag(node) {
+            // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
+            // declarations with export modifiers) is an export context in which declarations are implicitly exported.
+            if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
+                node.flags |= 131072 /* ExportContext */;
+            }
+            else {
+                node.flags &= ~131072 /* ExportContext */;
+            }
+        }
+        function bindModuleDeclaration(node) {
+            setExportContextFlag(node);
+            if (node.name.kind === 9 /* StringLiteral */) {
+                declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+            }
+            else {
+                var state = getModuleInstanceState(node);
+                if (state === 0 /* NonInstantiated */) {
+                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+                    if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) {
+                        // if module was already merged with some function, class or non-const enum
+                        // treat is a non-const-enum-only
+                        node.symbol.constEnumOnlyModule = false;
+                    }
+                    else {
+                        var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */;
+                        if (node.symbol.constEnumOnlyModule === undefined) {
+                            // non-merged case - use the current state
+                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
+                        }
+                        else {
+                            // merged case: module is const enum only if all its pieces are non-instantiated or const enum
+                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
+                        }
+                    }
+                }
+            }
+        }
+        function bindFunctionOrConstructorType(node) {
+            // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
+            // to the one we would get for: { <...>(...): T }
+            //
+            // We do that by making an anonymous type literal symbol, and then setting the function
+            // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable
+            // from an actual type literal symbol you would have gotten had you used the long form.
+            var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node));
+            addDeclarationToSymbol(symbol, node, 131072 /* Signature */);
+            var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type");
+            addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */);
+            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
+            var _a;
+        }
+        function bindObjectLiteralExpression(node) {
+            var ElementKind;
+            (function (ElementKind) {
+                ElementKind[ElementKind["Property"] = 1] = "Property";
+                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
+            })(ElementKind || (ElementKind = {}));
+            if (inStrictMode) {
+                var seen = {};
+                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (prop.name.kind !== 69 /* Identifier */) {
+                        continue;
+                    }
+                    var identifier = prop.name;
+                    // ECMA-262 11.1.5 Object Initialiser
+                    // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+                    // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
+                    // IsDataDescriptor(propId.descriptor) is true.
+                    //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
+                    //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
+                    //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
+                    // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
+                    var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */
+                        ? 1 /* Property */
+                        : 2 /* Accessor */;
+                    var existingKind = seen[identifier.text];
+                    if (!existingKind) {
+                        seen[identifier.text] = currentKind;
+                        continue;
+                    }
+                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
+                        var span = ts.getErrorSpanForNode(file, identifier);
+                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
+                    }
+                }
+            }
+            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object");
+        }
+        function bindAnonymousDeclaration(node, symbolFlags, name) {
+            var symbol = createSymbol(symbolFlags, name);
+            addDeclarationToSymbol(symbol, node, symbolFlags);
+        }
+        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
+            switch (blockScopeContainer.kind) {
+                case 218 /* ModuleDeclaration */:
+                    declareModuleMember(node, symbolFlags, symbolExcludes);
+                    break;
+                case 248 /* SourceFile */:
+                    if (ts.isExternalModule(container)) {
+                        declareModuleMember(node, symbolFlags, symbolExcludes);
+                        break;
+                    }
+                // fall through.
+                default:
+                    if (!blockScopeContainer.locals) {
+                        blockScopeContainer.locals = {};
+                        addToContainerChain(blockScopeContainer);
+                    }
+                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function bindBlockScopedVariableDeclaration(node) {
+            bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */);
+        }
+        // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized
+        // check for reserved words used as identifiers in strict mode code.
+        function checkStrictModeIdentifier(node) {
+            if (inStrictMode &&
+                node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 114 /* LastFutureReservedWord */ &&
+                !ts.isIdentifierName(node)) {
+                // Report error only if there are no parse errors in file
+                if (!file.parseDiagnostics.length) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
+                }
+            }
+        }
+        function getStrictModeIdentifierMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
+        }
+        function checkStrictModeBinaryExpression(node) {
+            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
+                // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
+                // Assignment operator(11.13) or of a PostfixExpression(11.3)
+                checkStrictModeEvalOrArguments(node, node.left);
+            }
+        }
+        function checkStrictModeCatchClause(node) {
+            // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the
+            // Catch production is eval or arguments
+            if (inStrictMode && node.variableDeclaration) {
+                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
+            }
+        }
+        function checkStrictModeDeleteExpression(node) {
+            // Grammar checking
+            if (inStrictMode && node.expression.kind === 69 /* Identifier */) {
+                // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
+                // UnaryExpression is a direct reference to a variable, function argument, or function name
+                var span = ts.getErrorSpanForNode(file, node.expression);
+                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
+            }
+        }
+        function isEvalOrArgumentsIdentifier(node) {
+            return node.kind === 69 /* Identifier */ &&
+                (node.text === "eval" || node.text === "arguments");
+        }
+        function checkStrictModeEvalOrArguments(contextNode, name) {
+            if (name && name.kind === 69 /* Identifier */) {
+                var identifier = name;
+                if (isEvalOrArgumentsIdentifier(identifier)) {
+                    // We check first if the name is inside class declaration or class expression; if so give explicit message
+                    // otherwise report generic error message.
+                    var span = ts.getErrorSpanForNode(file, name);
+                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
+                }
+            }
+        }
+        function getStrictModeEvalOrArgumentsMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
+        }
+        function checkStrictModeFunctionName(node) {
+            if (inStrictMode) {
+                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1))
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+        }
+        function checkStrictModeNumericLiteral(node) {
+            if (inStrictMode && node.flags & 32768 /* OctalLiteral */) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
+            }
+        }
+        function checkStrictModePostfixUnaryExpression(node) {
+            // Grammar checking
+            // The identifier eval or arguments may not appear as the LeftHandSideExpression of an
+            // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression
+            // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.operand);
+            }
+        }
+        function checkStrictModePrefixUnaryExpression(node) {
+            // Grammar checking
+            if (inStrictMode) {
+                if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) {
+                    checkStrictModeEvalOrArguments(node, node.operand);
+                }
+            }
+        }
+        function checkStrictModeWithStatement(node) {
+            // Grammar checking for withStatement
+            if (inStrictMode) {
+                errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
+            }
+        }
+        function errorOnFirstToken(node, message, arg0, arg1, arg2) {
+            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
+            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
+        }
+        function getDestructuringParameterName(node) {
+            return "__" + ts.indexOf(node.parent.parameters, node);
+        }
+        function bind(node) {
+            if (!node) {
+                return;
+            }
+            node.parent = parent;
+            var savedInStrictMode = inStrictMode;
+            if (!savedInStrictMode) {
+                updateStrictMode(node);
+            }
+            // First we bind declaration nodes to a symbol if possible.  We'll both create a symbol
+            // and then potentially add the symbol to an appropriate symbol table. Possible
+            // destination symbol tables are:
+            //
+            //  1) The 'exports' table of the current container's symbol.
+            //  2) The 'members' table of the current container's symbol.
+            //  3) The 'locals' table of the current container.
+            //
+            // However, not all symbols will end up in any of these tables.  'Anonymous' symbols
+            // (like TypeLiterals for example) will not be put in any table.
+            bindWorker(node);
+            // Then we recurse into the children of the node to bind them as well.  For certain
+            // symbols we do specialized work when we recurse.  For example, we'll keep track of
+            // the current 'container' node when it changes.  This helps us know which symbol table
+            // a local should go into for example.
+            bindChildren(node);
+            inStrictMode = savedInStrictMode;
+        }
+        function updateStrictMode(node) {
+            switch (node.kind) {
+                case 248 /* SourceFile */:
+                case 219 /* ModuleBlock */:
+                    updateStrictModeStatementList(node.statements);
+                    return;
+                case 192 /* Block */:
+                    if (ts.isFunctionLike(node.parent)) {
+                        updateStrictModeStatementList(node.statements);
+                    }
+                    return;
+                case 214 /* ClassDeclaration */:
+                case 186 /* ClassExpression */:
+                    // All classes are automatically in strict mode in ES6.
+                    inStrictMode = true;
+                    return;
+            }
+        }
+        function updateStrictModeStatementList(statements) {
+            for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) {
+                var statement = statements_1[_i];
+                if (!ts.isPrologueDirective(statement)) {
+                    return;
+                }
+                if (isUseStrictPrologueDirective(statement)) {
+                    inStrictMode = true;
+                    return;
+                }
+            }
+        }
+        /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
+        function isUseStrictPrologueDirective(node) {
+            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
+            // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
+            // string to contain unicode escapes (as per ES5).
+            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+        }
+        function bindWorker(node) {
+            switch (node.kind) {
+                /* Strict mode checks */
+                case 69 /* Identifier */:
+                    return checkStrictModeIdentifier(node);
+                case 181 /* BinaryExpression */:
+                    if (ts.isInJavaScriptFile(node)) {
+                        if (ts.isExportsPropertyAssignment(node)) {
+                            bindExportsPropertyAssignment(node);
+                        }
+                        else if (ts.isModuleExportsAssignment(node)) {
+                            bindModuleExportsAssignment(node);
+                        }
+                    }
+                    return checkStrictModeBinaryExpression(node);
+                case 244 /* CatchClause */:
+                    return checkStrictModeCatchClause(node);
+                case 175 /* DeleteExpression */:
+                    return checkStrictModeDeleteExpression(node);
+                case 8 /* NumericLiteral */:
+                    return checkStrictModeNumericLiteral(node);
+                case 180 /* PostfixUnaryExpression */:
+                    return checkStrictModePostfixUnaryExpression(node);
+                case 179 /* PrefixUnaryExpression */:
+                    return checkStrictModePrefixUnaryExpression(node);
+                case 205 /* WithStatement */:
+                    return checkStrictModeWithStatement(node);
+                case 97 /* ThisKeyword */:
+                    seenThisKeyword = true;
+                    return;
+                case 137 /* TypeParameter */:
+                    return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
+                case 138 /* Parameter */:
+                    return bindParameter(node);
+                case 211 /* VariableDeclaration */:
+                case 163 /* BindingElement */:
+                    return bindVariableDeclarationOrBindingElement(node);
+                case 141 /* PropertyDeclaration */:
+                case 140 /* PropertySignature */:
+                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */);
+                case 245 /* PropertyAssignment */:
+                case 246 /* ShorthandPropertyAssignment */:
+                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */);
+                case 247 /* EnumMember */:
+                    return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
+                case 147 /* CallSignature */:
+                case 148 /* ConstructSignature */:
+                case 149 /* IndexSignature */:
+                    return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
+                case 143 /* MethodDeclaration */:
+                case 142 /* MethodSignature */:
+                    // If this is an ObjectLiteralExpression method, then it sits in the same space
+                    // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
+                    // so that it will conflict with any other object literal members with the same
+                    // name.
+                    return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
+                case 213 /* FunctionDeclaration */:
+                    checkStrictModeFunctionName(node);
+                    return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */);
+                case 144 /* Constructor */:
+                    return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
+                case 145 /* GetAccessor */:
+                    return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
+                case 146 /* SetAccessor */:
+                    return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
+                case 152 /* FunctionType */:
+                case 153 /* ConstructorType */:
+                    return bindFunctionOrConstructorType(node);
+                case 155 /* TypeLiteral */:
+                    return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
+                case 165 /* ObjectLiteralExpression */:
+                    return bindObjectLiteralExpression(node);
+                case 173 /* FunctionExpression */:
+                case 174 /* ArrowFunction */:
+                    checkStrictModeFunctionName(node);
+                    var bindingName = node.name ? node.name.text : "__function";
+                    return bindAnonymousDeclaration(node, 16 /* Function */, bindingName);
+                case 168 /* CallExpression */:
+                    if (ts.isInJavaScriptFile(node)) {
+                        bindCallExpression(node);
+                    }
+                    break;
+                // Members of classes, interfaces, and modules
+                case 186 /* ClassExpression */:
+                case 214 /* ClassDeclaration */:
+                    return bindClassLikeDeclaration(node);
+                case 215 /* InterfaceDeclaration */:
+                    return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
+                case 216 /* TypeAliasDeclaration */:
+                    return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
+                case 217 /* EnumDeclaration */:
+                    return bindEnumDeclaration(node);
+                case 218 /* ModuleDeclaration */:
+                    return bindModuleDeclaration(node);
+                // Imports and exports
+                case 221 /* ImportEqualsDeclaration */:
+                case 224 /* NamespaceImport */:
+                case 226 /* ImportSpecifier */:
+                case 230 /* ExportSpecifier */:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
+                case 223 /* ImportClause */:
+                    return bindImportClause(node);
+                case 228 /* ExportDeclaration */:
+                    return bindExportDeclaration(node);
+                case 227 /* ExportAssignment */:
+                    return bindExportAssignment(node);
+                case 248 /* SourceFile */:
+                    return bindSourceFileIfExternalModule();
+            }
+        }
+        function bindSourceFileIfExternalModule() {
+            setExportContextFlag(file);
+            if (ts.isExternalModule(file)) {
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindSourceFileAsExternalModule() {
+            bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+        }
+        function bindExportAssignment(node) {
+            var boundExpression = node.kind === 227 /* ExportAssignment */ ? node.expression : node.right;
+            if (!container.symbol || !container.symbol.exports) {
+                // Export assignment in some sort of block construct
+                bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
+            }
+            else if (boundExpression.kind === 69 /* Identifier */) {
+                // An export default clause with an identifier exports all meanings of that identifier
+                declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
+            }
+            else {
+                // An export default clause with an expression exports a value
+                declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
+            }
+        }
+        function bindExportDeclaration(node) {
+            if (!container.symbol || !container.symbol.exports) {
+                // Export * in some sort of block construct
+                bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node));
+            }
+            else if (!node.exportClause) {
+                // All export * declarations are collected in an __export symbol
+                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */);
+            }
+        }
+        function bindImportClause(node) {
+            if (node.name) {
+                declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
+            }
+        }
+        function setCommonJsModuleIndicator(node) {
+            if (!file.commonJsModuleIndicator) {
+                file.commonJsModuleIndicator = node;
+                bindSourceFileAsExternalModule();
+            }
+        }
+        function bindExportsPropertyAssignment(node) {
+            // When we create a property via 'exports.foo = bar', the 'exports.foo' property access
+            // expression is the declaration
+            setCommonJsModuleIndicator(node);
+            declareSymbol(file.symbol.exports, file.symbol, node.left, 4 /* Property */ | 7340032 /* Export */, 0 /* None */);
+        }
+        function bindModuleExportsAssignment(node) {
+            // 'module.exports = expr' assignment
+            setCommonJsModuleIndicator(node);
+            bindExportAssignment(node);
+        }
+        function bindCallExpression(node) {
+            // We're only inspecting call expressions to detect CommonJS modules, so we can skip
+            // this check if we've already seen the module indicator
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+                setCommonJsModuleIndicator(node);
+            }
+        }
+        function bindClassLikeDeclaration(node) {
+            if (node.kind === 214 /* ClassDeclaration */) {
+                bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
+            }
+            else {
+                var bindingName = node.name ? node.name.text : "__class";
+                bindAnonymousDeclaration(node, 32 /* Class */, bindingName);
+                // Add name of class expression into the map for semantic classifier
+                if (node.name) {
+                    classifiableNames[node.name.text] = node.name.text;
+                }
+            }
+            var symbol = node.symbol;
+            // TypeScript 1.0 spec (April 2014): 8.4
+            // Every class automatically contains a static property member named 'prototype', the
+            // type of which is an instantiation of the class type with type Any supplied as a type
+            // argument for each type parameter. It is an error to explicitly declare a static
+            // property member with the name 'prototype'.
+            //
+            // Note: we check for this here because this class may be merging into a module.  The
+            // module might have an exported variable called 'prototype'.  We can't allow that as
+            // that would clash with the built-in 'prototype' for the class.
+            var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype");
+            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
+                if (node.name) {
+                    node.name.parent = node;
+                }
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
+            }
+            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
+            prototypeSymbol.parent = symbol;
+        }
+        function bindEnumDeclaration(node) {
+            return ts.isConst(node)
+                ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */)
+                : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */);
+        }
+        function bindVariableDeclarationOrBindingElement(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (!ts.isBindingPattern(node.name)) {
+                if (ts.isBlockOrCatchScoped(node)) {
+                    bindBlockScopedVariableDeclaration(node);
+                }
+                else if (ts.isParameterDeclaration(node)) {
+                    // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration
+                    // because its parent chain has already been set up, since parents are set before descending into children.
+                    //
+                    // If node is a binding element in parameter declaration, we need to use ParameterExcludes.
+                    // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration
+                    // For example:
+                    //      function foo([a,a]) {} // Duplicate Identifier error
+                    //      function bar(a,a) {}   // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter
+                    //                             // which correctly set excluded symbols
+                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */);
+                }
+            }
+        }
+        function bindParameter(node) {
+            if (inStrictMode) {
+                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
+                // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (ts.isBindingPattern(node.name)) {
+                bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node));
+            }
+            else {
+                declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
+            }
+            // If this is a property-parameter, then also declare the property symbol into the
+            // containing class.
+            if (node.flags & 56 /* AccessibilityModifier */ &&
+                node.parent.kind === 144 /* Constructor */ &&
+                ts.isClassLike(node.parent.parent)) {
+                var classDeclaration = node.parent.parent;
+                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */);
+            }
+        }
+        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
+            return ts.hasDynamicName(node)
+                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
+                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
+        }
+        // reachability checks
+        function pushNamedLabel(name) {
+            initializeReachabilityStateIfNecessary();
+            if (ts.hasProperty(labelIndexMap, name.text)) {
+                return false;
+            }
+            labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1;
+            return true;
+        }
+        function pushImplicitLabel() {
+            initializeReachabilityStateIfNecessary();
+            var index = labelStack.push(1 /* Unintialized */) - 1;
+            implicitLabels.push(index);
+            return index;
+        }
+        function popNamedLabel(label, outerState) {
+            var index = labelIndexMap[label.text];
+            ts.Debug.assert(index !== undefined);
+            ts.Debug.assert(labelStack.length == index + 1);
+            labelIndexMap[label.text] = undefined;
+            setCurrentStateAtLabel(labelStack.pop(), outerState, label);
+        }
+        function popImplicitLabel(implicitLabelIndex, outerState) {
+            if (labelStack.length !== implicitLabelIndex + 1) {
+                ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex);
+            }
+            var i = implicitLabels.pop();
+            if (implicitLabelIndex !== i) {
+                ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex);
+            }
+            setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined);
+        }
+        function setCurrentStateAtLabel(innerMergedState, outerState, label) {
+            if (innerMergedState === 1 /* Unintialized */) {
+                if (label && !options.allowUnusedLabels) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label));
+                }
+                currentReachabilityState = outerState;
+            }
+            else {
+                currentReachabilityState = or(innerMergedState, outerState);
+            }
+        }
+        function jumpToLabel(label, outerState) {
+            initializeReachabilityStateIfNecessary();
+            var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels);
+            if (index === undefined) {
+                // reference to unknown label or
+                // break/continue used outside of loops
+                return false;
+            }
+            var stateAtLabel = labelStack[index];
+            labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState);
+            return true;
+        }
+        function checkUnreachable(node) {
+            switch (currentReachabilityState) {
+                case 4 /* Unreachable */:
+                    var reportError = 
+                    // report error on all statements except empty ones
+                    (ts.isStatement(node) && node.kind !== 194 /* EmptyStatement */) ||
+                        // report error on class declarations
+                        node.kind === 214 /* ClassDeclaration */ ||
+                        // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
+                        (node.kind === 218 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
+                        // report error on regular enums and const enums if preserveConstEnums is set
+                        (node.kind === 217 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    if (reportError) {
+                        currentReachabilityState = 8 /* ReportedUnreachable */;
+                        // unreachable code is reported if
+                        // - user has explicitly asked about it AND
+                        // - statement is in not ambient context (statements in ambient context is already an error 
+                        //   so we should not report extras) AND
+                        //   - node is not variable statement OR
+                        //   - node is block scoped variable statement OR
+                        //   - node is not block scoped variable statement and at least one variable declaration has initializer
+                        //   Rationale: we don't want to report errors on non-initialized var's since they are hoisted
+                        //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
+                        var reportUnreachableCode = !options.allowUnreachableCode &&
+                            !ts.isInAmbientContext(node) &&
+                            (node.kind !== 193 /* VariableStatement */ ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ ||
+                                ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
+                        if (reportUnreachableCode) {
+                            errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
+                        }
+                    }
+                case 8 /* ReportedUnreachable */:
+                    return true;
+                default:
+                    return false;
+            }
+            function shouldReportErrorOnModuleDeclaration(node) {
+                var instanceState = getModuleInstanceState(node);
+                return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums);
+            }
+        }
+        function initializeReachabilityStateIfNecessary() {
+            if (labelIndexMap) {
+                return;
+            }
+            currentReachabilityState = 2 /* Reachable */;
+            labelIndexMap = {};
+            labelStack = [];
+            implicitLabels = [];
+        }
+    }
+})(ts || (ts = {}));
 /// <reference path="binder.ts"/>
 /* @internal */
 var ts;
@@ -13284,7 +13918,7 @@ var ts;
             symbolToString: symbolToString,
             getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
             getRootSymbols: getRootSymbols,
-            getContextualType: getContextualType,
+            getContextualType: getApparentTypeOfContextualType,
             getFullyQualifiedName: getFullyQualifiedName,
             getResolvedSignature: getResolvedSignature,
             getConstantValue: getConstantValue,
@@ -13350,6 +13984,7 @@ var ts;
         var getInstantiatedGlobalPromiseLikeType;
         var getGlobalPromiseConstructorLikeType;
         var getGlobalThenableType;
+        var jsxElementClassType;
         var tupleTypes = {};
         var unionTypes = {};
         var intersectionTypes = {};
@@ -13553,7 +14188,7 @@ var ts;
             return ts.getAncestor(node, 248 /* SourceFile */);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 248 /* SourceFile */ && !ts.isExternalModule(node);
+            return node.kind === 248 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -13619,7 +14254,7 @@ var ts;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
                         current.parent.kind === 141 /* PropertyDeclaration */ &&
-                        (current.parent.flags & 128 /* Static */) === 0 &&
+                        (current.parent.flags & 64 /* Static */) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -13655,15 +14290,24 @@ var ts;
                 }
                 switch (location.kind) {
                     case 248 /* SourceFile */:
-                        if (!ts.isExternalModule(location))
+                        if (!ts.isExternalOrCommonJsModule(location))
                             break;
                     case 218 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
                         if (location.kind === 248 /* SourceFile */ ||
                             (location.kind === 218 /* ModuleDeclaration */ && location.name.kind === 9 /* StringLiteral */)) {
-                            // It's an external module. Because of module/namespace merging, a module's exports are in scope,
-                            // yet we never want to treat an export specifier as putting a member in scope. Therefore,
-                            // if the name we find is purely an export specifier, it is not actually considered in scope.
+                            // It's an external module. First see if the module has an export default and if the local
+                            // name of that export default matches.
+                            if (result = moduleExports["default"]) {
+                                var localSymbol = ts.getLocalSymbolForExportDefault(result);
+                                if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
+                                    break loop;
+                                }
+                                result = undefined;
+                            }
+                            // Because of module/namespace merging, a module's exports are in scope,
+                            // yet we never want to treat an export specifier as putting a member in scope. 
+                            // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope.
                             // Two things to note about this:
                             //     1. We have to check this without calling getSymbol. The problem with calling getSymbol
                             //        on an export specifier is that it might find the export specifier itself, and try to
@@ -13677,12 +14321,6 @@ var ts;
                                 ts.getDeclarationOfKind(moduleExports[name], 230 /* ExportSpecifier */)) {
                                 break;
                             }
-                            result = moduleExports["default"];
-                            var localSymbol = ts.getLocalSymbolForExportDefault(result);
-                            if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) {
-                                break loop;
-                            }
-                            result = undefined;
                         }
                         if (result = getSymbol(moduleExports, name, meaning & 8914931 /* ModuleMember */)) {
                             break loop;
@@ -13701,7 +14339,7 @@ var ts;
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !(location.flags & 128 /* Static */)) {
+                        if (ts.isClassLike(location.parent) && !(location.flags & 64 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455 /* Value */)) {
@@ -13715,7 +14353,7 @@ var ts;
                     case 186 /* ClassExpression */:
                     case 215 /* InterfaceDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056 /* Type */)) {
-                            if (lastLocation && lastLocation.flags & 128 /* Static */) {
+                            if (lastLocation && lastLocation.flags & 64 /* Static */) {
                                 // TypeScript 1.0 spec (April 2014): 3.4.1
                                 // The scope of a type parameter extends over the entire declaration with which the type
                                 // parameter list is associated, with the exception of static member declarations in classes.
@@ -13825,7 +14463,7 @@ var ts;
                 //          declare module foo {
                 //              interface bar {}
                 //          }
-                //      let foo/*1*/: foo/*2*/.bar;
+                //      const foo/*1*/: foo/*2*/.bar;
                 // The foo at /*1*/ and /*2*/ will share same symbol with two meaning
                 // block - scope variable and namespace module. However, only when we
                 // try to resolve name in /*1*/ which is used in variable position,
@@ -14129,6 +14767,9 @@ var ts;
             if (moduleName === undefined) {
                 return;
             }
+            if (moduleName.indexOf("!") >= 0) {
+                moduleName = moduleName.substr(0, moduleName.indexOf("!"));
+            }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
                 var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */);
@@ -14243,8 +14884,8 @@ var ts;
         }
         function findConstructorDeclaration(node) {
             var members = node.members;
-            for (var _i = 0; _i < members.length; _i++) {
-                var member = members[_i];
+            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                var member = members_1[_i];
                 if (member.kind === 144 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
@@ -14316,7 +14957,7 @@ var ts;
                 }
                 switch (location_1.kind) {
                     case 248 /* SourceFile */:
-                        if (!ts.isExternalModule(location_1)) {
+                        if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
                     case 218 /* ModuleDeclaration */:
@@ -14438,7 +15079,7 @@ var ts;
                     //     export class c {
                     //     }
                     // }
-                    // let x: typeof m.c
+                    // const x: typeof m.c
                     // In the above example when we start with checking if typeof m.c symbol is accessible,
                     // we are going to see if c can be accessed in scope directly.
                     // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible
@@ -14477,7 +15118,7 @@ var ts;
         }
         function hasExternalModuleSymbol(declaration) {
             return (declaration.kind === 218 /* ModuleDeclaration */ && declaration.name.kind === 9 /* StringLiteral */) ||
-                (declaration.kind === 248 /* SourceFile */ && ts.isExternalModule(declaration));
+                (declaration.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -14491,7 +15132,7 @@ var ts;
                     // because these kind of aliases can be used to name types in declaration file
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 1 /* Export */) &&
+                        !(anyImportSyntax.flags & 2 /* Export */) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -14628,7 +15269,7 @@ var ts;
                     parentSymbol = symbol;
                     appendSymbolNameOnly(symbol, writer);
                 }
-                // Let the writer know we just wrote out a symbol.  The declaration emitter writer uses
+                // const the writer know we just wrote out a symbol.  The declaration emitter writer uses
                 // this to determine if an import it has previously seen (and not written out) needs
                 // to be written to the file once the walk of the tree is complete.
                 //
@@ -14645,8 +15286,8 @@ var ts;
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
-                            for (var _i = 0; _i < accessibleSymbolChain.length; _i++) {
-                                var accessibleSymbol = accessibleSymbolChain[_i];
+                            for (var _i = 0, accessibleSymbolChain_1 = accessibleSymbolChain; _i < accessibleSymbolChain_1.length; _i++) {
+                                var accessibleSymbol = accessibleSymbolChain_1[_i];
                                 appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
                             }
                         }
@@ -14709,7 +15350,7 @@ var ts;
                         writeAnonymousType(type, flags);
                     }
                     else if (type.flags & 256 /* StringLiteral */) {
-                        writer.writeStringLiteral(type.text);
+                        writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\"");
                     }
                     else {
                         // Should never get here
@@ -14836,7 +15477,7 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */ &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 128 /* Static */; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64 /* Static */; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
@@ -14947,8 +15588,8 @@ var ts;
                         var t = getTypeOfSymbol(p);
                         if (p.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(t).length) {
                             var signatures = getSignaturesOfType(t, 0 /* Call */);
-                            for (var _f = 0; _f < signatures.length; _f++) {
-                                var signature = signatures[_f];
+                            for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
+                                var signature = signatures_1[_f];
                                 buildSymbolDisplay(p, writer);
                                 if (p.flags & 536870912 /* Optional */) {
                                     writePunctuation(writer, 53 /* QuestionToken */);
@@ -15096,7 +15737,7 @@ var ts;
                         }
                     }
                     else if (node.kind === 248 /* SourceFile */) {
-                        return ts.isExternalModule(node) ? node : undefined;
+                        return ts.isExternalOrCommonJsModule(node) ? node : undefined;
                     }
                 }
                 ts.Debug.fail("getContainingModule cant reach here");
@@ -15162,7 +15803,7 @@ var ts;
                     case 221 /* ImportEqualsDeclaration */:
                         var parent_4 = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
-                        if (!(ts.getCombinedNodeFlags(node) & 1 /* Export */) &&
+                        if (!(ts.getCombinedNodeFlags(node) & 2 /* Export */) &&
                             !(node.kind !== 221 /* ImportEqualsDeclaration */ && parent_4.kind !== 248 /* SourceFile */ && ts.isInAmbientContext(parent_4))) {
                             return isGlobalSourceFile(parent_4);
                         }
@@ -15174,11 +15815,11 @@ var ts;
                     case 146 /* SetAccessor */:
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
-                        if (node.flags & (32 /* Private */ | 64 /* Protected */)) {
+                        if (node.flags & (16 /* Private */ | 32 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
-                    // Public properties/methods are visible if its parents are visible, so let it fall into next case statement
+                    // Public properties/methods are visible if its parents are visible, so const it fall into next case statement
                     case 144 /* Constructor */:
                     case 148 /* ConstructSignature */:
                     case 147 /* CallSignature */:
@@ -15206,7 +15847,7 @@ var ts;
                     // Source file is always visible
                     case 248 /* SourceFile */:
                         return true;
-                    // Export assignements do not create name bindings outside the module
+                    // Export assignments do not create name bindings outside the module
                     case 227 /* ExportAssignment */:
                         return false;
                     default:
@@ -15342,6 +15983,23 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node);
         }
+        function getTextOfPropertyName(name) {
+            switch (name.kind) {
+                case 69 /* Identifier */:
+                    return name.text;
+                case 9 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                    return name.text;
+                case 136 /* ComputedPropertyName */:
+                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
+                        return name.expression.text;
+                    }
+            }
+            return undefined;
+        }
+        function isComputedNonLiteralName(name) {
+            return name.kind === 136 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
         // Return the inferred type for a binding element
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -15363,10 +16021,15 @@ var ts;
             if (pattern.kind === 161 /* ObjectBindingPattern */) {
                 // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
                 var name_10 = declaration.propertyName || declaration.name;
+                if (isComputedNonLiteralName(name_10)) {
+                    // computed properties with non-literal names are treated as 'any'
+                    return anyType;
+                }
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
-                type = getTypeOfPropertyOfType(parentType, name_10.text) ||
-                    isNumericLiteralName(name_10.text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
+                var text = getTextOfPropertyName(name_10);
+                type = getTypeOfPropertyOfType(parentType, text) ||
+                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
                     getIndexTypeOfType(parentType, 0 /* String */);
                 if (!type) {
                     error(name_10, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_10));
@@ -15466,10 +16129,17 @@ var ts;
         // Return the type implied by an object binding pattern
         function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
             var members = {};
+            var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
-                var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
                 var name = e.propertyName || e.name;
-                var symbol = createSymbol(flags, name.text);
+                if (isComputedNonLiteralName(name)) {
+                    // do not include computed properties in the implied type
+                    hasComputedProperties = true;
+                    return;
+                }
+                var text = getTextOfPropertyName(name);
+                var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
+                var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType);
                 symbol.bindingElement = e;
                 members[symbol.name] = symbol;
@@ -15478,6 +16148,9 @@ var ts;
             if (includePatternInType) {
                 result.pattern = pattern;
             }
+            if (hasComputedProperties) {
+                result.flags |= 67108864 /* ObjectLiteralPatternWithComputedProperties */;
+            }
             return result;
         }
         // Return the type implied by an array binding pattern
@@ -15554,6 +16227,14 @@ var ts;
                 if (declaration.kind === 227 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
+                // Handle module.exports = expr
+                if (declaration.kind === 181 /* BinaryExpression */) {
+                    return links.type = checkExpression(declaration.right);
+                }
+                // Handle exports.p = expr
+                if (declaration.kind === 166 /* PropertyAccessExpression */) {
+                    return checkExpressionCached(declaration.parent.right);
+                }
                 // Handle variable, parameter or property
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
                     return unknownType;
@@ -15704,8 +16385,8 @@ var ts;
         // The function allocates a new array if the input type parameter set is undefined, but otherwise it modifies the set
         // in-place and returns the same array.
         function appendTypeParameters(typeParameters, declarations) {
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
+                var declaration = declarations_2[_i];
                 var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
                 if (!typeParameters) {
                     typeParameters = [tp];
@@ -15811,39 +16492,46 @@ var ts;
             }
             return type.resolvedBaseConstructorType;
         }
+        function hasClassBaseType(type) {
+            return !!ts.forEach(getBaseTypes(type), function (t) { return !!(t.symbol.flags & 32 /* Class */); });
+        }
         function getBaseTypes(type) {
+            var isClass = type.symbol.flags & 32 /* Class */;
+            var isInterface = type.symbol.flags & 64 /* Interface */;
             if (!type.resolvedBaseTypes) {
-                if (type.symbol.flags & 32 /* Class */) {
+                if (!isClass && !isInterface) {
+                    ts.Debug.fail("type must be class or interface");
+                }
+                if (isClass) {
                     resolveBaseTypesOfClass(type);
                 }
-                else if (type.symbol.flags & 64 /* Interface */) {
+                if (isInterface) {
                     resolveBaseTypesOfInterface(type);
                 }
-                else {
-                    ts.Debug.fail("type must be class or interface");
-                }
             }
             return type.resolvedBaseTypes;
         }
         function resolveBaseTypesOfClass(type) {
-            type.resolvedBaseTypes = emptyArray;
-            var baseContructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseContructorType.flags & 80896 /* ObjectType */)) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
+            var baseConstructorType = getBaseConstructorTypeOfClass(type);
+            if (!(baseConstructorType.flags & 80896 /* ObjectType */)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
             var baseType;
-            if (baseContructorType.symbol && baseContructorType.symbol.flags & 32 /* Class */) {
-                // When base constructor type is a class we know that the constructors all have the same type parameters as the
+            var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined;
+            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 /* Class */ &&
+                areAllOuterTypeParametersApplied(originalBaseType)) {
+                // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the
                 // class and all return the instance type of the class. There is no need for further checks and we can apply the
                 // type arguments in the same manner as a type reference to get the same error reporting experience.
-                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol);
+                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol);
             }
             else {
                 // The class derives from a "class-like" constructor function, check that we have at least one construct signature
                 // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere
                 // we check that all instantiated signatures return the same type.
-                var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments);
+                var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments);
                 if (!constructors.length) {
                     error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
                     return;
@@ -15861,10 +16549,26 @@ var ts;
                 error(type.symbol.valueDeclaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */));
                 return;
             }
-            type.resolvedBaseTypes = [baseType];
+            if (type.resolvedBaseTypes === emptyArray) {
+                type.resolvedBaseTypes = [baseType];
+            }
+            else {
+                type.resolvedBaseTypes.push(baseType);
+            }
+        }
+        function areAllOuterTypeParametersApplied(type) {
+            // An unapplied type parameter has its symbol still the same as the matching argument symbol.
+            // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked.
+            var outerTypeParameters = type.outerTypeParameters;
+            if (outerTypeParameters) {
+                var last = outerTypeParameters.length - 1;
+                var typeArguments = type.typeArguments;
+                return outerTypeParameters[last].symbol !== typeArguments[last].symbol;
+            }
+            return true;
         }
         function resolveBaseTypesOfInterface(type) {
-            type.resolvedBaseTypes = [];
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
@@ -15874,7 +16578,12 @@ var ts;
                         if (baseType !== unknownType) {
                             if (getTargetType(baseType).flags & (1024 /* Class */ | 2048 /* Interface */)) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
-                                    type.resolvedBaseTypes.push(baseType);
+                                    if (type.resolvedBaseTypes === emptyArray) {
+                                        type.resolvedBaseTypes = [baseType];
+                                    }
+                                    else {
+                                        type.resolvedBaseTypes.push(baseType);
+                                    }
                                 }
                                 else {
                                     error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */));
@@ -15895,13 +16604,13 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
                 if (declaration.kind === 215 /* InterfaceDeclaration */) {
-                    if (declaration.flags & 524288 /* ContainsThis */) {
+                    if (declaration.flags & 262144 /* ContainsThis */) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
                     if (baseTypeNodes) {
-                        for (var _b = 0; _b < baseTypeNodes.length; _b++) {
-                            var node = baseTypeNodes[_b];
+                        for (var _b = 0, baseTypeNodes_1 = baseTypeNodes; _b < baseTypeNodes_1.length; _b++) {
+                            var node = baseTypeNodes_1[_b];
                             if (ts.isSupportedExpressionWithTypeArguments(node)) {
                                 var baseSymbol = resolveEntityName(node.expression, 793056 /* Type */, /*ignoreErrors*/ true);
                                 if (!baseSymbol || !(baseSymbol.flags & 64 /* Interface */) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
@@ -15937,7 +16646,7 @@ var ts;
                     type.typeArguments = type.typeParameters;
                     type.thisType = createType(512 /* TypeParameter */ | 33554432 /* ThisType */);
                     type.thisType.symbol = symbol;
-                    type.thisType.constraint = getTypeWithThisArgument(type);
+                    type.thisType.constraint = type;
                 }
             }
             return links.declaredType;
@@ -16091,8 +16800,8 @@ var ts;
         }
         function createSymbolTable(symbols) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                var symbol = symbols_1[_i];
                 result[symbol.name] = symbol;
             }
             return result;
@@ -16101,15 +16810,15 @@ var ts;
         // we check symbols to see if we can quickly conclude they are free of "this" references, thus needing no instantiation.
         function createInstantiatedSymbolTable(symbols, mapper, mappingThisOnly) {
             var result = {};
-            for (var _i = 0; _i < symbols.length; _i++) {
-                var symbol = symbols[_i];
+            for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                var symbol = symbols_2[_i];
                 result[symbol.name] = mappingThisOnly && isIndependentMember(symbol) ? symbol : instantiateSymbol(symbol, mapper);
             }
             return result;
         }
         function addInheritedMembers(symbols, baseSymbols) {
-            for (var _i = 0; _i < baseSymbols.length; _i++) {
-                var s = baseSymbols[_i];
+            for (var _i = 0, baseSymbols_1 = baseSymbols; _i < baseSymbols_1.length; _i++) {
+                var s = baseSymbols_1[_i];
                 if (!ts.hasProperty(symbols, s.name)) {
                     symbols[s.name] = s;
                 }
@@ -16117,8 +16826,8 @@ var ts;
         }
         function addInheritedSignatures(signatures, baseSignatures) {
             if (baseSignatures) {
-                for (var _i = 0; _i < baseSignatures.length; _i++) {
-                    var signature = baseSignatures[_i];
+                for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
+                    var signature = baseSignatures_1[_i];
                     signatures.push(signature);
                 }
             }
@@ -16161,8 +16870,8 @@ var ts;
                     members = createSymbolTable(source.declaredProperties);
                 }
                 var thisArgument = ts.lastOrUndefined(typeArguments);
-                for (var _i = 0; _i < baseTypes.length; _i++) {
-                    var baseType = baseTypes[_i];
+                for (var _i = 0, baseTypes_1 = baseTypes; _i < baseTypes_1.length; _i++) {
+                    var baseType = baseTypes_1[_i];
                     var instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
@@ -16199,7 +16908,7 @@ var ts;
             return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
-            if (!getBaseTypes(classType).length) {
+            if (!hasClassBaseType(classType)) {
                 return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
@@ -16208,8 +16917,8 @@ var ts;
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
-            for (var _i = 0; _i < baseSignatures.length; _i++) {
-                var baseSig = baseSignatures[_i];
+            for (var _i = 0, baseSignatures_2 = baseSignatures; _i < baseSignatures_2.length; _i++) {
+                var baseSig = baseSignatures_2[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
                     var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
@@ -16238,8 +16947,8 @@ var ts;
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
         }
         function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
-            for (var _i = 0; _i < signatureList.length; _i++) {
-                var s = signatureList[_i];
+            for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
+                var s = signatureList_1[_i];
                 if (compareSignatures(s, signature, partialMatch, ignoreReturnTypes, compareTypes)) {
                     return s;
                 }
@@ -16303,8 +17012,8 @@ var ts;
         }
         function getUnionIndexType(types, kind) {
             var indexTypes = [];
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
+                var type = types_1[_i];
                 var indexType = getIndexTypeOfType(type, kind);
                 if (!indexType) {
                     return undefined;
@@ -16452,6 +17161,20 @@ var ts;
             type = getApparentType(type);
             return type.flags & 49152 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
         }
+        /**
+         * The apparent type of a type parameter is the base constraint instantiated with the type parameter
+         * as the type argument for the 'this' type.
+         */
+        function getApparentTypeOfTypeParameter(type) {
+            if (!type.resolvedApparentType) {
+                var constraintType = getConstraintOfTypeParameter(type);
+                while (constraintType && constraintType.flags & 512 /* TypeParameter */) {
+                    constraintType = getConstraintOfTypeParameter(constraintType);
+                }
+                type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type);
+            }
+            return type.resolvedApparentType;
+        }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
@@ -16459,12 +17182,7 @@ var ts;
          */
         function getApparentType(type) {
             if (type.flags & 512 /* TypeParameter */) {
-                do {
-                    type = getConstraintOfTypeParameter(type);
-                } while (type && type.flags & 512 /* TypeParameter */);
-                if (!type) {
-                    type = emptyObjectType;
-                }
+                type = getApparentTypeOfTypeParameter(type);
             }
             if (type.flags & 258 /* StringLike */) {
                 type = globalStringType;
@@ -16483,12 +17201,12 @@ var ts;
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
+                var current = types_2[_i];
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (32 /* Private */ | 64 /* Protected */))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 /* Private */ | 32 /* Protected */))) {
                         if (!props) {
                             props = [prop];
                         }
@@ -16510,8 +17228,8 @@ var ts;
             }
             var propTypes = [];
             var declarations = [];
-            for (var _a = 0; _a < props.length; _a++) {
-                var prop = props[_a];
+            for (var _a = 0, props_1 = props; _a < props_1.length; _a++) {
+                var prop = props_1[_a];
                 if (prop.declarations) {
                     ts.addRange(declarations, prop.declarations);
                 }
@@ -16629,7 +17347,7 @@ var ts;
             if (node.initializer) {
                 var signatureDeclaration = node.parent;
                 var signature = getSignatureFromDeclaration(signatureDeclaration);
-                var parameterIndex = signatureDeclaration.parameters.indexOf(node);
+                var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
                 ts.Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
@@ -16638,7 +17356,9 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 144 /* Constructor */ ? getDeclaredTypeOfClassOrInterface(declaration.parent.symbol) : undefined;
+                var classType = declaration.kind === 144 /* Constructor */ ?
+                    getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
+                    : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
@@ -16728,6 +17448,16 @@ var ts;
             }
             return result;
         }
+        function resolveExternalModuleTypeByLiteral(name) {
+            var moduleSym = resolveExternalModuleName(name, name);
+            if (moduleSym) {
+                var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                if (resolvedModuleSymbol) {
+                    return getTypeOfSymbol(resolvedModuleSymbol);
+                }
+            }
+            return anyType;
+        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -16867,8 +17597,8 @@ var ts;
         // that care about the presence of such types at arbitrary depth in a containing type.
         function getPropagatingFlagsOfTypes(types) {
             var result = 0;
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
+                var type = types_3[_i];
                 result |= type.flags;
             }
             return result & 14680064 /* PropagatingFlags */;
@@ -17018,8 +17748,8 @@ var ts;
         function getTypeOfGlobalSymbol(symbol, arity) {
             function getTypeDeclaration(symbol) {
                 var declarations = symbol.declarations;
-                for (var _i = 0; _i < declarations.length; _i++) {
-                    var declaration = declarations[_i];
+                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                    var declaration = declarations_3[_i];
                     switch (declaration.kind) {
                         case 214 /* ClassDeclaration */:
                         case 215 /* InterfaceDeclaration */:
@@ -17129,8 +17859,8 @@ var ts;
         // Add the given types to the given type set. Order is preserved, duplicates are removed,
         // and nested types of the given kind are flattened into the set.
         function addTypesToSet(typeSet, types, typeSetKind) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
+                var type = types_4[_i];
                 addTypeToSet(typeSet, type, typeSetKind);
             }
         }
@@ -17152,8 +17882,8 @@ var ts;
             }
         }
         function containsTypeAny(types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var type = types_5[_i];
                 if (isTypeAny(type)) {
                     return true;
                 }
@@ -17251,11 +17981,12 @@ var ts;
             return links.resolvedType;
         }
         function getStringLiteralType(node) {
-            if (ts.hasProperty(stringLiteralTypes, node.text)) {
-                return stringLiteralTypes[node.text];
+            var text = node.text;
+            if (ts.hasProperty(stringLiteralTypes, text)) {
+                return stringLiteralTypes[text];
             }
-            var type = stringLiteralTypes[node.text] = createType(256 /* StringLiteral */);
-            type.text = ts.getTextOfNode(node);
+            var type = stringLiteralTypes[text] = createType(256 /* StringLiteral */);
+            type.text = text;
             return type;
         }
         function getTypeFromStringLiteral(node) {
@@ -17269,7 +18000,8 @@ var ts;
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
             if (parent && (ts.isClassLike(parent) || parent.kind === 215 /* InterfaceDeclaration */)) {
-                if (!(container.flags & 128 /* Static */)) {
+                if (!(container.flags & 64 /* Static */) &&
+                    (container.kind !== 144 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -17336,8 +18068,8 @@ var ts;
         function instantiateList(items, mapper, instantiator) {
             if (items && items.length) {
                 var result = [];
-                for (var _i = 0; _i < items.length; _i++) {
-                    var v = items[_i];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var v = items_1[_i];
                     result.push(instantiator(v, mapper));
                 }
                 return result;
@@ -17376,8 +18108,8 @@ var ts;
                 case 2: return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
-                for (var _i = 0; _i < sources.length; _i++) {
-                    var source = sources[_i];
+                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
+                    var source = sources_1[_i];
                     if (t === source) {
                         return anyType;
                     }
@@ -17717,7 +18449,7 @@ var ts;
                     if (apparentType.flags & (80896 /* ObjectType */ | 32768 /* Intersection */) && target.flags & 80896 /* ObjectType */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                        if (result = objectTypeRelatedTo(apparentType, target, reportStructuralErrors)) {
+                        if (result = objectTypeRelatedTo(apparentType, source, target, reportStructuralErrors)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
@@ -17737,7 +18469,7 @@ var ts;
                             return result;
                         }
                     }
-                    return objectTypeRelatedTo(source, target, /*reportErrors*/ false);
+                    return objectTypeRelatedTo(source, source, target, /*reportErrors*/ false);
                 }
                 if (source.flags & 512 /* TypeParameter */ && target.flags & 512 /* TypeParameter */) {
                     return typeParameterIdenticalTo(source, target);
@@ -17763,39 +18495,40 @@ var ts;
                         resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
                         return true;
                     }
-                    return false;
                 }
-                if (type.flags & 49152 /* UnionOrIntersection */) {
+                else if (type.flags & 49152 /* UnionOrIntersection */) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
                     }
-                    return false;
                 }
-                return true;
+                return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (!isKnownProperty(target, prop.name)) {
-                        if (reportErrors) {
-                            // We know *exactly* where things went wrong when comparing the types.
-                            // Use this property as the error node as this will be more helpful in
-                            // reasoning about what went wrong.
-                            errorNode = prop.valueDeclaration;
-                            reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && someConstituentTypeHasKind(target, 80896 /* ObjectType */)) {
+                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        if (!isKnownProperty(target, prop.name)) {
+                            if (reportErrors) {
+                                // We know *exactly* where things went wrong when comparing the types.
+                                // Use this property as the error node as this will be more helpful in
+                                // reasoning about what went wrong.
+                                errorNode = prop.valueDeclaration;
+                                reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
+                            }
+                            return true;
                         }
-                        return true;
                     }
                 }
+                return false;
             }
             function eachTypeRelatedToSomeType(source, target) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
+                    var sourceType = sourceTypes_1[_i];
                     var related = typeRelatedToSomeType(sourceType, target, false);
                     if (!related) {
                         return 0 /* False */;
@@ -17817,8 +18550,8 @@ var ts;
             function typeRelatedToEachType(source, target, reportErrors) {
                 var result = -1 /* True */;
                 var targetTypes = target.types;
-                for (var _i = 0; _i < targetTypes.length; _i++) {
-                    var targetType = targetTypes[_i];
+                for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
+                    var targetType = targetTypes_1[_i];
                     var related = isRelatedTo(source, targetType, reportErrors);
                     if (!related) {
                         return 0 /* False */;
@@ -17840,8 +18573,8 @@ var ts;
             function eachTypeRelatedToType(source, target, reportErrors) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
-                for (var _i = 0; _i < sourceTypes.length; _i++) {
-                    var sourceType = sourceTypes[_i];
+                for (var _i = 0, sourceTypes_2 = sourceTypes; _i < sourceTypes_2.length; _i++) {
+                    var sourceType = sourceTypes_2[_i];
                     var related = isRelatedTo(sourceType, target, reportErrors);
                     if (!related) {
                         return 0 /* False */;
@@ -17867,9 +18600,6 @@ var ts;
                 return result;
             }
             function typeParameterIdenticalTo(source, target) {
-                if (source.symbol.name !== target.symbol.name) {
-                    return 0 /* False */;
-                }
                 // covers case when both type parameters does not have constraint (both equal to noConstraintType)
                 if (source.constraint === target.constraint) {
                     return -1 /* True */;
@@ -17884,11 +18614,11 @@ var ts;
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
             // equal and infinitely expanding. Fourth, if we have reached a depth of 100 nested comparisons, assume we have runaway recursion
             // and issue an error. Otherwise, actually compare the structure of the two types.
-            function objectTypeRelatedTo(source, target, reportErrors) {
+            function objectTypeRelatedTo(apparentSource, originalSource, target, reportErrors) {
                 if (overflow) {
                     return 0 /* False */;
                 }
-                var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
+                var id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     // If we computed this relation already and it was failed and reported, or if we're not being asked to elaborate
@@ -17915,13 +18645,13 @@ var ts;
                     maybeStack = [];
                     expandingFlags = 0;
                 }
-                sourceStack[depth] = source;
+                sourceStack[depth] = apparentSource;
                 targetStack[depth] = target;
                 maybeStack[depth] = {};
                 maybeStack[depth][id] = 1 /* Succeeded */;
                 depth++;
                 var saveExpandingFlags = expandingFlags;
-                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack, depth))
+                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(apparentSource, sourceStack, depth))
                     expandingFlags |= 1;
                 if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth))
                     expandingFlags |= 2;
@@ -17930,15 +18660,15 @@ var ts;
                     result = 1 /* Maybe */;
                 }
                 else {
-                    result = propertiesRelatedTo(source, target, reportErrors);
+                    result = propertiesRelatedTo(apparentSource, target, reportErrors);
                     if (result) {
-                        result &= signaturesRelatedTo(source, target, 0 /* Call */, reportErrors);
+                        result &= signaturesRelatedTo(apparentSource, target, 0 /* Call */, reportErrors);
                         if (result) {
-                            result &= signaturesRelatedTo(source, target, 1 /* Construct */, reportErrors);
+                            result &= signaturesRelatedTo(apparentSource, target, 1 /* Construct */, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, target, reportErrors);
+                                result &= stringIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, target, reportErrors);
+                                    result &= numberIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors);
                                 }
                             }
                         }
@@ -17966,8 +18696,8 @@ var ts;
                 var result = -1 /* True */;
                 var properties = getPropertiesOfObjectType(target);
                 var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 524288 /* ObjectLiteral */);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
+                    var targetProp = properties_1[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -17981,20 +18711,20 @@ var ts;
                         else if (!(targetProp.flags & 134217728 /* Prototype */)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 32 /* Private */ || targetPropFlags & 32 /* Private */) {
+                            if (sourcePropFlags & 16 /* Private */ || targetPropFlags & 16 /* Private */) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 32 /* Private */ && targetPropFlags & 32 /* Private */) {
+                                        if (sourcePropFlags & 16 /* Private */ && targetPropFlags & 16 /* Private */) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 32 /* Private */ ? source : target), typeToString(sourcePropFlags & 32 /* Private */ ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 /* Private */ ? source : target), typeToString(sourcePropFlags & 16 /* Private */ ? target : source));
                                         }
                                     }
                                     return 0 /* False */;
                                 }
                             }
-                            else if (targetPropFlags & 64 /* Protected */) {
+                            else if (targetPropFlags & 32 /* Protected */) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32 /* Class */;
                                 var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
                                 var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
@@ -18005,7 +18735,7 @@ var ts;
                                     return 0 /* False */;
                                 }
                             }
-                            else if (sourcePropFlags & 64 /* Protected */) {
+                            else if (sourcePropFlags & 32 /* Protected */) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -18047,8 +18777,8 @@ var ts;
                     return 0 /* False */;
                 }
                 var result = -1 /* True */;
-                for (var _i = 0; _i < sourceProperties.length; _i++) {
-                    var sourceProp = sourceProperties[_i];
+                for (var _i = 0, sourceProperties_1 = sourceProperties; _i < sourceProperties_1.length; _i++) {
+                    var sourceProp = sourceProperties_1[_i];
                     var targetProp = getPropertyOfObjectType(target, sourceProp.name);
                     if (!targetProp) {
                         return 0 /* False */;
@@ -18088,13 +18818,13 @@ var ts;
                         return result;
                     }
                 }
-                outer: for (var _i = 0; _i < targetSignatures.length; _i++) {
-                    var t = targetSignatures[_i];
+                outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
+                    var t = targetSignatures_1[_i];
                     if (!t.hasStringLiterals || target.flags & 262144 /* FromSignature */) {
                         var localErrors = reportErrors;
                         var checkedAbstractAssignability = false;
-                        for (var _a = 0; _a < sourceSignatures.length; _a++) {
-                            var s = sourceSignatures[_a];
+                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                            var s = sourceSignatures_1[_a];
                             if (!s.hasStringLiterals || source.flags & 262144 /* FromSignature */) {
                                 var related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
@@ -18125,8 +18855,8 @@ var ts;
                         var targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
                         var sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol);
                         var targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol);
-                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 256 /* Abstract */;
-                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 256 /* Abstract */;
+                        var sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & 128 /* Abstract */;
+                        var targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & 128 /* Abstract */;
                         if (sourceIsAbstract && !(targetIsAbstract && targetDecl)) {
                             // if target isn't a class-declaration type, then it can be new'd, so we forbid the assignment.
                             if (reportErrors) {
@@ -18235,12 +18965,17 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, target, reportErrors) {
+            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(0 /* String */, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 0 /* String */);
-                if (targetType && !(targetType.flags & 1 /* Any */)) {
+                if (targetType) {
+                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
+                        // non-primitive assignment to any is always allowed, eg
+                        //   `var x: { [index: string]: any } = { property: 12 };`
+                        return -1 /* True */;
+                    }
                     var sourceType = getIndexTypeOfType(source, 0 /* String */);
                     if (!sourceType) {
                         if (reportErrors) {
@@ -18259,12 +18994,17 @@ var ts;
                 }
                 return -1 /* True */;
             }
-            function numberIndexTypesRelatedTo(source, target, reportErrors) {
+            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(1 /* Number */, source, target);
                 }
                 var targetType = getIndexTypeOfType(target, 1 /* Number */);
-                if (targetType && !(targetType.flags & 1 /* Any */)) {
+                if (targetType) {
+                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
+                        // non-primitive assignment to any is always allowed, eg
+                        //   `var x: { [index: number]: any } = { property: 12 };`
+                        return -1 /* True */;
+                    }
                     var sourceStringType = getIndexTypeOfType(source, 0 /* String */);
                     var sourceNumberType = getIndexTypeOfType(source, 1 /* Number */);
                     if (!(sourceStringType || sourceNumberType)) {
@@ -18334,8 +19074,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1 /* True */;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (32 /* Private */ | 64 /* Protected */);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (32 /* Private */ | 64 /* Protected */);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 /* Private */ | 32 /* Protected */);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 /* Private */ | 32 /* Protected */);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0 /* False */;
             }
@@ -18351,18 +19091,29 @@ var ts;
             }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
+        function isMatchingSignature(source, target, partialMatch) {
+            // A source signature matches a target signature if the two signatures have the same number of required,
+            // optional, and rest parameters.
+            if (source.parameters.length === target.parameters.length &&
+                source.minArgumentCount === target.minArgumentCount &&
+                source.hasRestParameter === target.hasRestParameter) {
+                return true;
+            }
+            // A source signature partially matches a target signature if the target signature has no fewer required
+            // parameters and no more overall parameters than the source signature (where a signature with a rest
+            // parameter is always considered to have more overall parameters than one without).
+            if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter ||
+                source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) {
+                return true;
+            }
+            return false;
+        }
         function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
             if (source === target) {
                 return -1 /* True */;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
-                if (!partialMatch ||
-                    source.parameters.length < target.parameters.length && !source.hasRestParameter ||
-                    source.minArgumentCount > target.minArgumentCount) {
-                    return 0 /* False */;
-                }
+            if (!(isMatchingSignature(source, target, partialMatch))) {
+                return 0 /* False */;
             }
             var result = -1 /* True */;
             if (source.typeParameters && target.typeParameters) {
@@ -18384,11 +19135,10 @@ var ts;
             // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
             source = getErasedSignature(source);
             target = getErasedSignature(target);
-            var sourceLen = source.parameters.length;
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = source.hasRestParameter && i === sourceLen - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = target.hasRestParameter && i === targetLen - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0 /* False */;
@@ -18400,9 +19150,12 @@ var ts;
             }
             return result;
         }
+        function isRestParameterIndex(signature, parameterIndex) {
+            return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
+        }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0; _i < types.length; _i++) {
-                var type = types[_i];
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var type = types_6[_i];
                 if (candidate !== type && !isTypeSubtypeOf(type, candidate))
                     return false;
             }
@@ -18454,6 +19207,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isStringLiteralType(type) {
+            return type.flags & 256 /* StringLiteral */;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -18638,8 +19394,8 @@ var ts;
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
-            for (var _i = 0; _i < typeParameters.length; _i++) {
-                var unused = typeParameters[_i];
+            for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                var unused = typeParameters_1[_i];
                 inferences.push({
                     primary: undefined, secondary: undefined, isFixed: false
                 });
@@ -18720,8 +19476,8 @@ var ts;
                     var typeParameterCount = 0;
                     var typeParameter;
                     // First infer to each type in union or intersection that isn't a type parameter
-                    for (var _i = 0; _i < targetTypes.length; _i++) {
-                        var t = targetTypes[_i];
+                    for (var _i = 0, targetTypes_2 = targetTypes; _i < targetTypes_2.length; _i++) {
+                        var t = targetTypes_2[_i];
                         if (t.flags & 512 /* TypeParameter */ && ts.contains(context.typeParameters, t)) {
                             typeParameter = t;
                             typeParameterCount++;
@@ -18743,8 +19499,8 @@ var ts;
                 else if (source.flags & 49152 /* UnionOrIntersection */) {
                     // Source is a union or intersection type, infer from each consituent type
                     var sourceTypes = source.types;
-                    for (var _a = 0; _a < sourceTypes.length; _a++) {
-                        var sourceType = sourceTypes[_a];
+                    for (var _a = 0, sourceTypes_3 = sourceTypes; _a < sourceTypes_3.length; _a++) {
+                        var sourceType = sourceTypes_3[_a];
                         inferFromTypes(sourceType, target);
                     }
                 }
@@ -18778,8 +19534,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0; _i < properties.length; _i++) {
-                    var targetProp = properties[_i];
+                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                    var targetProp = properties_2[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -19126,7 +19882,7 @@ var ts;
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
                 // Check that type is not any, assumed result is true, and we have variable symbol on the left
-                if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) {
                     return type;
                 }
                 // Check that right operand is a function type with a prototype property
@@ -19157,6 +19913,12 @@ var ts;
                     }
                 }
                 if (targetType) {
+                    if (!assumeTrue) {
+                        if (type.flags & 16384 /* Union */) {
+                            return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); }));
+                        }
+                        return type;
+                    }
                     return getNarrowedType(type, targetType);
                 }
                 return type;
@@ -19266,31 +20028,39 @@ var ts;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
             if (languageVersion >= 2 /* ES6 */ ||
-                (symbol.flags & 2 /* BlockScopedVariable */) === 0 ||
+                (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
                 symbol.valueDeclaration.parent.kind === 244 /* CatchClause */) {
                 return;
             }
-            // - check if binding is used in some function
-            // (stop the walk when reaching container of binding declaration)
-            // - if first check succeeded - check if variable is declared inside the loop
-            // nesting structure:
-            // (variable declaration or binding element) -> variable declaration list -> container
-            var container = symbol.valueDeclaration;
-            while (container.kind !== 212 /* VariableDeclarationList */) {
-                container = container.parent;
+            // 1. walk from the use site up to the declaration and check
+            // if there is anything function like between declaration and use-site (is binding/class is captured in function).
+            // 2. walk from the declaration up to the boundary of lexical environment and check
+            // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
+            var container;
+            if (symbol.flags & 32 /* Class */) {
+                // get parent of class declaration
+                container = getClassLikeDeclarationOfSymbol(symbol).parent;
             }
-            // get the parent of variable declaration list
-            container = container.parent;
-            if (container.kind === 193 /* VariableStatement */) {
-                // if parent is variable statement - get its parent
+            else {
+                // nesting structure:
+                // (variable declaration or binding element) -> variable declaration list -> container
+                container = symbol.valueDeclaration;
+                while (container.kind !== 212 /* VariableDeclarationList */) {
+                    container = container.parent;
+                }
+                // get the parent of variable declaration list
                 container = container.parent;
+                if (container.kind === 193 /* VariableStatement */) {
+                    // if parent is variable statement - get its parent
+                    container = container.parent;
+                }
             }
             var inFunction = isInsideFunction(node.parent, container);
             var current = container;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
-                if (isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
+                if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
                     if (inFunction) {
-                        grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node));
+                        getNodeLinks(current).flags |= 65536 /* LoopWithBlockScopedBindingCapturedInFunction */;
                     }
                     // mark value declaration so during emit they can have a special handling
                     getNodeLinks(symbol.valueDeclaration).flags |= 16384 /* BlockScopedBindingInLoop */;
@@ -19336,7 +20106,7 @@ var ts;
                     break;
                 case 141 /* PropertyDeclaration */:
                 case 140 /* PropertySignature */:
-                    if (container.flags & 128 /* Static */) {
+                    if (container.flags & 64 /* Static */) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
@@ -19349,7 +20119,7 @@ var ts;
             }
             if (ts.isClassLike(container.parent)) {
                 var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 128 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return container.flags & 64 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
             }
             return anyType;
         }
@@ -19379,7 +20149,7 @@ var ts;
             var nodeCheckFlag = 0;
             // always set NodeCheckFlags for 'super' expression node
             if (canUseSuperExpression) {
-                if ((container.flags & 128 /* Static */) || isCallExpression) {
+                if ((container.flags & 64 /* Static */) || isCallExpression) {
                     nodeCheckFlag = 512 /* SuperStatic */;
                 }
                 else {
@@ -19435,7 +20205,7 @@ var ts;
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration
                     if (container && ts.isClassLike(container.parent)) {
-                        if (container.flags & 128 /* Static */) {
+                        if (container.flags & 64 /* Static */) {
                             return container.kind === 143 /* MethodDeclaration */ ||
                                 container.kind === 142 /* MethodSignature */ ||
                                 container.kind === 145 /* GetAccessor */ ||
@@ -19469,8 +20239,9 @@ var ts;
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
                         // If last parameter is contextually rest parameter get its type
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (funcHasRestParameters &&
+                            indexOfParameter === (func.parameters.length - 1) &&
+                            isRestParameterIndex(contextualSignature, func.parameters.length - 1)) {
                             return getTypeOfSymbol(ts.lastOrUndefined(contextualSignature.parameters));
                         }
                     }
@@ -19591,8 +20362,8 @@ var ts;
             var types = type.types;
             var mappedType;
             var mappedTypes;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
+                var current = types_7[_i];
                 var t = mapper(current);
                 if (t) {
                     if (!mappedType) {
@@ -19617,6 +20388,9 @@ var ts;
         function getIndexTypeOfContextualType(type, kind) {
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
+        function contextualTypeIsStringLiteralType(type) {
+            return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type));
+        }
         // Return true if the given contextual type is a tuple-like type
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
@@ -19638,7 +20412,7 @@ var ts;
         }
         function getContextualTypeForObjectLiteralElement(element) {
             var objectLiteral = element.parent;
-            var type = getContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral);
             if (type) {
                 if (!ts.hasDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
@@ -19661,7 +20435,7 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(node) {
             var arrayLiteral = node.parent;
-            var type = getContextualType(arrayLiteral);
+            var type = getApparentTypeOfContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
                 return getTypeOfPropertyOfContextualType(type, "" + index)
@@ -19694,11 +20468,28 @@ var ts;
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getContextualType(node) {
-            var type = getContextualTypeWorker(node);
+        function getApparentTypeOfContextualType(node) {
+            var type = getContextualType(node);
             return type && getApparentType(type);
         }
-        function getContextualTypeWorker(node) {
+        /**
+         * Woah! Do you really want to use this function?
+         *
+         * Unless you're trying to get the *non-apparent* type for a
+         * value-literal type or you're authoring relevant portions of this algorithm,
+         * you probably meant to use 'getApparentTypeOfContextualType'.
+         * Otherwise this may not be very useful.
+         *
+         * In cases where you *are* working on this function, you should understand
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'.
+         *
+         *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
+         *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
+         *
+         * @param node the expression whose contextual type will be returned.
+         * @returns the contextual type of an expression.
+         */
+        function getContextualType(node) {
             if (isInsideWithStatementBody(node)) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -19773,7 +20564,7 @@ var ts;
             ts.Debug.assert(node.kind !== 143 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+                : getApparentTypeOfContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -19782,8 +20573,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0; _i < types.length; _i++) {
-                var current = types[_i];
+            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                var current = types_8[_i];
                 var signature = getNonGenericSignature(current);
                 if (signature) {
                     if (!signatureList) {
@@ -19863,8 +20654,8 @@ var ts;
             var hasSpreadElement = false;
             var elementTypes = [];
             var inDestructuringPattern = isAssignmentTarget(node);
-            for (var _i = 0; _i < elements.length; _i++) {
-                var e = elements[_i];
+            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                var e = elements_1[_i];
                 if (inDestructuringPattern && e.kind === 185 /* SpreadElementExpression */) {
                     // Given the following situation:
                     //    var c: {};
@@ -19899,7 +20690,7 @@ var ts;
                     type.pattern = node;
                     return type;
                 }
-                var contextualType = getContextualType(node);
+                var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
                     // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
@@ -19982,10 +20773,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = {};
             var propertiesArray = [];
-            var contextualType = getContextualType(node);
+            var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === 161 /* ObjectBindingPattern */ || contextualType.pattern.kind === 165 /* ObjectLiteralExpression */);
             var typeFlags = 0;
+            var patternWithComputedProperties = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
@@ -20013,8 +20805,11 @@ var ts;
                         if (isOptional) {
                             prop.flags |= 536870912 /* Optional */;
                         }
+                        if (ts.hasDynamicName(memberDecl)) {
+                            patternWithComputedProperties = true;
+                        }
                     }
-                    else if (contextualTypeHasPattern) {
+                    else if (contextualTypeHasPattern && !(contextualType.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */)) {
                         // If object literal is contextually typed by the implied type of a binding pattern, and if the
                         // binding pattern specifies a default value for the property, make the property optional.
                         var impliedProp = getPropertyOfType(contextualType, member.name);
@@ -20066,7 +20861,7 @@ var ts;
             var numberIndexType = getIndexType(1 /* Number */);
             var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */;
-            result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */);
+            result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
@@ -20132,9 +20927,6 @@ var ts;
                     case 234 /* JsxSelfClosingElement */:
                         checkJsxSelfClosingElement(child);
                         break;
-                    default:
-                        // No checks for JSX Text
-                        ts.Debug.assert(child.kind === 236 /* JsxText */);
                 }
             }
             return jsxElementType || anyType;
@@ -20199,8 +20991,8 @@ var ts;
         function checkJsxSpreadAttribute(node, elementAttributesType, nameTable) {
             var type = checkExpression(node.expression);
             var props = getPropertiesOfType(type);
-            for (var _i = 0; _i < props.length; _i++) {
-                var prop = props[_i];
+            for (var _i = 0, props_2 = props; _i < props_2.length; _i++) {
+                var prop = props_2[_i];
                 // Is there a corresponding property in the element attributes type? Skip checking of properties
                 // that have already been assigned to, as these are not actually pushed into the resulting type
                 if (!nameTable[prop.name]) {
@@ -20419,7 +21211,6 @@ var ts;
             var prop = getPropertyOfType(attributesType, attrib.name.text);
             return prop || unknownSymbol;
         }
-        var jsxElementClassType = undefined;
         function getJsxGlobalElementClassType() {
             if (!jsxElementClassType) {
                 jsxElementClassType = getExportedTypeFromNamespace(JsxNames.JSX, JsxNames.ElementClass);
@@ -20498,7 +21289,7 @@ var ts;
             return s.valueDeclaration ? s.valueDeclaration.kind : 141 /* PropertyDeclaration */;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 16 /* Public */ | 128 /* Static */ : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 8 /* Public */ | 64 /* Static */ : 0;
         }
         /**
          * Check whether the requested property access is valid.
@@ -20528,7 +21319,7 @@ var ts;
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
-                if (flags & 256 /* Abstract */) {
+                if (flags & 128 /* Abstract */) {
                     // A method cannot be accessed in a super property access if the method is abstract.
                     // This error could mask a private property access error. But, a member
                     // cannot simultaneously be private and abstract, so this will trigger an
@@ -20538,7 +21329,7 @@ var ts;
                 }
             }
             // Public properties are otherwise accessible.
-            if (!(flags & (32 /* Private */ | 64 /* Protected */))) {
+            if (!(flags & (16 /* Private */ | 32 /* Protected */))) {
                 return true;
             }
             // Property is known to be private or protected at this point
@@ -20546,7 +21337,7 @@ var ts;
             var enclosingClassDeclaration = ts.getContainingClass(node);
             var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
             // Private property is accessible if declaring and enclosing class are the same
-            if (flags & 32 /* Private */) {
+            if (flags & 16 /* Private */) {
                 if (declaringClass !== enclosingClass) {
                     error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
@@ -20564,7 +21355,7 @@ var ts;
                 return false;
             }
             // No further restrictions for static properties
-            if (flags & 128 /* Static */) {
+            if (flags & 64 /* Static */) {
                 return true;
             }
             // An instance property must be accessed through an instance of the enclosing class
@@ -20781,7 +21572,7 @@ var ts;
         // so order how inherited signatures are processed is still preserved.
         // interface A { (x: string): void }
         // interface B extends A { (x: 'foo'): string }
-        // let b: B;
+        // const b: B;
         // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void]
         function reorderCandidates(signatures, result) {
             var lastParent;
@@ -20791,8 +21582,8 @@ var ts;
             var specializedIndex = -1;
             var spliceIndex;
             ts.Debug.assert(!result.length);
-            for (var _i = 0; _i < signatures.length; _i++) {
-                var signature = signatures[_i];
+            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
+                var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
                 var parent_5 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
@@ -20894,7 +21685,7 @@ var ts;
             // If spread arguments are present, check that they correspond to a rest parameter. If so, no
             // further checking is necessary.
             if (spreadArgIndex >= 0) {
-                return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
+                return isRestParameterIndex(signature, spreadArgIndex);
             }
             // Too many arguments implies incorrect arity.
             if (!signature.hasRestParameter && adjustedArgCount > signature.parameters.length) {
@@ -21124,35 +21915,33 @@ var ts;
           */
         function getEffectiveDecoratorFirstArgumentType(node) {
             // The first argument to a decorator is its `target`.
-            switch (node.kind) {
-                case 214 /* ClassDeclaration */:
-                case 186 /* ClassExpression */:
-                    // For a class decorator, the `target` is the type of the class (e.g. the
-                    // "static" or "constructor" side of the class)
+            if (node.kind === 214 /* ClassDeclaration */) {
+                // For a class decorator, the `target` is the type of the class (e.g. the
+                // "static" or "constructor" side of the class)
+                var classSymbol = getSymbolOfNode(node);
+                return getTypeOfSymbol(classSymbol);
+            }
+            if (node.kind === 138 /* Parameter */) {
+                // For a parameter decorator, the `target` is the parent type of the
+                // parameter's containing method.
+                node = node.parent;
+                if (node.kind === 144 /* Constructor */) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
-                case 138 /* Parameter */:
-                    // For a parameter decorator, the `target` is the parent type of the
-                    // parameter's containing method.
-                    node = node.parent;
-                    if (node.kind === 144 /* Constructor */) {
-                        var classSymbol_1 = getSymbolOfNode(node);
-                        return getTypeOfSymbol(classSymbol_1);
-                    }
-                // fall-through
-                case 141 /* PropertyDeclaration */:
-                case 143 /* MethodDeclaration */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                    // For a property or method decorator, the `target` is the
-                    // "static"-side type of the parent of the member if the member is
-                    // declared "static"; otherwise, it is the "instance"-side type of the
-                    // parent of the member.
-                    return getParentTypeOfClassElement(node);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+                }
             }
+            if (node.kind === 141 /* PropertyDeclaration */ ||
+                node.kind === 143 /* MethodDeclaration */ ||
+                node.kind === 145 /* GetAccessor */ ||
+                node.kind === 146 /* SetAccessor */) {
+                // For a property or method decorator, the `target` is the
+                // "static"-side type of the parent of the member if the member is
+                // declared "static"; otherwise, it is the "instance"-side type of the
+                // parent of the member.
+                return getParentTypeOfClassElement(node);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         /**
           * Returns the effective type for the second argument to a decorator.
@@ -21171,49 +21960,46 @@ var ts;
           */
         function getEffectiveDecoratorSecondArgumentType(node) {
             // The second argument to a decorator is its `propertyKey`
-            switch (node.kind) {
-                case 214 /* ClassDeclaration */:
-                    ts.Debug.fail("Class decorators should not have a second synthetic argument.");
-                    return unknownType;
-                case 138 /* Parameter */:
-                    node = node.parent;
-                    if (node.kind === 144 /* Constructor */) {
-                        // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
-                        return anyType;
-                    }
-                // For a non-constructor parameter decorator, the `propertyKey` will be either
-                // a string or a symbol, based on the name of the parameter's containing method.
-                // fall-through
-                case 141 /* PropertyDeclaration */:
-                case 143 /* MethodDeclaration */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                    // The `propertyKey` for a property or method decorator will be a
-                    // string literal type if the member name is an identifier, number, or string;
-                    // otherwise, if the member name is a computed property name it will
-                    // be either string or symbol.
-                    var element = node;
-                    switch (element.name.kind) {
-                        case 69 /* Identifier */:
-                        case 8 /* NumericLiteral */:
-                        case 9 /* StringLiteral */:
-                            return getStringLiteralType(element.name);
-                        case 136 /* ComputedPropertyName */:
-                            var nameType = checkComputedPropertyName(element.name);
-                            if (allConstituentTypesHaveKind(nameType, 16777216 /* ESSymbol */)) {
-                                return nameType;
-                            }
-                            else {
-                                return stringType;
-                            }
-                        default:
-                            ts.Debug.fail("Unsupported property name.");
-                            return unknownType;
-                    }
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214 /* ClassDeclaration */) {
+                ts.Debug.fail("Class decorators should not have a second synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138 /* Parameter */) {
+                node = node.parent;
+                if (node.kind === 144 /* Constructor */) {
+                    // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
+                    return anyType;
+                }
+            }
+            if (node.kind === 141 /* PropertyDeclaration */ ||
+                node.kind === 143 /* MethodDeclaration */ ||
+                node.kind === 145 /* GetAccessor */ ||
+                node.kind === 146 /* SetAccessor */) {
+                // The `propertyKey` for a property or method decorator will be a
+                // string literal type if the member name is an identifier, number, or string;
+                // otherwise, if the member name is a computed property name it will
+                // be either string or symbol.
+                var element = node;
+                switch (element.name.kind) {
+                    case 69 /* Identifier */:
+                    case 8 /* NumericLiteral */:
+                    case 9 /* StringLiteral */:
+                        return getStringLiteralType(element.name);
+                    case 136 /* ComputedPropertyName */:
+                        var nameType = checkComputedPropertyName(element.name);
+                        if (allConstituentTypesHaveKind(nameType, 16777216 /* ESSymbol */)) {
+                            return nameType;
+                        }
+                        else {
+                            return stringType;
+                        }
+                    default:
+                        ts.Debug.fail("Unsupported property name.");
+                        return unknownType;
+                }
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         /**
           * Returns the effective argument type for the third argument to a decorator.
@@ -21225,27 +22011,28 @@ var ts;
         function getEffectiveDecoratorThirdArgumentType(node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
             // or its `parameterIndex` for a paramter decorator
-            switch (node.kind) {
-                case 214 /* ClassDeclaration */:
-                    ts.Debug.fail("Class decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 138 /* Parameter */:
-                    // The `parameterIndex` for a parameter decorator is always a number
-                    return numberType;
-                case 141 /* PropertyDeclaration */:
-                    ts.Debug.fail("Property decorators should not have a third synthetic argument.");
-                    return unknownType;
-                case 143 /* MethodDeclaration */:
-                case 145 /* GetAccessor */:
-                case 146 /* SetAccessor */:
-                    // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
-                    // for the type of the member.
-                    var propertyType = getTypeOfNode(node);
-                    return createTypedPropertyDescriptorType(propertyType);
-                default:
-                    ts.Debug.fail("Unsupported decorator target.");
-                    return unknownType;
+            if (node.kind === 214 /* ClassDeclaration */) {
+                ts.Debug.fail("Class decorators should not have a third synthetic argument.");
+                return unknownType;
             }
+            if (node.kind === 138 /* Parameter */) {
+                // The `parameterIndex` for a parameter decorator is always a number
+                return numberType;
+            }
+            if (node.kind === 141 /* PropertyDeclaration */) {
+                ts.Debug.fail("Property decorators should not have a third synthetic argument.");
+                return unknownType;
+            }
+            if (node.kind === 143 /* MethodDeclaration */ ||
+                node.kind === 145 /* GetAccessor */ ||
+                node.kind === 146 /* SetAccessor */) {
+                // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
+                // for the type of the member.
+                var propertyType = getTypeOfNode(node);
+                return createTypedPropertyDescriptorType(propertyType);
+            }
+            ts.Debug.fail("Unsupported decorator target.");
+            return unknownType;
         }
         /**
           * Returns the effective argument type for the provided argument to a decorator.
@@ -21438,8 +22225,8 @@ var ts;
             //  declare function f(a: { xa: number; xb: number; });
             //  f({ |
             if (!produceDiagnostics) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var candidate = candidates[_i];
+                for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+                    var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
                             candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
@@ -21458,8 +22245,8 @@ var ts;
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
             }
             function chooseOverload(candidates, relation) {
-                for (var _i = 0; _i < candidates.length; _i++) {
-                    var originalCandidate = candidates[_i];
+                for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
+                    var originalCandidate = candidates_2[_i];
                     if (!hasCorrectArity(node, args, originalCandidate)) {
                         continue;
                     }
@@ -21596,7 +22383,7 @@ var ts;
             // In the case of a merged class-module or class-interface declaration,
             // only the class declaration node will have the Abstract flag set.
             var valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
-            if (valueDecl && valueDecl.flags & 256 /* Abstract */) {
+            if (valueDecl && valueDecl.flags & 128 /* Abstract */) {
                 error(node, ts.Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, ts.declarationNameToString(valueDecl.name));
                 return resolveErrorCall(node);
             }
@@ -21743,6 +22530,10 @@ var ts;
                     return anyType;
                 }
             }
+            // In JavaScript files, calls to any identifier 'require' are treated as external module imports
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+                return resolveExternalModuleTypeByLiteral(node.arguments[0]);
+            }
             return getReturnTypeOfSignature(signature);
         }
         function checkTaggedTemplateExpression(node) {
@@ -21753,7 +22544,10 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                if (!(isTypeAssignableTo(targetType, widenedType))) {
+                // Permit 'number[] | "foo"' to be asserted to 'string'.
+                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258 /* StringLike */) &&
+                    someConstituentTypeHasKind(widenedType, 258 /* StringLike */);
+                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
                     checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
                 }
             }
@@ -21771,7 +22565,7 @@ var ts;
                 var contextualParameterType = getTypeAtPosition(context, i);
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
             }
-            if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
+            if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
                 var parameter = ts.lastOrUndefined(signature.parameters);
                 var contextualParameterType = getTypeOfSymbol(ts.lastOrUndefined(context.parameters));
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
@@ -21784,7 +22578,9 @@ var ts;
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
                     if (element.kind !== 187 /* OmittedExpression */) {
-                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        if (element.name.kind === 69 /* Identifier */) {
+                            getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        }
                         assignBindingElementTypes(element);
                     }
                 }
@@ -21959,19 +22755,11 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function bodyContainsAReturnStatement(funcBody) {
-            return ts.forEachReturnStatement(funcBody, function (returnStatement) {
-                return true;
-            });
-        }
-        function bodyContainsSingleThrowStatement(body) {
-            return (body.statements.length === 1) && (body.statements[0].kind === 208 /* ThrowStatement */);
-        }
         // TypeScript Specification 1.0 (6.3) - July 2014
         // An explicitly typed function whose return type isn't the Void or the Any type
         // must have at least one return statement somewhere in its body.
         // An exception to this rule is if the function implementation consists of a single 'throw' statement.
-        function checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(func, returnType) {
+        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
             if (!produceDiagnostics) {
                 return;
             }
@@ -21980,22 +22768,19 @@ var ts;
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192 /* Block */) {
+            // also if HasImplicitReturnValue flags is not set this means that all codepaths in function body end with return of throw
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 192 /* Block */ || !(func.flags & 524288 /* HasImplicitReturn */)) {
                 return;
             }
-            var bodyBlock = func.body;
-            // Ensure the body has at least one return expression.
-            if (bodyContainsAReturnStatement(bodyBlock)) {
-                return;
+            if (func.flags & 1048576 /* HasExplicitReturn */) {
+                if (compilerOptions.noImplicitReturns) {
+                    error(func.type, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
-            // If there are no return expressions, then we need to check if
-            // the function body consists solely of a throw statement;
-            // this is to make an exception for unimplemented functions.
-            if (bodyContainsSingleThrowStatement(bodyBlock)) {
-                return;
+            else {
+                // This function does not conform to the specification.
+                error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            // This function does not conform to the specification.
-            error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement);
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
             ts.Debug.assert(node.kind !== 143 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
@@ -22062,7 +22847,7 @@ var ts;
                 promisedType = checkAsyncFunctionReturnType(node);
             }
             if (returnType && !node.asteriskToken) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (node.body) {
                 if (!node.type) {
@@ -22147,7 +22932,7 @@ var ts;
                     case 69 /* Identifier */:
                     case 166 /* PropertyAccessExpression */: {
                         var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 32768 /* Const */) !== 0;
+                        return symbol && (symbol.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384 /* Const */) !== 0;
                     }
                     case 167 /* ElementAccessExpression */: {
                         var index = n.argumentExpression;
@@ -22155,7 +22940,7 @@ var ts;
                         if (symbol && index && index.kind === 9 /* StringLiteral */) {
                             var name_12 = index.text;
                             var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 32768 /* Const */) !== 0;
+                            return prop && (prop.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384 /* Const */) !== 0;
                         }
                         return false;
                     }
@@ -22240,8 +23025,8 @@ var ts;
             }
             if (type.flags & 49152 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                    var current = types_9[_i];
                     if (current.flags & kind) {
                         return true;
                     }
@@ -22257,8 +23042,8 @@ var ts;
             }
             if (type.flags & 49152 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0; _i < types.length; _i++) {
-                    var current = types[_i];
+                for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                    var current = types_10[_i];
                     if (!(current.flags & kind)) {
                         return false;
                     }
@@ -22303,22 +23088,29 @@ var ts;
         }
         function checkObjectLiteralAssignment(node, sourceType, contextualMapper) {
             var properties = node.properties;
-            for (var _i = 0; _i < properties.length; _i++) {
-                var p = properties[_i];
+            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                var p = properties_3[_i];
                 if (p.kind === 245 /* PropertyAssignment */ || p.kind === 246 /* ShorthandPropertyAssignment */) {
-                    // TODO(andersh): Computed property support
                     var name_13 = p.name;
+                    if (name_13.kind === 136 /* ComputedPropertyName */) {
+                        checkComputedPropertyName(name_13);
+                    }
+                    if (isComputedNonLiteralName(name_13)) {
+                        continue;
+                    }
+                    var text = getTextOfPropertyName(name_13);
                     var type = isTypeAny(sourceType)
                         ? sourceType
-                        : getTypeOfPropertyOfType(sourceType, name_13.text) ||
-                            isNumericLiteralName(name_13.text) && getIndexTypeOfType(sourceType, 1 /* Number */) ||
+                        : getTypeOfPropertyOfType(sourceType, text) ||
+                            isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1 /* Number */) ||
                             getIndexTypeOfType(sourceType, 0 /* String */);
                     if (type) {
                         if (p.kind === 246 /* ShorthandPropertyAssignment */) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
-                            checkDestructuringAssignment(p.initializer || name_13, type);
+                            // non-shorthand property assignments should always have initializers 
+                            checkDestructuringAssignment(p.initializer, type);
                         }
                     }
                     else {
@@ -22519,6 +23311,10 @@ var ts;
                 case 31 /* ExclamationEqualsToken */:
                 case 32 /* EqualsEqualsEqualsToken */:
                 case 33 /* ExclamationEqualsEqualsToken */:
+                    // Permit 'number[] | "foo"' to be asserted to 'string'.
+                    if (someConstituentTypeHasKind(leftType, 258 /* StringLike */) && someConstituentTypeHasKind(rightType, 258 /* StringLike */)) {
+                        return booleanType;
+                    }
                     if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -22642,6 +23438,13 @@ var ts;
             var type2 = checkExpression(node.whenFalse, contextualMapper);
             return getUnionType([type1, type2]);
         }
+        function checkStringLiteralExpression(node) {
+            var contextualType = getContextualType(node);
+            if (contextualType && contextualTypeIsStringLiteralType(contextualType)) {
+                return getStringLiteralType(node);
+            }
+            return stringType;
+        }
         function checkTemplateExpression(node) {
             // We just want to check each expressions, but we are unconcerned with
             // the type of each expression, as any value may be coerced into a string.
@@ -22692,7 +23495,7 @@ var ts;
             if (isInferentialContext(contextualMapper)) {
                 var signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
-                    var contextualType = getContextualType(node);
+                    var contextualType = getApparentTypeOfContextualType(node);
                     if (contextualType) {
                         var contextualSignature = getSingleCallSignature(contextualType);
                         if (contextualSignature && !contextualSignature.typeParameters) {
@@ -22756,6 +23559,7 @@ var ts;
                 case 183 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 9 /* StringLiteral */:
+                    return checkStringLiteralExpression(node);
                 case 11 /* NoSubstitutionTemplateLiteral */:
                     return stringType;
                 case 10 /* RegularExpressionLiteral */:
@@ -22838,7 +23642,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 112 /* AccessibilityModifier */) {
+            if (node.flags & 56 /* AccessibilityModifier */) {
                 func = ts.getContainingFunction(node);
                 if (!(func.kind === 144 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
@@ -23038,7 +23842,7 @@ var ts;
             checkFunctionLikeDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (node.flags & 256 /* Abstract */ && node.body) {
+            if (node.flags & 128 /* Abstract */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -23089,7 +23893,7 @@ var ts;
             }
             function isInstancePropertyWithInitializer(n) {
                 return n.kind === 141 /* PropertyDeclaration */ &&
-                    !(n.flags & 128 /* Static */) &&
+                    !(n.flags & 64 /* Static */) &&
                     !!n.initializer;
             }
             // TS 1.0 spec (April 2014): 8.3.2
@@ -23110,14 +23914,14 @@ var ts;
                     // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 /* Public */ | 32 /* Private */ | 64 /* Protected */); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (8 /* Public */ | 16 /* Private */ | 32 /* Protected */); });
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         var superCallStatement;
-                        for (var _i = 0; _i < statements.length; _i++) {
-                            var statement = statements[_i];
+                        for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
+                            var statement = statements_2[_i];
                             if (statement.kind === 195 /* ExpressionStatement */ && isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
@@ -23145,8 +23949,15 @@ var ts;
                 // Grammar checking accessors
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 if (node.kind === 145 /* GetAccessor */) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && !(bodyContainsAReturnStatement(node.body) || bodyContainsSingleThrowStatement(node.body))) {
-                        error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement);
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288 /* HasImplicitReturn */)) {
+                        if (node.flags & 1048576 /* HasExplicitReturn */) {
+                            if (compilerOptions.noImplicitReturns) {
+                                error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                            }
+                        }
+                        else {
+                            error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
+                        }
                     }
                 }
                 if (!ts.hasDynamicName(node)) {
@@ -23155,7 +23966,7 @@ var ts;
                     var otherKind = node.kind === 145 /* GetAccessor */ ? 146 /* SetAccessor */ : 145 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 112 /* AccessibilityModifier */) !== (otherAccessor.flags & 112 /* AccessibilityModifier */))) {
+                        if (((node.flags & 56 /* AccessibilityModifier */) !== (otherAccessor.flags & 56 /* AccessibilityModifier */))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
                         var currentAccessorType = getAnnotatedAccessorType(node);
@@ -23226,7 +24037,7 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 32 /* Private */) && ts.isInAmbientContext(node);
+            return (node.flags & 16 /* Private */) && ts.isInAmbientContext(node);
         }
         function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
             if (!produceDiagnostics) {
@@ -23258,8 +24069,8 @@ var ts;
             else {
                 signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
             }
-            for (var _i = 0; _i < signaturesToCheck.length; _i++) {
-                var otherSignature = signaturesToCheck[_i];
+            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
+                var otherSignature = signaturesToCheck_1[_i];
                 if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) {
                     return;
                 }
@@ -23268,12 +24079,17 @@ var ts;
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
-            if (n.parent.kind !== 215 /* InterfaceDeclaration */ && ts.isInAmbientContext(n)) {
-                if (!(flags & 2 /* Ambient */)) {
+            // children of classes (even ambient classes) should not be marked as ambient or export
+            // because those flags have no useful semantics there.
+            if (n.parent.kind !== 215 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 214 /* ClassDeclaration */ &&
+                n.parent.kind !== 186 /* ClassExpression */ &&
+                ts.isInAmbientContext(n)) {
+                if (!(flags & 4 /* Ambient */)) {
                     // It is nested in an ambient context, which means it is automatically exported
-                    flags |= 1 /* Export */;
+                    flags |= 2 /* Export */;
                 }
-                flags |= 2 /* Ambient */;
+                flags |= 4 /* Ambient */;
             }
             return flags & flagsToCheck;
         }
@@ -23298,16 +24114,16 @@ var ts;
                     var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
                         var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 1 /* Export */) {
+                        if (deviation & 2 /* Export */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
                         }
-                        else if (deviation & 2 /* Ambient */) {
+                        else if (deviation & 4 /* Ambient */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (32 /* Private */ | 64 /* Protected */)) {
+                        else if (deviation & (16 /* Private */ | 32 /* Protected */)) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
-                        else if (deviation & 256 /* Abstract */) {
+                        else if (deviation & 128 /* Abstract */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
                         }
                     });
@@ -23324,7 +24140,7 @@ var ts;
                     });
                 }
             }
-            var flagsToCheck = 1 /* Export */ | 2 /* Ambient */ | 32 /* Private */ | 64 /* Protected */ | 256 /* Abstract */;
+            var flagsToCheck = 2 /* Export */ | 4 /* Ambient */ | 16 /* Private */ | 32 /* Protected */ | 128 /* Abstract */;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -23355,8 +24171,8 @@ var ts;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
                             // the only situation when this is possible (same kind\same name but different symbol) - mixed static and instance class members
                             ts.Debug.assert(node.kind === 143 /* MethodDeclaration */ || node.kind === 142 /* MethodSignature */);
-                            ts.Debug.assert((node.flags & 128 /* Static */) !== (subsequentNode.flags & 128 /* Static */));
-                            var diagnostic = node.flags & 128 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                            ts.Debug.assert((node.flags & 64 /* Static */) !== (subsequentNode.flags & 64 /* Static */));
+                            var diagnostic = node.flags & 64 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                             error(errorNode_1, diagnostic);
                             return;
                         }
@@ -23373,7 +24189,7 @@ var ts;
                 else {
                     // Report different errors regarding non-consecutive blocks of declarations depending on whether
                     // the node in question is abstract.
-                    if (node.flags & 256 /* Abstract */) {
+                    if (node.flags & 128 /* Abstract */) {
                         error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
                     }
                     else {
@@ -23386,8 +24202,8 @@ var ts;
             var isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & 1536 /* Module */;
             var duplicateFunctionDeclaration = false;
             var multipleConstructorImplementation = false;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var current = declarations[_i];
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
                 var inAmbientContextOrInterface = node.parent.kind === 215 /* InterfaceDeclaration */ || node.parent.kind === 155 /* TypeLiteral */ || inAmbientContext;
@@ -23444,7 +24260,7 @@ var ts;
             }
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & 256 /* Abstract */)) {
+                !(lastSeenNonAmbientDeclaration.flags & 128 /* Abstract */)) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
             if (hasOverloads) {
@@ -23470,8 +24286,8 @@ var ts;
                         // function g(x: string, y: string) { }
                         //
                         // The implementation is completely unrelated to the specialized signature, yet we do not check this.
-                        for (var _a = 0; _a < signatures.length; _a++) {
-                            var signature = signatures[_a];
+                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                            var signature = signatures_3[_a];
                             if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) {
                                 error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
                                 break;
@@ -23508,9 +24324,9 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 /* Export */ | 1024 /* Default */);
-                if (effectiveDeclarationFlags & 1 /* Export */) {
-                    if (effectiveDeclarationFlags & 1024 /* Default */) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 /* Export */ | 512 /* Default */);
+                if (effectiveDeclarationFlags & 2 /* Export */) {
+                    if (effectiveDeclarationFlags & 512 /* Default */) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
                     else {
@@ -23763,9 +24579,12 @@ var ts;
                 // type as a value. As such, we will just return unknownType;
                 return unknownType;
             }
-            var promiseConstructor = getMergedSymbol(promiseType.symbol);
+            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
             if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType));
+                var typeName = promiseConstructor
+                    ? symbolToString(promiseConstructor)
+                    : typeToString(promiseType);
+                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
                 return unknownType;
             }
             // Validate the promise constructor type.
@@ -23957,7 +24776,7 @@ var ts;
                 if (isAsync) {
                     promisedType = checkAsyncFunctionReturnType(node);
                 }
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
             if (produceDiagnostics && !node.type) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
@@ -24070,7 +24889,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 248 /* SourceFile */ && ts.isExternalModule(parent)) {
+            if (parent.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -24088,18 +24907,18 @@ var ts;
             // A non-initialized declaration is a no-op as the block declaration will resolve before the var
             // declaration. the problem is if the declaration has an initializer. this will act as a write to the
             // block declared value. this is fine for let, but not const.
-            // Only consider declarations with initializers, uninitialized let declarations will not
+            // Only consider declarations with initializers, uninitialized const declarations will not
             // step on a let/const variable.
-            // Do not consider let and const declarations, as duplicate block-scoped declarations
+            // Do not consider const and const declarations, as duplicate block-scoped declarations
             // are handled by the binder.
-            // We are only looking for let declarations that step on let\const declarations from a
+            // We are only looking for const declarations that step on let\const declarations from a
             // different scope. e.g.:
             //      {
             //          const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration
-            //          let x = 0; // symbol for this declaration will be 'symbol'
+            //          const x = 0; // symbol for this declaration will be 'symbol'
             //      }
             // skip block-scoped variables and parameters
-            if ((ts.getCombinedNodeFlags(node) & 49152 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
+            if ((ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
             // skip variable declarations that don't have initializers
@@ -24114,7 +24933,7 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 49152 /* BlockScoped */) {
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576 /* BlockScoped */) {
                         var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 212 /* VariableDeclarationList */);
                         var container = varDeclList.parent.kind === 193 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
@@ -24183,6 +25002,12 @@ var ts;
                     checkExpressionCached(node.initializer);
                 }
             }
+            if (node.kind === 163 /* BindingElement */) {
+                // check computed properties inside property names of binding elements
+                if (node.propertyName && node.propertyName.kind === 136 /* ComputedPropertyName */) {
+                    checkComputedPropertyName(node.propertyName);
+                }
+            }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
@@ -24267,6 +25092,9 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
+            if (node.thenStatement.kind === 194 /* EmptyStatement */) {
+                error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
+            }
             checkSourceElement(node.elseStatement);
         }
         function checkDoStatement(node) {
@@ -24625,7 +25453,7 @@ var ts;
                         error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                     else if (func.kind === 144 /* Constructor */) {
-                        if (!isTypeAssignableTo(exprType, returnType)) {
+                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
@@ -24663,6 +25491,7 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258 /* StringLike */);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === 242 /* DefaultClause */ && !hasDuplicateDefaultClause) {
@@ -24682,6 +25511,10 @@ var ts;
                     // TypeScript 1.0 spec (April 2014):5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
                     var caseType = checkExpression(caseClause.expression);
+                    // Permit 'number[] | "foo"' to be asserted to 'string'.
+                    if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258 /* StringLike */)) {
+                        return;
+                    }
                     if (!isTypeAssignableTo(expressionType, caseType)) {
                         // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails
                         checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
@@ -24772,7 +25605,7 @@ var ts;
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
-                        if (!(member.flags & 128 /* Static */) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 64 /* Static */) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
@@ -24858,14 +25691,10 @@ var ts;
             return getTypeOfSymbol(getSymbolOfNode(node));
         }
         function checkClassDeclaration(node) {
-            if (!node.name && !(node.flags & 1024 /* Default */)) {
+            if (!node.name && !(node.flags & 512 /* Default */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
             checkClassLikeDeclaration(node);
-            // Interfaces cannot be merged with non-ambient classes.
-            if (getSymbolOfNode(node).flags & 64 /* Interface */ && !ts.isInAmbientContext(node)) {
-                error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-            }
             ts.forEach(node.members, checkSourceElement);
         }
         function checkClassLikeDeclaration(node) {
@@ -24916,8 +25745,8 @@ var ts;
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
             if (implementedTypeNodes) {
-                for (var _b = 0; _b < implementedTypeNodes.length; _b++) {
-                    var typeRefNode = implementedTypeNodes[_b];
+                for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
+                    var typeRefNode = implementedTypeNodes_1[_b];
                     if (!ts.isSupportedExpressionWithTypeArguments(typeRefNode)) {
                         error(typeRefNode.expression, ts.Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
                     }
@@ -24965,8 +25794,8 @@ var ts;
             // derived class instance member variables and accessors, but not by other kinds of members.
             // NOTE: assignability is checked in checkClassDeclaration
             var baseProperties = getPropertiesOfObjectType(baseType);
-            for (var _i = 0; _i < baseProperties.length; _i++) {
-                var baseProperty = baseProperties[_i];
+            for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
+                var baseProperty = baseProperties_1[_i];
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 134217728 /* Prototype */) {
                     continue;
@@ -24984,7 +25813,7 @@ var ts;
                         // It is an error to inherit an abstract member without implementing it or being declared abstract.
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
-                        if (baseDeclarationFlags & 256 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 256 /* Abstract */))) {
+                        if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 128 /* Abstract */))) {
                             if (derivedClassDecl.kind === 186 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
@@ -24996,11 +25825,11 @@ var ts;
                     else {
                         // derived overrides base.
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 32 /* Private */) || (derivedDeclarationFlags & 32 /* Private */)) {
+                        if ((baseDeclarationFlags & 16 /* Private */) || (derivedDeclarationFlags & 16 /* Private */)) {
                             // either base or derived property is private - not override, skip it
                             continue;
                         }
-                        if ((baseDeclarationFlags & 128 /* Static */) !== (derivedDeclarationFlags & 128 /* Static */)) {
+                        if ((baseDeclarationFlags & 64 /* Static */) !== (derivedDeclarationFlags & 64 /* Static */)) {
                             // value of 'static' is not the same for properties - not override, skip it
                             continue;
                         }
@@ -25071,11 +25900,11 @@ var ts;
             var seen = {};
             ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
             var ok = true;
-            for (var _i = 0; _i < baseTypes.length; _i++) {
-                var base = baseTypes[_i];
+            for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
+                var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var prop = properties[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     if (!ts.hasProperty(seen, prop.name)) {
                         seen[prop.name] = { prop: prop, containingType: base };
                     }
@@ -25122,16 +25951,6 @@ var ts;
                         checkIndexConstraints(type);
                     }
                 }
-                // Interfaces cannot merge with non-ambient classes.
-                if (symbol && symbol.declarations) {
-                    for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
-                        var declaration = _c[_b];
-                        if (declaration.kind === 214 /* ClassDeclaration */ && !ts.isInAmbientContext(declaration)) {
-                            error(node, ts.Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
-                            break;
-                        }
-                    }
-                }
             }
             ts.forEach(ts.getInterfaceBaseTypeNodes(node), function (heritageElement) {
                 if (!ts.isSupportedExpressionWithTypeArguments(heritageElement)) {
@@ -25160,11 +25979,14 @@ var ts;
                 var enumIsConst = ts.isConst(node);
                 for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                     var member = _a[_i];
-                    if (member.name.kind === 136 /* ComputedPropertyName */) {
+                    if (isComputedNonLiteralName(member.name)) {
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
-                    else if (isNumericLiteralName(member.name.text)) {
-                        error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                    else {
+                        var text = getTextOfPropertyName(member.name);
+                        if (isNumericLiteralName(text)) {
+                            error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                        }
                     }
                     var previousEnumMemberIsNonConstant = autoValue === undefined;
                     var initializer = member.initializer;
@@ -25382,8 +26204,8 @@ var ts;
         }
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
             var declarations = symbol.declarations;
-            for (var _i = 0; _i < declarations.length; _i++) {
-                var declaration = declarations[_i];
+            for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
+                var declaration = declarations_5[_i];
                 if ((declaration.kind === 214 /* ClassDeclaration */ ||
                     (declaration.kind === 213 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
@@ -25522,7 +26344,7 @@ var ts;
                 // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -25550,7 +26372,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -25581,7 +26403,7 @@ var ts;
                 // If we hit an export in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -25625,7 +26447,7 @@ var ts;
                 return;
             }
             // Grammar checking
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 2035 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69 /* Identifier */) {
@@ -25806,8 +26628,8 @@ var ts;
         }
         // Function and class expression bodies are checked after all statements in the enclosing body. This is
         // to ensure constructs like the following are permitted:
-        //     let foo = function () {
-        //        let s = foo();
+        //     const foo = function () {
+        //        const s = foo();
         //        return "hello";
         //     }
         // Here, performing a full type check of the body of the function expression whilst in the process of
@@ -25922,8 +26744,12 @@ var ts;
             if (!(links.flags & 1 /* TypeChecked */)) {
                 // Check whether the file has declared it is the default lib,
                 // and whether the user has specifically chosen to avoid checking it.
-                if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) {
-                    return;
+                if (compilerOptions.skipDefaultLibCheck) {
+                    // If the user specified '--noLib' and a file has a '/// <reference no-default-lib="true"/>',
+                    // then we should treat that file as a default lib.
+                    if (node.hasNoDefaultLib) {
+                        return;
+                    }
                 }
                 // Grammar checking
                 checkGrammarSourceFile(node);
@@ -25933,7 +26759,7 @@ var ts;
                 potentialThisCollisions.length = 0;
                 ts.forEach(node.statements, checkSourceElement);
                 checkFunctionAndClassExpressionBodies(node);
-                if (ts.isExternalModule(node)) {
+                if (ts.isExternalOrCommonJsModule(node)) {
                     checkExternalModuleExports(node);
                 }
                 if (potentialThisCollisions.length) {
@@ -26016,7 +26842,7 @@ var ts;
                     }
                     switch (location.kind) {
                         case 248 /* SourceFile */:
-                            if (!ts.isExternalModule(location)) {
+                            if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
                         case 218 /* ModuleDeclaration */:
@@ -26038,7 +26864,7 @@ var ts;
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
                             // Note: that the memberFlags come from previous iteration.
-                            if (!(memberFlags & 128 /* Static */)) {
+                            if (!(memberFlags & 64 /* Static */)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056 /* Type */);
                             }
                             break;
@@ -26339,7 +27165,7 @@ var ts;
           */
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 128 /* Static */
+            return node.flags & 64 /* Static */
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -26378,6 +27204,9 @@ var ts;
             return [symbol];
         }
         // Emitter support
+        function isArgumentsLocalBinding(node) {
+            return getReferencedValueSymbol(node) === argumentsSymbol;
+        }
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
         // node of the exported entity's container. Otherwise, return undefined.
         function getReferencedExportContainer(node) {
@@ -26650,21 +27479,30 @@ var ts;
                 collectLinkedAliases: collectLinkedAliases,
                 getReferencedValueDeclaration: getReferencedValueDeclaration,
                 getTypeReferenceSerializationKind: getTypeReferenceSerializationKind,
-                isOptionalParameter: isOptionalParameter
+                isOptionalParameter: isOptionalParameter,
+                isArgumentsLocalBinding: isArgumentsLocalBinding,
+                getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration
             };
         }
+        function getExternalModuleFileFromDeclaration(declaration) {
+            var specifier = ts.getExternalModuleName(declaration);
+            var moduleSymbol = getSymbolAtLocation(specifier);
+            if (!moduleSymbol) {
+                return undefined;
+            }
+            return ts.getDeclarationOfKind(moduleSymbol, 248 /* SourceFile */);
+        }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
             ts.forEach(host.getSourceFiles(), function (file) {
-                ts.bindSourceFile(file);
+                ts.bindSourceFile(file, compilerOptions);
             });
             // Initialize global symbol table
             ts.forEach(host.getSourceFiles(), function (file) {
-                if (!ts.isExternalModule(file)) {
+                if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
             });
-            // Initialize special symbols
             getSymbolLinks(undefinedSymbol).type = undefinedType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments");
             getSymbolLinks(unknownSymbol).type = unknownType;
@@ -26810,19 +27648,19 @@ var ts;
                             text = "private";
                             lastPrivate = modifier;
                         }
-                        if (flags & 112 /* AccessibilityModifier */) {
+                        if (flags & 56 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 128 /* Static */) {
+                        else if (flags & 64 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
                         else if (node.parent.kind === 219 /* ModuleBlock */ || node.parent.kind === 248 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
-                        else if (flags & 256 /* Abstract */) {
+                        else if (flags & 128 /* Abstract */) {
                             if (modifier.kind === 110 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
@@ -26833,10 +27671,10 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113 /* StaticKeyword */:
-                        if (flags & 128 /* Static */) {
+                        if (flags & 64 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
                         else if (node.parent.kind === 219 /* ModuleBlock */ || node.parent.kind === 248 /* SourceFile */) {
@@ -26845,23 +27683,23 @@ var ts;
                         else if (node.kind === 138 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
-                        else if (flags & 256 /* Abstract */) {
+                        else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 128 /* Static */;
+                        flags |= 64 /* Static */;
                         lastStatic = modifier;
                         break;
                     case 82 /* ExportKeyword */:
-                        if (flags & 1 /* Export */) {
+                        if (flags & 2 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 2 /* Ambient */) {
+                        else if (flags & 4 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
-                        else if (flags & 256 /* Abstract */) {
+                        else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (node.parent.kind === 214 /* ClassDeclaration */) {
@@ -26870,13 +27708,13 @@ var ts;
                         else if (node.kind === 138 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 1 /* Export */;
+                        flags |= 2 /* Export */;
                         break;
                     case 122 /* DeclareKeyword */:
-                        if (flags & 2 /* Ambient */) {
+                        if (flags & 4 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
-                        else if (flags & 512 /* Async */) {
+                        else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.parent.kind === 214 /* ClassDeclaration */) {
@@ -26888,69 +27726,69 @@ var ts;
                         else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 219 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 2 /* Ambient */;
+                        flags |= 4 /* Ambient */;
                         lastDeclare = modifier;
                         break;
                     case 115 /* AbstractKeyword */:
-                        if (flags & 256 /* Abstract */) {
+                        if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
                         if (node.kind !== 214 /* ClassDeclaration */) {
                             if (node.kind !== 143 /* MethodDeclaration */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
                             }
-                            if (!(node.parent.kind === 214 /* ClassDeclaration */ && node.parent.flags & 256 /* Abstract */)) {
+                            if (!(node.parent.kind === 214 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 128 /* Static */) {
+                            if (flags & 64 /* Static */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 32 /* Private */) {
+                            if (flags & 16 /* Private */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
-                        flags |= 256 /* Abstract */;
+                        flags |= 128 /* Abstract */;
                         break;
                     case 118 /* AsyncKeyword */:
-                        if (flags & 512 /* Async */) {
+                        if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 4 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.kind === 138 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
-                        flags |= 512 /* Async */;
+                        flags |= 256 /* Async */;
                         lastAsync = modifier;
                         break;
                 }
             }
             if (node.kind === 144 /* Constructor */) {
-                if (flags & 128 /* Static */) {
+                if (flags & 64 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & 256 /* Abstract */) {
+                if (flags & 128 /* Abstract */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 64 /* Protected */) {
+                else if (flags & 32 /* Protected */) {
                     return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
                 }
-                else if (flags & 32 /* Private */) {
+                else if (flags & 16 /* Private */) {
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
-                else if (flags & 512 /* Async */) {
+                else if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
                 return;
             }
-            else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && flags & 4 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 138 /* Parameter */ && (flags & 112 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 138 /* Parameter */ && (flags & 56 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
-            if (flags & 512 /* Async */) {
+            if (flags & 256 /* Async */) {
                 return checkGrammarAsyncModifier(node, lastAsync);
             }
         }
@@ -27051,7 +27889,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 2035 /* Modifier */) {
+            if (parameter.flags & 1022 /* Modifier */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -27071,7 +27909,7 @@ var ts;
             }
         }
         function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 2035 /* Modifier */) {
+            if (node.flags & 1022 /* Modifier */) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
             }
         }
@@ -27094,8 +27932,8 @@ var ts;
         function checkGrammarForOmittedArgument(node, args) {
             if (args) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                for (var _i = 0; _i < args.length; _i++) {
-                    var arg = args[_i];
+                for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
+                    var arg = args_1[_i];
                     if (arg.kind === 187 /* OmittedExpression */) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
@@ -27350,7 +28188,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 2035 /* Modifier */) {
+                    else if (parameter.flags & 1022 /* Modifier */) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -27363,7 +28201,7 @@ var ts;
             }
         }
         function checkGrammarForNonSymbolComputedProperty(node, message) {
-            if (node.kind === 136 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(node.expression)) {
+            if (ts.isDynamicName(node)) {
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -27404,19 +28242,6 @@ var ts;
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
-        function isIterationStatement(node, lookInLabeledStatements) {
-            switch (node.kind) {
-                case 199 /* ForStatement */:
-                case 200 /* ForInStatement */:
-                case 201 /* ForOfStatement */:
-                case 197 /* DoStatement */:
-                case 198 /* WhileStatement */:
-                    return true;
-                case 207 /* LabeledStatement */:
-                    return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-            }
-            return false;
-        }
         function checkGrammarBreakOrContinueStatement(node) {
             var current = node;
             while (current) {
@@ -27429,7 +28254,7 @@ var ts;
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
                             var isMisplacedContinueLabel = node.kind === 202 /* ContinueStatement */
-                                && !isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
+                                && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -27443,7 +28268,7 @@ var ts;
                         }
                         break;
                     default:
-                        if (isIterationStatement(current, /*lookInLabeledStatement*/ false) && !node.label) {
+                        if (ts.isIterationStatement(current, /*lookInLabeledStatement*/ false) && !node.label) {
                             // unlabeled break or continue within iteration statement - ok
                             return false;
                         }
@@ -27514,8 +28339,8 @@ var ts;
             }
             else {
                 var elements = name.elements;
-                for (var _i = 0; _i < elements.length; _i++) {
-                    var element = elements[_i];
+                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                    var element = elements_2[_i];
                     if (element.kind !== 187 /* OmittedExpression */) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
@@ -27639,17 +28464,20 @@ var ts;
             //  DeclarationElement:
             //     ExportAssignment
             //     export_opt   InterfaceDeclaration
+            //     export_opt   TypeAliasDeclaration
             //     export_opt   ImportDeclaration
             //     export_opt   ExternalImportDeclaration
             //     export_opt   AmbientDeclaration
             //
+            // TODO: The spec needs to be amended to reflect this grammar.
             if (node.kind === 215 /* InterfaceDeclaration */ ||
+                node.kind === 216 /* TypeAliasDeclaration */ ||
                 node.kind === 222 /* ImportDeclaration */ ||
                 node.kind === 221 /* ImportEqualsDeclaration */ ||
                 node.kind === 228 /* ExportDeclaration */ ||
                 node.kind === 227 /* ExportAssignment */ ||
-                (node.flags & 2 /* Ambient */) ||
-                (node.flags & (1 /* Export */ | 1024 /* Default */))) {
+                (node.flags & 4 /* Ambient */) ||
+                (node.flags & (2 /* Export */ | 512 /* Default */))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -27696,7 +28524,7 @@ var ts;
         }
         function checkGrammarNumericLiteral(node) {
             // Grammar checking
-            if (node.flags & 65536 /* OctalLiteral */ && languageVersion >= 1 /* ES5 */) {
+            if (node.flags & 32768 /* OctalLiteral */ && languageVersion >= 1 /* ES5 */) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -27732,11 +28560,15 @@ var ts;
         var writeTextOfNode;
         var writer = createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
-        var currentSourceFile;
+        var currentText;
+        var currentLineMap;
+        var currentIdentifiers;
+        var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
         var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        var noDeclare = !root;
         var moduleElementDeclarationEmitInfo = [];
         var asynchronousSubModuleDeclarationEmitInfo;
         // Contains the reference paths that needs to go in the declaration file.
@@ -27750,7 +28582,7 @@ var ts;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
                     // All the references that are not going to be part of same file
-                    if (referencedFile && ((referencedFile.flags & 8192 /* DeclarationFile */) ||
+                    if (referencedFile && ((referencedFile.flags & 4096 /* DeclarationFile */) ||
                         ts.shouldEmitToOwnFile(referencedFile, compilerOptions) ||
                         !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
@@ -27779,23 +28611,56 @@ var ts;
         else {
             // Emit references corresponding to this file
             var emittedReferencedFiles = [];
+            var prevModuleElementDeclarationEmitInfo = [];
             ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                if (!ts.isDeclarationFile(sourceFile)) {
                     // Check what references need to be added
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            // If the reference file is a declaration file or an external module, emit that reference
-                            if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) &&
+                            // If the reference file is a declaration file, emit that reference
+                            if (referencedFile && (ts.isDeclarationFile(referencedFile) &&
                                 !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
                         });
                     }
+                }
+                if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) {
+                    noDeclare = false;
                     emitSourceFile(sourceFile);
                 }
+                else if (ts.isExternalModule(sourceFile)) {
+                    noDeclare = true;
+                    write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {");
+                    writeLine();
+                    increaseIndent();
+                    emitSourceFile(sourceFile);
+                    decreaseIndent();
+                    write("}");
+                    writeLine();
+                    // create asynchronous output for the importDeclarations
+                    if (moduleElementDeclarationEmitInfo.length) {
+                        var oldWriter = writer;
+                        ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
+                            if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
+                                ts.Debug.assert(aliasEmitInfo.node.kind === 222 /* ImportDeclaration */);
+                                createAndSetNewTextWriterWithSymbolWriter();
+                                ts.Debug.assert(aliasEmitInfo.indent === 1);
+                                increaseIndent();
+                                writeImportDeclaration(aliasEmitInfo.node);
+                                aliasEmitInfo.asynchronousOutput = writer.getText();
+                                decreaseIndent();
+                            }
+                        });
+                        setWriter(oldWriter);
+                    }
+                    prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
+                    moduleElementDeclarationEmitInfo = [];
+                }
             });
+            moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo);
         }
         return {
             reportedDeclarationError: reportedDeclarationError,
@@ -27804,13 +28669,12 @@ var ts;
             referencePathsOutput: referencePathsOutput
         };
         function hasInternalAnnotation(range) {
-            var text = currentSourceFile.text;
-            var comment = text.substring(range.pos, range.end);
+            var comment = currentText.substring(range.pos, range.end);
             return comment.indexOf("@internal") >= 0;
         }
         function stripInternal(node) {
             if (node) {
-                var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos);
                 if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
                     return;
                 }
@@ -27902,7 +28766,7 @@ var ts;
                 var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
                     }
                     else {
                         diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
@@ -27945,15 +28809,15 @@ var ts;
             }
         }
         function emitLines(nodes) {
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+                var node = nodes_2[_i];
                 emit(node);
             }
         }
         function emitSeparatedList(nodes, separator, eachNodeEmitFn, canEmitFn) {
             var currentWriterPos = writer.getTextPos();
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+                var node = nodes_3[_i];
                 if (!canEmitFn || canEmitFn(node)) {
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(separator);
@@ -27968,10 +28832,10 @@ var ts;
         }
         function writeJsDocComments(declaration) {
             if (declaration) {
-                var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile);
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments);
+                var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange);
+                ts.emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange);
             }
         }
         function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) {
@@ -27988,7 +28852,7 @@ var ts;
                 case 103 /* VoidKeyword */:
                 case 97 /* ThisKeyword */:
                 case 9 /* StringLiteral */:
-                    return writeTextOfNode(currentSourceFile, type);
+                    return writeTextOfNode(currentText, type);
                 case 188 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(type);
                 case 151 /* TypeReference */:
@@ -28019,14 +28883,14 @@ var ts;
             }
             function writeEntityName(entityName) {
                 if (entityName.kind === 69 /* Identifier */) {
-                    writeTextOfNode(currentSourceFile, entityName);
+                    writeTextOfNode(currentText, entityName);
                 }
                 else {
                     var left = entityName.kind === 135 /* QualifiedName */ ? entityName.left : entityName.expression;
                     var right = entityName.kind === 135 /* QualifiedName */ ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
-                    writeTextOfNode(currentSourceFile, right);
+                    writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
@@ -28056,7 +28920,7 @@ var ts;
                 }
             }
             function emitTypePredicate(type) {
-                writeTextOfNode(currentSourceFile, type.parameterName);
+                writeTextOfNode(currentText, type.parameterName);
                 write(" is ");
                 emitType(type.type);
             }
@@ -28097,8 +28961,12 @@ var ts;
             }
         }
         function emitSourceFile(node) {
-            currentSourceFile = node;
+            currentText = node.text;
+            currentLineMap = ts.getLineStarts(node);
+            currentIdentifiers = node.identifiers;
+            isCurrentFileExternalModule = ts.isExternalModule(node);
             enclosingDeclaration = node;
+            ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true /* remove comments */);
             emitLines(node.statements);
         }
         // Return a temp variable name to be used in `export default` statements.
@@ -28107,13 +28975,13 @@ var ts;
         // do not need to keep track of created temp names.
         function getExportDefaultTempVariableName() {
             var baseName = "_default";
-            if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) {
+            if (!ts.hasProperty(currentIdentifiers, baseName)) {
                 return baseName;
             }
             var count = 0;
             while (true) {
                 var name_18 = baseName + "_" + (++count);
-                if (!ts.hasProperty(currentSourceFile.identifiers, name_18)) {
+                if (!ts.hasProperty(currentIdentifiers, name_18)) {
                     return name_18;
                 }
             }
@@ -28121,7 +28989,7 @@ var ts;
         function emitExportAssignment(node) {
             if (node.expression.kind === 69 /* Identifier */) {
                 write(node.isExportEquals ? "export = " : "export default ");
-                writeTextOfNode(currentSourceFile, node.expression);
+                writeTextOfNode(currentText, node.expression);
             }
             else {
                 // Expression
@@ -28159,7 +29027,7 @@ var ts;
                 writeModuleElement(node);
             }
             else if (node.kind === 221 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 248 /* SourceFile */ && ts.isExternalModule(currentSourceFile))) {
+                (node.parent.kind === 248 /* SourceFile */ && isCurrentFileExternalModule)) {
                 var isVisible;
                 if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248 /* SourceFile */) {
                     // Import declaration of another module that is visited async so lets put it in right spot
@@ -28213,30 +29081,30 @@ var ts;
         }
         function emitModuleElementDeclarationFlags(node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent === currentSourceFile) {
+            if (node.parent.kind === 248 /* SourceFile */) {
                 // If the node is exported
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     write("export ");
                 }
-                if (node.flags & 1024 /* Default */) {
+                if (node.flags & 512 /* Default */) {
                     write("default ");
                 }
-                else if (node.kind !== 215 /* InterfaceDeclaration */) {
+                else if (node.kind !== 215 /* InterfaceDeclaration */ && !noDeclare) {
                     write("declare ");
                 }
             }
         }
         function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 32 /* Private */) {
+            if (node.flags & 16 /* Private */) {
                 write("private ");
             }
-            else if (node.flags & 64 /* Protected */) {
+            else if (node.flags & 32 /* Protected */) {
                 write("protected ");
             }
-            if (node.flags & 128 /* Static */) {
+            if (node.flags & 64 /* Static */) {
                 write("static ");
             }
-            if (node.flags & 256 /* Abstract */) {
+            if (node.flags & 128 /* Abstract */) {
                 write("abstract ");
             }
         }
@@ -28244,11 +29112,11 @@ var ts;
             // note usage of writer. methods instead of aliases created, just to make sure we are using
             // correct writer especially to handle asynchronous alias writing
             emitJsDocComments(node);
-            if (node.flags & 1 /* Export */) {
+            if (node.flags & 2 /* Export */) {
                 write("export ");
             }
             write("import ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" = ");
             if (ts.isInternalModuleImportEqualsDeclaration(node)) {
                 emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError);
@@ -28256,7 +29124,7 @@ var ts;
             }
             else {
                 write("require(");
-                writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node));
+                writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 write(");");
             }
             writer.writeLine();
@@ -28279,19 +29147,19 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 1 /* Export */)) {
+            if (!node.importClause && !(node.flags & 2 /* Export */)) {
                 // do not write non-exported import declarations that don't have import clauses
                 return;
             }
             emitJsDocComments(node);
-            if (node.flags & 1 /* Export */) {
+            if (node.flags & 2 /* Export */) {
                 write("export ");
             }
             write("import ");
             if (node.importClause) {
                 var currentWriterPos = writer.getTextPos();
                 if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) {
-                    writeTextOfNode(currentSourceFile, node.importClause.name);
+                    writeTextOfNode(currentText, node.importClause.name);
                 }
                 if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) {
                     if (currentWriterPos !== writer.getTextPos()) {
@@ -28300,7 +29168,7 @@ var ts;
                     }
                     if (node.importClause.namedBindings.kind === 224 /* NamespaceImport */) {
                         write("* as ");
-                        writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name);
+                        writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
                     else {
                         write("{ ");
@@ -28310,16 +29178,28 @@ var ts;
                 }
                 write(" from ");
             }
-            writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+            emitExternalModuleSpecifier(node.moduleSpecifier);
             write(";");
             writer.writeLine();
         }
+        function emitExternalModuleSpecifier(moduleSpecifier) {
+            if (moduleSpecifier.kind === 9 /* StringLiteral */ && (!root) && (compilerOptions.out || compilerOptions.outFile)) {
+                var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent);
+                if (moduleName) {
+                    write("\"");
+                    write(moduleName);
+                    write("\"");
+                    return;
+                }
+            }
+            writeTextOfNode(currentText, moduleSpecifier);
+        }
         function emitImportOrExportSpecifier(node) {
             if (node.propertyName) {
-                writeTextOfNode(currentSourceFile, node.propertyName);
+                writeTextOfNode(currentText, node.propertyName);
                 write(" as ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
         }
         function emitExportSpecifier(node) {
             emitImportOrExportSpecifier(node);
@@ -28341,7 +29221,7 @@ var ts;
             }
             if (node.moduleSpecifier) {
                 write(" from ");
-                writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+                emitExternalModuleSpecifier(node.moduleSpecifier);
             }
             write(";");
             writer.writeLine();
@@ -28349,17 +29229,17 @@ var ts;
         function writeModuleDeclaration(node) {
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 131072 /* Namespace */) {
+            if (node.flags & 65536 /* Namespace */) {
                 write("namespace ");
             }
             else {
                 write("module ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             while (node.body.kind !== 219 /* ModuleBlock */) {
                 node = node.body;
                 write(".");
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
@@ -28378,7 +29258,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("type ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             emitTypeParameters(node.typeParameters);
             write(" = ");
             emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
@@ -28400,7 +29280,7 @@ var ts;
                 write("const ");
             }
             write("enum ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" {");
             writeLine();
             increaseIndent();
@@ -28411,7 +29291,7 @@ var ts;
         }
         function emitEnumMemberDeclaration(node) {
             emitJsDocComments(node);
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var enumMemberValue = resolver.getConstantValue(node);
             if (enumMemberValue !== undefined) {
                 write(" = ");
@@ -28421,14 +29301,14 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 143 /* MethodDeclaration */ && (node.parent.flags & 32 /* Private */);
+            return node.parent.kind === 143 /* MethodDeclaration */ && (node.parent.flags & 16 /* Private */);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
                 increaseIndent();
                 emitJsDocComments(node);
                 decreaseIndent();
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
@@ -28465,7 +29345,7 @@ var ts;
                             break;
                         case 143 /* MethodDeclaration */:
                         case 142 /* MethodSignature */:
-                            if (node.parent.flags & 128 /* Static */) {
+                            if (node.parent.flags & 64 /* Static */) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else if (node.parent.parent.kind === 214 /* ClassDeclaration */) {
@@ -28531,7 +29411,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 112 /* AccessibilityModifier */) {
+                        if (param.flags & 56 /* AccessibilityModifier */) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -28539,11 +29419,11 @@ var ts;
             }
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & 256 /* Abstract */) {
+            if (node.flags & 128 /* Abstract */) {
                 write("abstract ");
             }
             write("class ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -28566,7 +29446,7 @@ var ts;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("interface ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
@@ -28601,7 +29481,7 @@ var ts;
                     // If this node is a computed name, it can only be a symbol, because we've already skipped
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     // If optional property emit ?
                     if ((node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) && ts.hasQuestionToken(node)) {
                         write("?");
@@ -28609,7 +29489,7 @@ var ts;
                     if ((node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) && node.parent.kind === 155 /* TypeLiteral */) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 32 /* Private */)) {
+                    else if (!(node.flags & 16 /* Private */)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
@@ -28624,7 +29504,7 @@ var ts;
                 }
                 else if (node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
-                    if (node.flags & 128 /* Static */) {
+                    if (node.flags & 64 /* Static */) {
                         return symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -28683,7 +29563,7 @@ var ts;
                         emitBindingPattern(bindingElement.name);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, bindingElement.name);
+                        writeTextOfNode(currentText, bindingElement.name);
                         writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError);
                     }
                 }
@@ -28727,8 +29607,8 @@ var ts;
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
                 emitClassMemberDeclarationFlags(node);
-                writeTextOfNode(currentSourceFile, node.name);
-                if (!(node.flags & 32 /* Private */)) {
+                writeTextOfNode(currentText, node.name);
+                if (!(node.flags & 16 /* Private */)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
@@ -28757,7 +29637,7 @@ var ts;
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 146 /* SetAccessor */) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
-                    if (accessorWithTypeAnnotation.parent.flags & 128 /* Static */) {
+                    if (accessorWithTypeAnnotation.parent.flags & 64 /* Static */) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
@@ -28775,7 +29655,7 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 128 /* Static */) {
+                    if (accessorWithTypeAnnotation.flags & 64 /* Static */) {
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                             symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -28813,13 +29693,13 @@ var ts;
                 }
                 if (node.kind === 213 /* FunctionDeclaration */) {
                     write("function ");
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                 }
                 else if (node.kind === 144 /* Constructor */) {
                     write("constructor");
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if (ts.hasQuestionToken(node)) {
                         write("?");
                     }
@@ -28862,7 +29742,7 @@ var ts;
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 144 /* Constructor */ && !(node.flags & 32 /* Private */)) {
+            else if (node.kind !== 144 /* Constructor */ && !(node.flags & 16 /* Private */)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -28893,7 +29773,7 @@ var ts;
                         break;
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
-                        if (node.flags & 128 /* Static */) {
+                        if (node.flags & 64 /* Static */) {
                             diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -28943,7 +29823,7 @@ var ts;
                 emitBindingPattern(node.name);
             }
             else {
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             if (resolver.isOptionalParameter(node)) {
                 write("?");
@@ -28954,7 +29834,7 @@ var ts;
                 node.parent.parent.kind === 155 /* TypeLiteral */) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 32 /* Private */)) {
+            else if (!(node.parent.flags & 16 /* Private */)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
             function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
@@ -28985,7 +29865,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
-                        if (node.parent.flags & 128 /* Static */) {
+                        if (node.parent.flags & 64 /* Static */) {
                             return symbolAccesibilityResult.errorModuleName ?
                                 symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -29058,7 +29938,7 @@ var ts;
                         // Example:
                         //      original: function foo({y: [a,b,c]}) {}
                         //      emit    : declare function foo({y: [a, b, c]}: { y: [any, any, any] }) void;
-                        writeTextOfNode(currentSourceFile, bindingElement.propertyName);
+                        writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
                     }
                     if (bindingElement.name) {
@@ -29081,7 +29961,7 @@ var ts;
                             if (bindingElement.dotDotDotToken) {
                                 write("...");
                             }
-                            writeTextOfNode(currentSourceFile, bindingElement.name);
+                            writeTextOfNode(currentText, bindingElement.name);
                         }
                     }
                 }
@@ -29127,7 +30007,7 @@ var ts;
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 8192 /* DeclarationFile */
+            var declFileName = referencedFile.flags & 4096 /* DeclarationFile */
                 ? referencedFile.fileName // Declaration file, use declaration file name
                 : ts.shouldEmitToOwnFile(referencedFile, compilerOptions)
                     ? ts.getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file
@@ -29173,6 +30053,24 @@ var ts;
         return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile);
     }
     ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile;
+    function getResolvedExternalModuleName(host, file) {
+        return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || ts.isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
+    var Jump;
+    (function (Jump) {
+        Jump[Jump["Break"] = 2] = "Break";
+        Jump[Jump["Continue"] = 4] = "Continue";
+        Jump[Jump["Return"] = 8] = "Return";
+    })(Jump || (Jump = {}));
     var entities = {
         "quot": 0x0022,
         "amp": 0x0026,
@@ -29454,15 +30352,19 @@ var ts;
         var newLine = host.getNewLine();
         var jsxDesugaring = host.getCompilerOptions().jsx !== 1 /* Preserve */;
         var shouldEmitJsx = function (s) { return (s.languageVariant === 1 /* JSX */ && !jsxDesugaring); };
+        var outFile = compilerOptions.outFile || compilerOptions.out;
+        var emitJavaScript = createFileEmitter();
         if (targetSourceFile === undefined) {
-            ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
-                    var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
-                    emitFile(jsFilePath, sourceFile);
-                }
-            });
-            if (compilerOptions.outFile || compilerOptions.out) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            if (outFile) {
+                emitFile(outFile);
+            }
+            else {
+                ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                    if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) {
+                        var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
+                        emitFile(jsFilePath, sourceFile);
+                    }
+                });
             }
         }
         else {
@@ -29471,8 +30373,8 @@ var ts;
                 var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
                 emitFile(jsFilePath, targetSourceFile);
             }
-            else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            else if (!ts.isDeclarationFile(targetSourceFile) && outFile) {
+                emitFile(outFile);
             }
         }
         // Sort and make the unique list of diagnostics
@@ -29482,16 +30384,8 @@ var ts;
             diagnostics: diagnostics,
             sourceMaps: sourceMapDataList
         };
-        function isNodeDescendentOf(node, ancestor) {
-            while (node) {
-                if (node === ancestor)
-                    return true;
-                node = node.parent;
-            }
-            return false;
-        }
         function isUniqueLocalName(name, container) {
-            for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
+            for (var node = container; ts.isNodeDescendentOf(node, container); node = node.nextContainer) {
                 if (node.locals && ts.hasProperty(node.locals, name)) {
                     // We conservatively include alias symbols to cover cases where they're emitted as locals
                     if (node.locals[name].flags & (107455 /* Value */ | 1048576 /* ExportValue */ | 8388608 /* Alias */)) {
@@ -29501,10 +30395,47 @@ var ts;
             }
             return true;
         }
-        function emitJavaScript(jsFilePath, root) {
+        function setLabeledJump(state, isBreak, labelText, labelMarker) {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = {};
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = {};
+                }
+                state.labeledNonLocalContinues[labelText] = labelMarker;
+            }
+        }
+        function hoistVariableDeclarationFromLoop(state, declaration) {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+            visit(declaration.name);
+            function visit(node) {
+                if (node.kind === 69 /* Identifier */) {
+                    state.hoistedLocalVariables.push(node);
+                }
+                else {
+                    for (var _a = 0, _b = node.elements; _a < _b.length; _a++) {
+                        var element = _b[_a];
+                        visit(element.name);
+                    }
+                }
+            }
+        }
+        function createFileEmitter() {
             var writer = ts.createTextWriter(newLine);
             var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent;
             var currentSourceFile;
+            var currentText;
+            var currentLineMap;
+            var currentFileIdentifiers;
+            var renamedDependencies;
+            var isEs6Module;
+            var isCurrentFileExternalModule;
             // name of an exporter function if file is a System external module
             // System.register([...], function (<exporter>) {...})
             // exporting in System modules looks like:
@@ -29512,14 +30443,15 @@ var ts;
             // =>
             // var x;... exporter("x", x = 1)
             var exportFunctionForFile;
-            var generatedNameSet = {};
-            var nodeToGeneratedName = [];
+            var generatedNameSet;
+            var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
-            var extendsEmitted = false;
-            var decorateEmitted = false;
-            var paramEmitted = false;
-            var awaiterEmitted = false;
-            var tempFlags = 0;
+            var convertedLoopState;
+            var extendsEmitted;
+            var decorateEmitted;
+            var paramEmitted;
+            var awaiterEmitted;
+            var tempFlags;
             var tempVariables;
             var tempParameters;
             var externalImports;
@@ -29551,6 +30483,8 @@ var ts;
             var scopeEmitEnd = function () { };
             /** Sourcemap data that will get encoded */
             var sourceMapData;
+            /** The root file passed to the emit function (if present) */
+            var root;
             /** If removeComments is true, no leading-comments needed to be emitted **/
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var moduleEmitDelegates = (_a = {},
@@ -29561,31 +30495,77 @@ var ts;
                 _a[1 /* CommonJS */] = emitCommonJSModule,
                 _a
             );
-            if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
-                initializeEmitterWithSourceMaps();
-            }
-            if (root) {
-                // Do not call emit directly. It does not set the currentSourceFile.
-                emitSourceFile(root);
-            }
-            else {
-                ts.forEach(host.getSourceFiles(), function (sourceFile) {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emitSourceFile(sourceFile);
+            var bundleEmitDelegates = (_b = {},
+                _b[5 /* ES6 */] = function () { },
+                _b[2 /* AMD */] = emitAMDModule,
+                _b[4 /* System */] = emitSystemModule,
+                _b[3 /* UMD */] = function () { },
+                _b[1 /* CommonJS */] = function () { },
+                _b
+            );
+            return doEmit;
+            function doEmit(jsFilePath, rootFile) {
+                // reset the state
+                writer.reset();
+                currentSourceFile = undefined;
+                currentText = undefined;
+                currentLineMap = undefined;
+                exportFunctionForFile = undefined;
+                generatedNameSet = {};
+                nodeToGeneratedName = [];
+                computedPropertyNamesToGeneratedNames = undefined;
+                convertedLoopState = undefined;
+                extendsEmitted = false;
+                decorateEmitted = false;
+                paramEmitted = false;
+                awaiterEmitted = false;
+                tempFlags = 0;
+                tempVariables = undefined;
+                tempParameters = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStars = undefined;
+                detachedCommentsInfo = undefined;
+                sourceMapData = undefined;
+                isEs6Module = false;
+                renamedDependencies = undefined;
+                isCurrentFileExternalModule = false;
+                root = rootFile;
+                if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
+                    initializeEmitterWithSourceMaps(jsFilePath, root);
+                }
+                if (root) {
+                    // Do not call emit directly. It does not set the currentSourceFile.
+                    emitSourceFile(root);
+                }
+                else {
+                    if (modulekind) {
+                        ts.forEach(host.getSourceFiles(), emitEmitHelpers);
                     }
-                });
+                    ts.forEach(host.getSourceFiles(), function (sourceFile) {
+                        if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) {
+                            emitSourceFile(sourceFile);
+                        }
+                    });
+                }
+                writeLine();
+                writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
             }
-            writeLine();
-            writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM);
-            return;
             function emitSourceFile(sourceFile) {
                 currentSourceFile = sourceFile;
+                currentText = sourceFile.text;
+                currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
+                renamedDependencies = sourceFile.renamedDependencies;
+                currentFileIdentifiers = sourceFile.identifiers;
+                isCurrentFileExternalModule = ts.isExternalModule(sourceFile);
                 emit(sourceFile);
             }
             function isUniqueName(name) {
                 return !resolver.hasGlobalName(name) &&
-                    !ts.hasProperty(currentSourceFile.identifiers, name) &&
+                    !ts.hasProperty(currentFileIdentifiers, name) &&
                     !ts.hasProperty(generatedNameSet, name);
             }
             // Return the next available name in the pattern _a ... _z, _0, _1, ...
@@ -29668,7 +30648,7 @@ var ts;
                 var id = ts.getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
-            function initializeEmitterWithSourceMaps() {
+            function initializeEmitterWithSourceMaps(jsFilePath, root) {
                 var sourceMapDir; // The directory in which sourcemap will be
                 // Current source map file and its index in the sources list
                 var sourceMapSourceIndex = -1;
@@ -29756,7 +30736,7 @@ var ts;
                     }
                 }
                 function recordSourceMapSpan(pos) {
-                    var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos);
+                    var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos);
                     // Convert the location to be one-based.
                     sourceLinePos.line++;
                     sourceLinePos.character++;
@@ -29790,13 +30770,13 @@ var ts;
                 }
                 function recordEmitNodeStartSpan(node) {
                     // Get the token pos after skipping to the token (ignoring the leading trivia)
-                    recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos));
+                    recordSourceMapSpan(ts.skipTrivia(currentText, node.pos));
                 }
                 function recordEmitNodeEndSpan(node) {
                     recordSourceMapSpan(node.end);
                 }
                 function writeTextWithSpanRecord(tokenKind, startPos, emitFn) {
-                    var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
+                    var tokenStartPos = ts.skipTrivia(currentText, startPos);
                     recordSourceMapSpan(tokenStartPos);
                     var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
                     recordSourceMapSpan(tokenEndPos);
@@ -29878,9 +30858,9 @@ var ts;
                     sourceMapNameIndices.pop();
                 }
                 ;
-                function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) {
+                function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) {
                     recordSourceMapSpan(comment.pos);
-                    ts.writeCommentRange(currentSourceFile, writer, comment, newLine);
+                    ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine);
                     recordSourceMapSpan(comment.end);
                 }
                 function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) {
@@ -29910,7 +30890,7 @@ var ts;
                         return output;
                     }
                 }
-                function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) {
+                function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) {
                     encodeLastRecordedSourceMapSpan();
                     var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent);
                     sourceMapDataList.push(sourceMapData);
@@ -29926,7 +30906,7 @@ var ts;
                         sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL;
                     }
                     // Write sourcemap url to the js file and write the js file
-                    writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark);
+                    writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark);
                 }
                 // Initialize source map data
                 var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath));
@@ -29998,7 +30978,7 @@ var ts;
                 scopeEmitEnd = recordScopeNameEnd;
                 writeComment = writeCommentRangeWithMap;
             }
-            function writeJavaScriptFile(emitOutput, writeByteOrderMark) {
+            function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) {
                 ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
             // Create a temporary variable with a unique unused name.
@@ -30178,7 +31158,7 @@ var ts;
                 // If we don't need to downlevel and we can reach the original source text using
                 // the node's parent reference, then simply get the text as it was originally written.
                 if (node.parent) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                    return ts.getTextOfNodeFromSourceText(currentText, node);
                 }
                 // If we can't reach the original source text, use the canonical form if it's a number,
                 // or an escaped quoted form of the original text if it's string-like.
@@ -30205,7 +31185,7 @@ var ts;
                 // Find original source text, since we need to emit the raw strings of the tagged template.
                 // The raw strings contain the (escaped) strings of what the user wrote.
                 // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-                var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                var text = ts.getTextOfNodeFromSourceText(currentText, node);
                 // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
                 // thus we need to remove those characters.
                 // First template piece starts with "`", others with "}"
@@ -30622,7 +31602,7 @@ var ts;
                         write(node.text);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, node);
+                        writeTextOfNode(currentText, node);
                     }
                     write("\"");
                 }
@@ -30708,41 +31688,45 @@ var ts;
                         write(".");
                     }
                 }
-                else if (modulekind !== 5 /* ES6 */) {
-                    var declaration = resolver.getReferencedImportDeclaration(node);
-                    if (declaration) {
-                        if (declaration.kind === 223 /* ImportClause */) {
-                            // Identifier references default import
-                            write(getGeneratedNameForNode(declaration.parent));
-                            write(languageVersion === 0 /* ES3 */ ? "[\"default\"]" : ".default");
-                            return;
-                        }
-                        else if (declaration.kind === 226 /* ImportSpecifier */) {
-                            // Identifier references named import
-                            write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                            var name_23 = declaration.propertyName || declaration.name;
-                            var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_23);
-                            if (languageVersion === 0 /* ES3 */ && identifier === "default") {
-                                write("[\"default\"]");
+                else {
+                    if (modulekind !== 5 /* ES6 */) {
+                        var declaration = resolver.getReferencedImportDeclaration(node);
+                        if (declaration) {
+                            if (declaration.kind === 223 /* ImportClause */) {
+                                // Identifier references default import
+                                write(getGeneratedNameForNode(declaration.parent));
+                                write(languageVersion === 0 /* ES3 */ ? "[\"default\"]" : ".default");
+                                return;
                             }
-                            else {
-                                write(".");
-                                write(identifier);
+                            else if (declaration.kind === 226 /* ImportSpecifier */) {
+                                // Identifier references named import
+                                write(getGeneratedNameForNode(declaration.parent.parent.parent));
+                                var name_23 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_23);
+                                if (languageVersion === 0 /* ES3 */ && identifier === "default") {
+                                    write("[\"default\"]");
+                                }
+                                else {
+                                    write(".");
+                                    write(identifier);
+                                }
+                                return;
                             }
-                            return;
                         }
                     }
-                    declaration = resolver.getReferencedNestedRedeclaration(node);
-                    if (declaration) {
-                        write(getGeneratedNameForNode(declaration.name));
-                        return;
+                    if (languageVersion !== 2 /* ES6 */) {
+                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                        if (declaration) {
+                            write(getGeneratedNameForNode(declaration.name));
+                            return;
+                        }
                     }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function isNameOfNestedRedeclaration(node) {
@@ -30759,6 +31743,14 @@ var ts;
                 return false;
             }
             function emitIdentifier(node) {
+                if (convertedLoopState) {
+                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
+                        // in converted loop body arguments cannot be used directly.
+                        var name_24 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_24);
+                        return;
+                    }
+                }
                 if (!node.parent) {
                     write(node.text);
                 }
@@ -30772,7 +31764,7 @@ var ts;
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
             function emitThis(node) {
@@ -30933,7 +31925,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ (node.flags & 2048 /* MultiLine */) !== 0, 
+                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ (node.flags & 1024 /* MultiLine */) !== 0, 
                     /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true);
                 }
             }
@@ -30952,7 +31944,7 @@ var ts;
                         emitLinePreservingList(node, properties, /* allowTrailingComma */ languageVersion >= 1 /* ES5 */, /* spacesBetweenBraces */ true);
                     }
                     else {
-                        var multiLine = (node.flags & 2048 /* MultiLine */) !== 0;
+                        var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -30971,7 +31963,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 2048 /* MultiLine */) !== 0;
+                var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -31176,7 +32168,7 @@ var ts;
             function emitShorthandPropertyAssignment(node) {
                 // The name property of a short-hand property assignment is considered an expression position, so here
                 // we manually emit the identifier to avoid rewriting.
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier,
                 // we emit a normal property assignment. For example:
                 //   module m {
@@ -31186,7 +32178,7 @@ var ts;
                 //       let obj = { y };
                 //   }
                 // Here we need to emit obj = { y : m.y } regardless of the output target.
-                if (languageVersion < 2 /* ES6 */ || isNamespaceExportReference(node.name)) {
+                if (modulekind !== 5 /* ES6 */ || isNamespaceExportReference(node.name)) {
                     // Emit identifier as an identifier
                     write(": ");
                     emit(node.name);
@@ -31243,11 +32235,11 @@ var ts;
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 // 1 .toString is a valid property access, emit a space after the literal
                 // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal
-                var shouldEmitSpace;
+                var shouldEmitSpace = false;
                 if (!indentedBeforeDot) {
                     if (node.expression.kind === 8 /* NumericLiteral */) {
                         // check if numeric literal was originally written with a dot
-                        var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression);
+                        var text = ts.getTextOfNodeFromSourceText(currentText, node.expression);
                         shouldEmitSpace = text.indexOf(ts.tokenToString(21 /* DotToken */)) < 0;
                     }
                     else {
@@ -31594,13 +32586,13 @@ var ts;
              *   we we emit variable statement 'var' should be dropped.
              */
             function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
-                if (!node || languageVersion >= 2 /* ES6 */ || !isCurrentFileSystemExternalModule()) {
+                if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
                 var current = node;
                 while (current) {
                     if (current.kind === 248 /* SourceFile */) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1 /* Export */) !== 0);
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2 /* Export */) !== 0);
                     }
                     else if (ts.isFunctionLike(current) || current.kind === 219 /* ModuleBlock */) {
                         return false;
@@ -31797,8 +32789,16 @@ var ts;
                 }
             }
             function emitDoStatement(node) {
+                emitLoop(node, emitDoStatementWorker);
+            }
+            function emitDoStatementWorker(node, loop) {
                 write("do");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
                 if (node.statement.kind === 192 /* Block */) {
                     write(" ");
                 }
@@ -31810,10 +32810,18 @@ var ts;
                 write(");");
             }
             function emitWhileStatement(node) {
+                emitLoop(node, emitWhileStatementWorker);
+            }
+            function emitWhileStatementWorker(node, loop) {
                 write("while (");
                 emit(node.expression);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
             }
             /**
              * Returns true if start of variable declaration list was emitted.
@@ -31825,6 +32833,15 @@ var ts;
                     // variables in variable declaration list were already hoisted
                     return false;
                 }
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576 /* BlockScoped */) === 0) {
+                    // we are inside a converted loop - this can only happen in downlevel scenarios 
+                    // record names for all variable declarations
+                    for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
+                        var varDecl = _b[_a];
+                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
+                    }
+                    return false;
+                }
                 var tokenKind = 102 /* VarKeyword */;
                 if (decl && languageVersion >= 2 /* ES6 */) {
                     if (ts.isLet(decl)) {
@@ -31870,7 +32887,253 @@ var ts;
                 }
                 return started;
             }
+            function shouldConvertLoopBody(node) {
+                return languageVersion < 2 /* ES6 */ &&
+                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithBlockScopedBindingCapturedInFunction */) !== 0;
+            }
+            function emitLoop(node, loopEmitter) {
+                var shouldConvert = shouldConvertLoopBody(node);
+                if (!shouldConvert) {
+                    loopEmitter(node, /* convertedLoop*/ undefined);
+                }
+                else {
+                    var loop = convertLoopBody(node);
+                    if (node.parent.kind === 207 /* LabeledStatement */) {
+                        // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
+                        emitLabelAndColon(node.parent);
+                    }
+                    loopEmitter(node, loop);
+                }
+            }
+            function convertLoopBody(node) {
+                var functionName = makeUniqueName("_loop");
+                var loopInitializer;
+                switch (node.kind) {
+                    case 199 /* ForStatement */:
+                    case 200 /* ForInStatement */:
+                    case 201 /* ForOfStatement */:
+                        if (node.initializer.kind === 212 /* VariableDeclarationList */) {
+                            loopInitializer = node.initializer;
+                        }
+                        break;
+                }
+                var loopParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576 /* BlockScoped */)) {
+                    // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
+                    loopParameters = [];
+                    for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
+                        var varDeclaration = _b[_a];
+                        collectNames(varDeclaration.name);
+                    }
+                }
+                var bodyIsBlock = node.statement.kind === 192 /* Block */;
+                var paramList = loopParameters ? loopParameters.join(", ") : "";
+                writeLine();
+                write("var " + functionName + " = function(" + paramList + ")");
+                if (!bodyIsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                var convertedOuterLoopState = convertedLoopState;
+                convertedLoopState = {};
+                if (convertedOuterLoopState) {
+                    // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
+                    // if outer converted loop has already accumulated some state - pass it through
+                    if (convertedOuterLoopState.argumentsName) {
+                        // outer loop has already used 'arguments' so we've already have some name to alias it
+                        // use the same name in all nested loops
+                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
+                    }
+                    if (convertedOuterLoopState.hoistedLocalVariables) {
+                        // we've already collected some non-block scoped variable declarations in enclosing loop
+                        // use the same storage in nested loop
+                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
+                    }
+                }
+                emitEmbeddedStatement(node.statement);
+                if (!bodyIsBlock) {
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                write(";");
+                writeLine();
+                if (convertedLoopState.argumentsName) {
+                    // if alias for arguments is set
+                    if (convertedOuterLoopState) {
+                        // pass it to outer converted loop
+                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
+                    }
+                    else {
+                        // this is top level converted loop and we need to create an alias for 'arguments' object
+                        write("var " + convertedLoopState.argumentsName + " = arguments;");
+                        writeLine();
+                    }
+                }
+                if (convertedLoopState.hoistedLocalVariables) {
+                    // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
+                    if (convertedOuterLoopState) {
+                        // pass them to outer converted loop
+                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
+                    }
+                    else {
+                        // deduplicate and hoist collected variable declarations
+                        write("var ");
+                        var seen;
+                        for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
+                            var id = _d[_c];
+                            // Don't initialize seen unless we have at least one element.
+                            // Emit a comma to separate for all but the first element.
+                            if (!seen) {
+                                seen = {};
+                            }
+                            else {
+                                write(", ");
+                            }
+                            if (!ts.hasProperty(seen, id.text)) {
+                                emit(id);
+                                seen[id.text] = id.text;
+                            }
+                        }
+                        write(";");
+                        writeLine();
+                    }
+                }
+                var currentLoopState = convertedLoopState;
+                convertedLoopState = convertedOuterLoopState;
+                return { functionName: functionName, paramList: paramList, state: currentLoopState };
+                function collectNames(name) {
+                    if (name.kind === 69 /* Identifier */) {
+                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        loopParameters.push(nameText);
+                    }
+                    else {
+                        for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
+                            var element = _b[_a];
+                            collectNames(element.name);
+                        }
+                    }
+                }
+            }
+            function emitNormalLoopBody(node, emitAsEmbeddedStatement) {
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    // we get here if we are trying to emit normal loop loop inside converted loop
+                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
+                }
+                if (emitAsEmbeddedStatement) {
+                    emitEmbeddedStatement(node.statement);
+                }
+                else if (node.statement.kind === 192 /* Block */) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+            }
+            function emitConvertedLoopCall(loop, emitAsBlock) {
+                if (emitAsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+                // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
+                // simple loops are emitted as just 'loop()';
+                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                    !loop.state.labeledNonLocalBreaks &&
+                    !loop.state.labeledNonLocalContinues;
+                var loopResult = makeUniqueName("state");
+                if (!isSimpleLoop) {
+                    write("var " + loopResult + " = ");
+                }
+                write(loop.functionName + "(" + loop.paramList + ");");
+                if (!isSimpleLoop) {
+                    // for non simple loops we need to store result returned from converted loop function and use it to do dispatching
+                    // converted loop function can return:
+                    // - object - used when body of the converted loop contains return statement. Property "value" of this object stores retuned value
+                    // - string - used to dispatch jumps. "break" and "continue" are used to non-labeled jumps, other values are used to transfer control to
+                    //   different labels
+                    writeLine();
+                    if (loop.state.nonLocalJumps & 8 /* Return */) {
+                        write("if (typeof " + loopResult + " === \"object\") ");
+                        if (convertedLoopState) {
+                            // we are currently nested in another converted loop - return unwrapped result
+                            write("return " + loopResult + ";");
+                            // propagate 'hasReturn' flag to outer loop
+                            convertedLoopState.nonLocalJumps |= 8 /* Return */;
+                        }
+                        else {
+                            // top level converted loop - return unwrapped value
+                            write("return " + loopResult + ".value");
+                        }
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 2 /* Break */) {
+                        write("if (" + loopResult + " === \"break\") break;");
+                        writeLine();
+                    }
+                    if (loop.state.nonLocalJumps & 4 /* Continue */) {
+                        write("if (" + loopResult + " === \"continue\") continue;");
+                        writeLine();
+                    }
+                    // in case of labeled breaks emit code that either breaks to some known label inside outer loop or delegates jump decision to outer loop
+                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
+                }
+                if (emitAsBlock) {
+                    writeLine();
+                    decreaseIndent();
+                    write("}");
+                }
+                function emitDispatchTableForLabeledJumps(loopResultVariable, currentLoop, outerLoop) {
+                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
+                        return;
+                    }
+                    write("switch(" + loopResultVariable + ") {");
+                    increaseIndent();
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /* isBreak */ true, loopResultVariable, outerLoop);
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /* isBreak */ false, loopResultVariable, outerLoop);
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                function emitDispatchEntriesForLabeledJumps(table, isBreak, loopResultVariable, outerLoop) {
+                    if (!table) {
+                        return;
+                    }
+                    for (var labelText in table) {
+                        var labelMarker = table[labelText];
+                        writeLine();
+                        write("case \"" + labelMarker + "\": ");
+                        // if there are no outer converted loop or outer label in question is located inside outer converted loop
+                        // then emit labeled break\continue
+                        // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do  
+                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
+                            if (isBreak) {
+                                write("break ");
+                            }
+                            else {
+                                write("continue ");
+                            }
+                            write(labelText + ";");
+                        }
+                        else {
+                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                            write("return " + loopResultVariable + ";");
+                        }
+                    }
+                }
+            }
             function emitForStatement(node) {
+                emitLoop(node, emitForStatementWorker);
+            }
+            function emitForStatementWorker(node, loop) {
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
@@ -31892,12 +33155,22 @@ var ts;
                 write(";");
                 emitOptional(" ", node.incrementor);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
             }
             function emitForInOrForOfStatement(node) {
                 if (languageVersion < 2 /* ES6 */ && node.kind === 201 /* ForOfStatement */) {
-                    return emitDownLevelForOfStatement(node);
+                    emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
+                else {
+                    emitLoop(node, emitForInOrForOfStatementWorker);
+                }
+            }
+            function emitForInOrForOfStatementWorker(node, loop) {
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
@@ -31919,9 +33192,17 @@ var ts;
                 }
                 emit(node.expression);
                 emitToken(18 /* CloseParenToken */, node.expression.end);
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true);
+                }
             }
             function emitDownLevelForOfStatement(node) {
+                emitLoop(node, emitDownLevelForOfStatementWorker);
+            }
+            function emitDownLevelForOfStatementWorker(node, loop) {
                 // The following ES6 code:
                 //
                 //    for (let v of expr) { }
@@ -31952,10 +33233,12 @@ var ts;
                 //
                 //     for (let v of arr) { }
                 //
-                // we don't want to emit a temporary variable for the RHS, just use it directly.
-                var rhsIsIdentifier = node.expression.kind === 69 /* Identifier */;
+                // we can't reuse 'arr' because it might be modified within the body of the loop.
                 var counter = createTempVariable(268435456 /* _i */);
-                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(0 /* Auto */);
+                var rhsReference = ts.createSynthesizedNode(69 /* Identifier */);
+                rhsReference.text = node.expression.kind === 69 /* Identifier */ ?
+                    makeUniqueName(node.expression.text) :
+                    makeTempVariableName(0 /* Auto */);
                 // This is the let keyword for the counter and rhsReference. The let keyword for
                 // the LHS will be emitted inside the body.
                 emitStart(node.expression);
@@ -31964,15 +33247,13 @@ var ts;
                 emitNodeWithoutSourceMap(counter);
                 write(" = 0");
                 emitEnd(node.expression);
-                if (!rhsIsIdentifier) {
-                    // , _a = expr
-                    write(", ");
-                    emitStart(node.expression);
-                    emitNodeWithoutSourceMap(rhsReference);
-                    write(" = ");
-                    emitNodeWithoutSourceMap(node.expression);
-                    emitEnd(node.expression);
-                }
+                // , _a = expr
+                write(", ");
+                emitStart(node.expression);
+                emitNodeWithoutSourceMap(rhsReference);
+                write(" = ");
+                emitNodeWithoutSourceMap(node.expression);
+                emitEnd(node.expression);
                 write("; ");
                 // _i < _a.length;
                 emitStart(node.initializer);
@@ -32037,23 +33318,69 @@ var ts;
                 }
                 emitEnd(node.initializer);
                 write(";");
-                if (node.statement.kind === 192 /* Block */) {
-                    emitLines(node.statement.statements);
+                if (loop) {
+                    writeLine();
+                    emitConvertedLoopCall(loop, /* emitAsBlock */ false);
                 }
                 else {
-                    writeLine();
-                    emit(node.statement);
+                    emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ false);
                 }
                 writeLine();
                 decreaseIndent();
                 write("}");
             }
             function emitBreakOrContinueStatement(node) {
+                if (convertedLoopState) {
+                    // check if we can emit break\continue as is
+                    // it is possible if either
+                    //   - break\continue is statement labeled and label is located inside the converted loop
+                    //   - break\continue is non-labeled and located in non-converted loop\switch statement
+                    var jump = node.kind === 203 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                    var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
+                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+                    if (!canUseBreakOrContinue) {
+                        if (!node.label) {
+                            if (node.kind === 203 /* BreakStatement */) {
+                                convertedLoopState.nonLocalJumps |= 2 /* Break */;
+                                write("return \"break\";");
+                            }
+                            else {
+                                convertedLoopState.nonLocalJumps |= 4 /* Continue */;
+                                write("return \"continue\";");
+                            }
+                        }
+                        else {
+                            var labelMarker;
+                            if (node.kind === 203 /* BreakStatement */) {
+                                labelMarker = "break-" + node.label.text;
+                                setLabeledJump(convertedLoopState, /* isBreak */ true, node.label.text, labelMarker);
+                            }
+                            else {
+                                labelMarker = "continue-" + node.label.text;
+                                setLabeledJump(convertedLoopState, /* isBreak */ false, node.label.text, labelMarker);
+                            }
+                            write("return \"" + labelMarker + "\";");
+                        }
+                        return;
+                    }
+                }
                 emitToken(node.kind === 203 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
             function emitReturnStatement(node) {
+                if (convertedLoopState) {
+                    convertedLoopState.nonLocalJumps |= 8 /* Return */;
+                    write("return { value: ");
+                    if (node.expression) {
+                        emit(node.expression);
+                    }
+                    else {
+                        write("void 0");
+                    }
+                    write(" };");
+                    return;
+                }
                 emitToken(94 /* ReturnKeyword */, node.pos);
                 emitOptional(" ", node.expression);
                 write(";");
@@ -32071,7 +33398,16 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(18 /* CloseParenToken */, node.expression.end);
                 write(" ");
+                var saveAllowedNonLabeledJumps;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    // for switch statement allow only non-labeled break
+                    convertedLoopState.allowedNonLabeledJumps |= 2 /* Break */;
+                }
                 emitCaseBlock(node.caseBlock, endPos);
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
             }
             function emitCaseBlock(node, startPos) {
                 emitToken(15 /* OpenBraceToken */, startPos);
@@ -32082,16 +33418,16 @@ var ts;
                 emitToken(16 /* CloseBraceToken */, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, node2.end);
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return ts.getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
                 if (node.kind === 241 /* CaseClause */) {
@@ -32141,10 +33477,24 @@ var ts;
                 emitToken(76 /* DebuggerKeyword */, node.pos);
                 write(";");
             }
-            function emitLabelledStatement(node) {
+            function emitLabelAndColon(node) {
                 emit(node.label);
                 write(": ");
+            }
+            function emitLabeledStatement(node) {
+                if (!ts.isIterationStatement(node.statement, /* lookInLabeledStatements */ false) || !shouldConvertLoopBody(node.statement)) {
+                    emitLabelAndColon(node);
+                }
+                if (convertedLoopState) {
+                    if (!convertedLoopState.labels) {
+                        convertedLoopState.labels = {};
+                    }
+                    convertedLoopState.labels[node.label.text] = node.label.text;
+                }
                 emit(node.statement);
+                if (convertedLoopState) {
+                    convertedLoopState.labels[node.label.text] = undefined;
+                }
             }
             function getContainingModule(node) {
                 do {
@@ -32158,7 +33508,7 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 1 /* Export */) {
+                if (ts.getCombinedNodeFlags(node) & 2 /* Export */) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
@@ -32180,10 +33530,10 @@ var ts;
             }
             function emitEs6ExportDefaultCompat(node) {
                 if (node.parent.kind === 248 /* SourceFile */) {
-                    ts.Debug.assert(!!(node.flags & 1024 /* Default */) || node.kind === 227 /* ExportAssignment */);
+                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 227 /* ExportAssignment */);
                     // only allow export default at a source file level
                     if (modulekind === 1 /* CommonJS */ || modulekind === 2 /* AMD */ || modulekind === 3 /* UMD */) {
-                        if (!currentSourceFile.symbol.exports["___esModule"]) {
+                        if (!isEs6Module) {
                             if (languageVersion === 1 /* ES5 */) {
                                 // default value of configurable, enumerable, writable are `false`.
                                 write("Object.defineProperty(exports, \"__esModule\", { value: true });");
@@ -32198,7 +33548,7 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     writeLine();
                     emitStart(node);
                     // emit call to exporter only for top level nodes
@@ -32206,7 +33556,7 @@ var ts;
                         // emit export default <smth> as
                         // export("default", <smth>)
                         write(exportFunctionForFile + "(\"");
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             write("default");
                         }
                         else {
@@ -32217,7 +33567,7 @@ var ts;
                         write(")");
                     }
                     else {
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0 /* ES3 */) {
                                 write("exports[\"default\"]");
@@ -32321,7 +33671,7 @@ var ts;
                 // because actual variable declarations are hoisted
                 var canDefineTempVariablesInPlace = false;
                 if (root.kind === 211 /* VariableDeclaration */) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 1 /* Export */;
+                    var isExported = ts.getCombinedNodeFlags(root) & 2 /* Export */;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
@@ -32378,14 +33728,20 @@ var ts;
                     return node;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
-                    // We create a synthetic copy of the identifier in order to avoid the rewriting that might
-                    // otherwise occur when the identifier is emitted.
-                    var syntheticName = ts.createSynthesizedNode(propName.kind);
-                    syntheticName.text = propName.text;
-                    if (syntheticName.kind !== 69 /* Identifier */) {
-                        return createElementAccessExpression(object, syntheticName);
+                    var index;
+                    var nameIsComputed = propName.kind === 136 /* ComputedPropertyName */;
+                    if (nameIsComputed) {
+                        index = ensureIdentifier(propName.expression, /* reuseIdentifierExpression */ false);
                     }
-                    return createPropertyAccessExpression(object, syntheticName);
+                    else {
+                        // We create a synthetic copy of the identifier in order to avoid the rewriting that might
+                        // otherwise occur when the identifier is emitted.
+                        index = ts.createSynthesizedNode(propName.kind);
+                        index.text = propName.text;
+                    }
+                    return !nameIsComputed && index.kind === 69 /* Identifier */
+                        ? createPropertyAccessExpression(object, index)
+                        : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
                     var call = ts.createSynthesizedNode(168 /* CallExpression */);
@@ -32403,8 +33759,8 @@ var ts;
                         // to ensure value is evaluated exactly once.
                         value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true);
                     }
-                    for (var _a = 0; _a < properties.length; _a++) {
-                        var p = properties[_a];
+                    for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
+                        var p = properties_5[_a];
                         if (p.kind === 245 /* PropertyAssignment */ || p.kind === 246 /* ShorthandPropertyAssignment */) {
                             var propName = p.name;
                             var target_1 = p.kind === 246 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
@@ -32538,10 +33894,10 @@ var ts;
                         // for (...) { var <some-uniqie-name> = void 0; }
                         // this is necessary to preserve ES6 semantic in scenarios like
                         // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 16384 /* BlockScopedBindingInLoop */) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 16384 /* Let */);
+                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384 /* BlockScopedBindingInLoop */) &&
+                            (getCombinedFlagsForIdentifier(node.name) & 8192 /* Let */);
                         // NOTE: default initialization should not be added to let bindings in for-in\for-of statements
-                        if (isUninitializedLet &&
+                        if (isLetDefinedInLoop &&
                             node.parent.parent.kind !== 200 /* ForInStatement */ &&
                             node.parent.parent.kind !== 201 /* ForOfStatement */) {
                             initializer = createVoidZero();
@@ -32579,13 +33935,13 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 1 /* Export */) &&
+                return !!(node.flags & 2 /* Export */) &&
                     modulekind === 5 /* ES6 */ &&
                     node.parent.kind === 248 /* SourceFile */;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 1 /* Export */) {
+                if (node.flags & 2 /* Export */) {
                     if (isES6ExportedDeclaration(node)) {
                         // Exported ES6 module member
                         write("export ");
@@ -32612,7 +33968,7 @@ var ts;
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
                 // If we're not exporting the variables, there's nothing special here.
                 // Always emit comments for these nodes.
-                if (!(node.flags & 1 /* Export */)) {
+                if (!(node.flags & 2 /* Export */)) {
                     return true;
                 }
                 // If we are exporting, but it's a top-level ES6 module exports,
@@ -32632,12 +33988,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2 /* ES6 */) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_24 = createTempVariable(0 /* Auto */);
+                        var name_25 = createTempVariable(0 /* Auto */);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_24);
-                        emit(name_24);
+                        tempParameters.push(name_25);
+                        emit(name_25);
                     }
                     else {
                         emit(node.name);
@@ -32795,7 +34151,7 @@ var ts;
                 if (!shouldEmitAsArrowFunction(node)) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             write("default ");
                         }
                     }
@@ -32848,7 +34204,6 @@ var ts;
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
                 var isArrowFunction = node.kind === 174 /* ArrowFunction */;
                 var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096 /* CaptureArguments */) !== 0;
-                var args;
                 // An async function is emit as an outer function that calls an inner
                 // generator function. To preserve lexical bindings, we pass the current
                 // `this` and `arguments` objects to `__awaiter`. The generator function
@@ -32976,9 +34331,11 @@ var ts;
                 }
             }
             function emitSignatureAndBody(node) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -33000,6 +34357,8 @@ var ts;
                 if (!isES6ExportedDeclaration(node)) {
                     emitExportMemberAssignment(node);
                 }
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -33011,7 +34370,7 @@ var ts;
                 emitRestParameter(node);
             }
             function emitExpressionFunctionBody(node, body) {
-                if (languageVersion < 2 /* ES6 */ || node.flags & 512 /* Async */) {
+                if (languageVersion < 2 /* ES6 */ || node.flags & 256 /* Async */) {
                     emitDownLevelExpressionFunctionBody(node, body);
                     return;
                 }
@@ -33032,7 +34391,7 @@ var ts;
                 scopeEmitStart(node);
                 increaseIndent();
                 var outPos = writer.getTextPos();
-                emitDetachedComments(node.body);
+                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
@@ -33070,7 +34429,7 @@ var ts;
                 scopeEmitStart(node);
                 var initialTextPos = writer.getTextPos();
                 increaseIndent();
-                emitDetachedComments(body.statements);
+                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
                 // Emit all the directive prologues (like "use strict").  These have to come before
                 // any other preamble code we write (like parameter initializers).
                 var startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
@@ -33114,7 +34473,7 @@ var ts;
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 112 /* AccessibilityModifier */) {
+                    if (param.flags & 56 /* AccessibilityModifier */) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -33149,15 +34508,15 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 141 /* PropertyDeclaration */ && isStatic === ((member.flags & 128 /* Static */) !== 0) && member.initializer) {
+                    if (member.kind === 141 /* PropertyDeclaration */ && isStatic === ((member.flags & 64 /* Static */) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
                 return properties;
             }
             function emitPropertyDeclarations(node, properties) {
-                for (var _a = 0; _a < properties.length; _a++) {
-                    var property = properties[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var property = properties_6[_a];
                     emitPropertyDeclaration(node, property);
                 }
             }
@@ -33170,7 +34529,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 128 /* Static */) {
+                    if (property.flags & 64 /* Static */) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -33269,7 +34628,7 @@ var ts;
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 128 /* Static */) {
+                        if (member.flags & 64 /* Static */) {
                             write("static ");
                         }
                         if (member.kind === 145 /* GetAccessor */) {
@@ -33293,13 +34652,17 @@ var ts;
                 }
             }
             function emitConstructor(node, baseTypeElement) {
+                var saveConvertedLoopState = convertedLoopState;
                 var saveTempFlags = tempFlags;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
                 emitConstructorWorker(node, baseTypeElement);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -33315,7 +34678,7 @@ var ts;
                         emitCommentsOnNotEmittedNode(member);
                     }
                     // Check if there is any non-static property assignment
-                    if (member.kind === 141 /* PropertyDeclaration */ && member.initializer && (member.flags & 128 /* Static */) === 0) {
+                    if (member.kind === 141 /* PropertyDeclaration */ && member.initializer && (member.flags & 64 /* Static */) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -33362,7 +34725,7 @@ var ts;
                     // Emit all the directive prologues (like "use strict").  These have to come before
                     // any other preamble code we write (like parameter initializers).
                     startIndex = emitDirectivePrologues(ctor.body.statements, /*startWithNewLine*/ true);
-                    emitDetachedComments(ctor.body.statements);
+                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
                 }
                 emitCaptureThisForNodeIfNecessary(node);
                 var superCall;
@@ -33482,7 +34845,7 @@ var ts;
                         //     _default = __decorate([dec], _default);
                         //     export default _default;
                         //
-                        if (isES6ExportedDeclaration(node) && !(node.flags & 1024 /* Default */)) {
+                        if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */)) {
                             write("export ");
                         }
                         write("let ");
@@ -33491,7 +34854,7 @@ var ts;
                     }
                     else if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & 1024 /* Default */) {
+                        if (node.flags & 512 /* Default */) {
                             write("default ");
                         }
                     }
@@ -33521,7 +34884,7 @@ var ts;
                 // emit name if
                 // - node has a name
                 // - this is default export with static initializers
-                if ((node.name || (node.flags & 1024 /* Default */ && staticProperties.length > 0)) && !thisNodeIsDecorated) {
+                if ((node.name || (node.flags & 512 /* Default */ && staticProperties.length > 0)) && !thisNodeIsDecorated) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -33557,8 +34920,8 @@ var ts;
                 //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
                 //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
                 if (isClassExpressionWithStaticProperties) {
-                    for (var _a = 0; _a < staticProperties.length; _a++) {
-                        var property = staticProperties[_a];
+                    for (var _a = 0, staticProperties_1 = staticProperties; _a < staticProperties_1.length; _a++) {
+                        var property = staticProperties_1[_a];
                         write(",");
                         writeLine();
                         emitPropertyDeclaration(node, property, /*receiver:*/ tempVariable, /*isExpression:*/ true);
@@ -33576,7 +34939,7 @@ var ts;
                 }
                 // If this is an exported class, but not on the top level (i.e. on an internal
                 // module), export it
-                if (!isES6ExportedDeclaration(node) && (node.flags & 1 /* Export */)) {
+                if (!isES6ExportedDeclaration(node) && (node.flags & 2 /* Export */)) {
                     writeLine();
                     emitStart(node);
                     emitModuleMemberName(node);
@@ -33585,7 +34948,7 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                else if (isES6ExportedDeclaration(node) && (node.flags & 1024 /* Default */) && thisNodeIsDecorated) {
+                else if (isES6ExportedDeclaration(node) && (node.flags & 512 /* Default */) && thisNodeIsDecorated) {
                     // if this is a top level default export of decorated class, write the export after the declaration.
                     writeLine();
                     write("export default ");
@@ -33612,6 +34975,8 @@ var ts;
                 var saveTempVariables = tempVariables;
                 var saveTempParameters = tempParameters;
                 var saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                var saveConvertedLoopState = convertedLoopState;
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -33639,6 +35004,8 @@ var ts;
                 });
                 write(";");
                 emitTempDeclarations(/*newLine*/ true);
+                ts.Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -33663,13 +35030,13 @@ var ts;
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 128 /* Static */)) {
+                if (!(member.flags & 64 /* Static */)) {
                     write(".prototype");
                 }
             }
             function emitDecoratorsOfClass(node) {
                 emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, 128 /* Static */);
+                emitDecoratorsOfMembers(node, 64 /* Static */);
                 emitDecoratorsOfConstructor(node);
             }
             function emitDecoratorsOfConstructor(node) {
@@ -33716,7 +35083,7 @@ var ts;
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
                     // only emit members in the correct group
-                    if ((member.flags & 128 /* Static */) !== staticFlag) {
+                    if ((member.flags & 64 /* Static */) !== staticFlag) {
                         continue;
                     }
                     // skip members that cannot be decorated (such as the constructor)
@@ -34117,7 +35484,7 @@ var ts;
                 }
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
-                    if (!(node.flags & 1 /* Export */) || isES6ExportedDeclaration(node)) {
+                    if (!(node.flags & 2 /* Export */) || isES6ExportedDeclaration(node)) {
                         emitStart(node);
                         if (isES6ExportedDeclaration(node)) {
                             write("export ");
@@ -34148,7 +35515,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 1 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 2 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     writeLine();
                     emitStart(node);
@@ -34160,7 +35527,7 @@ var ts;
                     write(";");
                 }
                 if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 1 /* Export */)) {
+                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
                         // write the call to exporter for enum
                         writeLine();
                         write(exportFunctionForFile + "(\"");
@@ -34238,11 +35605,15 @@ var ts;
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === 219 /* ModuleBlock */) {
+                    var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
+                    convertedLoopState = undefined;
                     tempFlags = 0;
                     tempVariables = undefined;
                     emit(node.body);
+                    ts.Debug.assert(convertedLoopState === undefined);
+                    convertedLoopState = saveConvertedLoopState;
                     tempFlags = saveTempFlags;
                     tempVariables = saveTempVariables;
                 }
@@ -34261,7 +35632,7 @@ var ts;
                 }
                 write(")(");
                 // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & 1 /* Export */) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 2 /* Export */) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -34271,7 +35642,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 /* Identifier */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 1 /* Export */)) {
+                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -34287,8 +35658,8 @@ var ts;
              * Here we check if alternative name was provided for a given moduleName and return it if possible.
              */
             function tryRenameExternalModule(moduleName) {
-                if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                    return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\"";
+                if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) {
+                    return "\"" + renamedDependencies[moduleName.text] + "\"";
                 }
                 return undefined;
             }
@@ -34374,7 +35745,7 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 221 /* ImportEqualsDeclaration */ && (node.flags & 1 /* Export */) !== 0;
+                    var isExportedImport = node.kind === 221 /* ImportEqualsDeclaration */ && (node.flags & 2 /* Export */) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
                     if (modulekind !== 2 /* AMD */) {
                         emitLeadingComments(node);
@@ -34441,7 +35812,7 @@ var ts;
                 // - current file is not external module
                 // - import declaration is top level and target is value imported by entity name
                 if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     // variable declaration for import-equals declaration can be hoisted in system modules
@@ -34456,7 +35827,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 1 /* Export */)) {
+                        else if (!(node.flags & 2 /* Export */)) {
                             write("var ");
                         }
                     }
@@ -34547,8 +35918,8 @@ var ts;
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
                 ts.Debug.assert(modulekind === 5 /* ES6 */);
                 var needsComma = false;
-                for (var _a = 0; _a < specifiers.length; _a++) {
-                    var specifier = specifiers[_a];
+                for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
+                    var specifier = specifiers_1[_a];
                     if (shouldEmit(specifier)) {
                         if (needsComma) {
                             write(", ");
@@ -34640,8 +36011,8 @@ var ts;
                                 // export { x, y }
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_25 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_25] || (exportSpecifiers[name_25] = [])).push(specifier);
+                                    var name_26 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_26] || (exportSpecifiers[name_26] = [])).push(specifier);
                                 }
                             }
                             break;
@@ -34669,7 +36040,7 @@ var ts;
             function getLocalNameForExternalImport(node) {
                 var namespaceDeclaration = getNamespaceDeclarationNode(node);
                 if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
+                    return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
                 if (node.kind === 222 /* ImportDeclaration */ && node.importClause) {
                     return getGeneratedNameForNode(node);
@@ -34691,8 +36062,8 @@ var ts;
                 }
                 writeLine();
                 var started = false;
-                for (var _a = 0; _a < externalImports.length; _a++) {
-                    var importNode = externalImports[_a];
+                for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
+                    var importNode = externalImports_1[_a];
                     // do not create variable declaration for exports and imports that lack import clause
                     var skipNode = importNode.kind === 228 /* ExportDeclaration */ ||
                         (importNode.kind === 222 /* ImportDeclaration */ && !importNode.importClause);
@@ -34726,8 +36097,8 @@ var ts;
                     // no exported declarations (export var ...) or export specifiers (export {x})
                     // check if we have any non star export declarations.
                     var hasExportDeclarationWithExportClause = false;
-                    for (var _a = 0; _a < externalImports.length; _a++) {
-                        var externalImport = externalImports[_a];
+                    for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
+                        var externalImport = externalImports_2[_a];
                         if (externalImport.kind === 228 /* ExportDeclaration */ && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
@@ -34758,8 +36129,8 @@ var ts;
                         }
                     }
                 }
-                for (var _d = 0; _d < externalImports.length; _d++) {
-                    var externalImport = externalImports[_d];
+                for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
+                    var externalImport = externalImports_3[_d];
                     if (externalImport.kind !== 228 /* ExportDeclaration */) {
                         continue;
                     }
@@ -34808,7 +36179,7 @@ var ts;
                 function writeExportedName(node) {
                     // do not record default exports
                     // they are local to module and never overwritten (explicitly skipped) by star export
-                    if (node.kind !== 69 /* Identifier */ && node.flags & 1024 /* Default */) {
+                    if (node.kind !== 69 /* Identifier */ && node.flags & 512 /* Default */) {
                         return;
                     }
                     if (started) {
@@ -34848,12 +36219,12 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; ++i) {
                         var local = hoistedVars[i];
-                        var name_26 = local.kind === 69 /* Identifier */
+                        var name_27 = local.kind === 69 /* Identifier */
                             ? local
                             : local.name;
-                        if (name_26) {
+                        if (name_27) {
                             // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            var text = ts.unescapeIdentifier(name_26.text);
+                            var text = ts.unescapeIdentifier(name_27.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -34871,7 +36242,7 @@ var ts;
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 /* Identifier */ ? local.parent : local);
-                        if (flags & 1 /* Export */) {
+                        if (flags & 2 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -34881,11 +36252,11 @@ var ts;
                     write(";");
                 }
                 if (hoistedFunctionDeclarations) {
-                    for (var _a = 0; _a < hoistedFunctionDeclarations.length; _a++) {
-                        var f = hoistedFunctionDeclarations[_a];
+                    for (var _a = 0, hoistedFunctionDeclarations_1 = hoistedFunctionDeclarations; _a < hoistedFunctionDeclarations_1.length; _a++) {
+                        var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 1 /* Export */) {
+                        if (f.flags & 2 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -34895,7 +36266,7 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 2 /* Ambient */) {
+                    if (node.flags & 4 /* Ambient */) {
                         return;
                     }
                     if (node.kind === 213 /* FunctionDeclaration */) {
@@ -34932,15 +36303,15 @@ var ts;
                     }
                     if (node.kind === 211 /* VariableDeclaration */ || node.kind === 163 /* BindingElement */) {
                         if (shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            var name_27 = node.name;
-                            if (name_27.kind === 69 /* Identifier */) {
+                            var name_28 = node.name;
+                            if (name_28.kind === 69 /* Identifier */) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_27);
+                                hoistedVars.push(name_28);
                             }
                             else {
-                                ts.forEachChild(name_27, visit);
+                                ts.forEachChild(name_28, visit);
                             }
                         }
                         return;
@@ -34970,11 +36341,11 @@ var ts;
                 // - it is top level block scoped
                 // if block scoped variables are nested in some another block then
                 // no other functions can use them except ones that are defined at least in the same block
-                return (ts.getCombinedNodeFlags(node) & 49152 /* BlockScoped */) === 0 ||
+                return (ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) === 0 ||
                     ts.getEnclosingBlockScopeContainer(node).kind === 248 /* SourceFile */;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 /* System */ && ts.isExternalModule(currentSourceFile);
+                return modulekind === 4 /* System */ && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 // shape of the body in system modules:
@@ -35042,8 +36413,8 @@ var ts;
                     var parameterName = makeUniqueName(ts.forEach(group, getLocalNameForExternalImport) || "");
                     write("function (" + parameterName + ") {");
                     increaseIndent();
-                    for (var _a = 0; _a < group.length; _a++) {
-                        var entry = group[_a];
+                    for (var _a = 0, group_1 = group; _a < group_1.length; _a++) {
+                        var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
                             case 222 /* ImportDeclaration */:
@@ -35144,7 +36515,13 @@ var ts;
                 writeLine();
                 write("}"); // execute
             }
-            function emitSystemModule(node) {
+            function writeModuleName(node, emitRelativePathAsModuleName) {
+                var moduleName = node.moduleName;
+                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
+                    write("\"" + moduleName + "\", ");
+                }
+            }
+            function emitSystemModule(node, emitRelativePathAsModuleName) {
                 collectExternalModuleInfo(node);
                 // System modules has the following shape
                 // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
@@ -35159,9 +36536,7 @@ var ts;
                 exportFunctionForFile = makeUniqueName("exports");
                 writeLine();
                 write("System.register(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
+                writeModuleName(node, emitRelativePathAsModuleName);
                 write("[");
                 var groupIndices = {};
                 var dependencyGroups = [];
@@ -35180,6 +36555,12 @@ var ts;
                     if (i !== 0) {
                         write(", ");
                     }
+                    if (emitRelativePathAsModuleName) {
+                        var name_29 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]);
+                        if (name_29) {
+                            text = "\"" + name_29 + "\"";
+                        }
+                    }
                     write(text);
                 }
                 write("], function(" + exportFunctionForFile + ") {");
@@ -35193,7 +36574,7 @@ var ts;
                 writeLine();
                 write("});");
             }
-            function getAMDDependencyNames(node, includeNonAmdDependencies) {
+            function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
                 // names of modules with corresponding parameter in the factory function
                 var aliasedModuleNames = [];
                 // names of modules with no corresponding parameters in factory function
@@ -35212,10 +36593,16 @@ var ts;
                         unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
                     }
                 }
-                for (var _c = 0; _c < externalImports.length; _c++) {
-                    var importNode = externalImports[_c];
+                for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
+                    var importNode = externalImports_4[_c];
                     // Find the name of the external module
                     var externalModuleName = getExternalModuleNameText(importNode);
+                    if (emitRelativePathAsModuleName) {
+                        var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                        if (name_30) {
+                            externalModuleName = "\"" + name_30 + "\"";
+                        }
+                    }
                     // Find the name of the module alias, if there is one
                     var importAliasName = getLocalNameForExternalImport(importNode);
                     if (includeNonAmdDependencies && importAliasName) {
@@ -35228,7 +36615,7 @@ var ts;
                 }
                 return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
             }
-            function emitAMDDependencies(node, includeNonAmdDependencies) {
+            function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
                 // An AMD define function has the following shape:
                 //     define(id?, dependencies?, factory);
                 //
@@ -35240,7 +36627,7 @@ var ts;
                 // To ensure this is true in cases of modules with no aliases, e.g.:
                 // `import "module"` or `<amd-dependency path= "a.css" />`
                 // we need to add modules without alias names to the end of the dependencies list
-                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies);
+                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
                 emitAMDDependencyList(dependencyNames);
                 write(", ");
                 emitAMDFactoryHeader(dependencyNames);
@@ -35267,15 +36654,13 @@ var ts;
                 }
                 write(") {");
             }
-            function emitAMDModule(node) {
+            function emitAMDModule(node, emitRelativePathAsModuleName) {
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 writeLine();
                 write("define(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
-                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true);
+                writeModuleName(node, emitRelativePathAsModuleName);
+                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
                 var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
                 emitExportStarHelper();
@@ -35492,10 +36877,15 @@ var ts;
                 // Start new file on new line
                 writeLine();
                 emitShebang();
-                emitDetachedComments(node);
+                emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                    var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */];
-                    emitModule(node);
+                    if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */];
+                        emitModule(node);
+                    }
+                    else {
+                        bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/ true);
+                    }
                 }
                 else {
                     // emit prologue directives prior to __extends
@@ -35516,7 +36906,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 2 /* Ambient */) {
+                    if (node.flags & 4 /* Ambient */) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -35716,7 +37106,7 @@ var ts;
                     case 242 /* DefaultClause */:
                         return emitCaseOrDefaultClause(node);
                     case 207 /* LabeledStatement */:
-                        return emitLabelledStatement(node);
+                        return emitLabeledStatement(node);
                     case 208 /* ThrowStatement */:
                         return emitThrowStatement(node);
                     case 209 /* TryStatement */:
@@ -35756,7 +37146,7 @@ var ts;
             }
             function getLeadingCommentsWithoutDetachedComments() {
                 // get the leading comments from detachedPos
-                var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
+                var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
                 if (detachedCommentsInfo.length - 1) {
                     detachedCommentsInfo.pop();
                 }
@@ -35765,10 +37155,6 @@ var ts;
                 }
                 return leadingComments;
             }
-            function isPinnedComments(comment) {
-                return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 33 /* exclamation */;
-            }
             /**
              * Determine if the given comment is a triple-slash
              *
@@ -35777,10 +37163,10 @@ var ts;
             function isTripleSlashComment(comment) {
                 // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
                 // so that we don't end up computing comment string and doing match for all // comments
-                if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 /* slash */ &&
+                if (currentText.charCodeAt(comment.pos + 1) === 47 /* slash */ &&
                     comment.pos + 2 < comment.end &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 /* slash */) {
-                    var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end);
+                    currentText.charCodeAt(comment.pos + 2) === 47 /* slash */) {
+                    var textSubStr = currentText.substring(comment.pos, comment.end);
                     return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) ||
                         textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ?
                         true : false;
@@ -35797,7 +37183,7 @@ var ts;
                         }
                         else {
                             // get the leading comments from the node
-                            return ts.getLeadingCommentRangesOfNode(node, currentSourceFile);
+                            return ts.getLeadingCommentRangesOfNodeFromText(node, currentText);
                         }
                     }
                 }
@@ -35806,7 +37192,7 @@ var ts;
                 // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments
                 if (node.parent) {
                     if (node.parent.kind === 248 /* SourceFile */ || node.end !== node.parent.end) {
-                        return ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
+                        return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
             }
@@ -35840,9 +37226,9 @@ var ts;
                         leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment);
             }
             function emitTrailingComments(node) {
                 if (compilerOptions.removeComments) {
@@ -35851,7 +37237,7 @@ var ts;
                 // Emit the trailing comments only if the parent's end doesn't match
                 var trailingComments = getTrailingCommentsToEmit(node);
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
             }
             /**
              * Emit trailing comments at the position. The term trailing comment is used here to describe following comment:
@@ -35862,9 +37248,9 @@ var ts;
                 if (compilerOptions.removeComments) {
                     return;
                 }
-                var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos);
+                var trailingComments = ts.getTrailingCommentRanges(currentText, pos);
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
             function emitLeadingCommentsOfPositionWorker(pos) {
                 if (compilerOptions.removeComments) {
@@ -35877,73 +37263,30 @@ var ts;
                 }
                 else {
                     // get the leading comments from the node
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
+                    leadingComments = ts.getLeadingCommentRanges(currentText, pos);
                 }
-                ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
+                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
+                ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
-            function emitDetachedComments(node) {
-                var leadingComments;
-                if (compilerOptions.removeComments) {
-                    // removeComments is true, only reserve pinned comment at the top of file
-                    // For example:
-                    //      /*! Pinned Comment */
-                    //
-                    //      var x = 10;
-                    if (node.pos === 0) {
-                        leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComments);
+            function emitDetachedCommentsAndUpdateCommentsInfo(node) {
+                var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
+                if (currentDetachedCommentInfo) {
+                    if (detachedCommentsInfo) {
+                        detachedCommentsInfo.push(currentDetachedCommentInfo);
                     }
-                }
-                else {
-                    // removeComments is false, just get detached as normal and bypass the process to filter comment
-                    leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos);
-                }
-                if (leadingComments) {
-                    var detachedComments = [];
-                    var lastComment;
-                    ts.forEach(leadingComments, function (comment) {
-                        if (lastComment) {
-                            var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, lastComment.end);
-                            var commentLine = ts.getLineOfLocalPosition(currentSourceFile, comment.pos);
-                            if (commentLine >= lastCommentLine + 2) {
-                                // There was a blank line between the last comment and this comment.  This
-                                // comment is not part of the copyright comments.  Return what we have so
-                                // far.
-                                return detachedComments;
-                            }
-                        }
-                        detachedComments.push(comment);
-                        lastComment = comment;
-                    });
-                    if (detachedComments.length) {
-                        // All comments look like they could have been part of the copyright header.  Make
-                        // sure there is at least one blank line between it and the node.  If not, it's not
-                        // a copyright header.
-                        var lastCommentLine = ts.getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end);
-                        var nodeLine = ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos));
-                        if (nodeLine >= lastCommentLine + 2) {
-                            // Valid detachedComments
-                            ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                            ts.emitComments(currentSourceFile, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                            if (detachedCommentsInfo) {
-                                detachedCommentsInfo.push(currentDetachedCommentInfo);
-                            }
-                            else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
-                            }
-                        }
+                    else {
+                        detachedCommentsInfo = [currentDetachedCommentInfo];
                     }
                 }
             }
             function emitShebang() {
-                var shebang = ts.getShebang(currentSourceFile.text);
+                var shebang = ts.getShebang(currentText);
                 if (shebang) {
                     write(shebang);
                 }
             }
-            var _a;
+            var _a, _b;
         }
         function emitFile(jsFilePath, sourceFile) {
             emitJavaScript(jsFilePath, sourceFile);
@@ -36003,11 +37346,11 @@ var ts;
         if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
             var failedLookupLocations = [];
             var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+            var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             if (resolvedFileName) {
                 return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
             }
-            resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+            resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host);
             return resolvedFileName
                 ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
                 : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
@@ -36017,8 +37360,8 @@ var ts;
         }
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function loadNodeModuleFromFile(candidate, failedLookupLocation, host) {
-        return ts.forEach(ts.moduleFileExtensions, tryLoad);
+    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) {
+        return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
             if (host.fileExists(fileName)) {
@@ -36030,7 +37373,7 @@ var ts;
             }
         }
     }
-    function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
         if (host.fileExists(packageJsonPath)) {
             var jsonContent;
@@ -36043,7 +37386,7 @@ var ts;
                 jsonContent = { typings: undefined };
             }
             if (jsonContent.typings) {
-                var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
+                var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
                 if (result) {
                     return result;
                 }
@@ -36053,7 +37396,7 @@ var ts;
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host);
+        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host);
     }
     function loadModuleFromNodeModules(moduleName, directory, host) {
         var failedLookupLocations = [];
@@ -36063,11 +37406,11 @@ var ts;
             if (baseName !== "node_modules") {
                 var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
                 var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+                var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
-                result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+                result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
                 }
@@ -36093,9 +37436,10 @@ var ts;
         var searchName;
         var failedLookupLocations = [];
         var referencedSourceFile;
+        var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions;
         while (true) {
             searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) {
+            referencedSourceFile = ts.forEach(extensions, function (extension) {
                 if (extension === ".tsx" && !compilerOptions.jsx) {
                     // resolve .tsx files only if jsx support is enabled 
                     // 'logical not' handles both undefined and None cases
@@ -36126,14 +37470,11 @@ var ts;
     /* @internal */
     ts.defaultInitCompilerOptions = {
         module: 1 /* CommonJS */,
-        target: 0 /* ES3 */,
+        target: 1 /* ES5 */,
         noImplicitAny: false,
-        outDir: "built",
-        rootDir: ".",
         sourceMap: false
     };
     function createCompilerHost(options, setParentNodes) {
-        var currentDirectory;
         var existingDirectories = {};
         function getCanonicalFileName(fileName) {
             // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
@@ -36194,7 +37535,7 @@ var ts;
             getSourceFile: getSourceFile,
             getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
+            getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
             getCanonicalFileName: getCanonicalFileName,
             getNewLine: function () { return newLine; },
@@ -36246,10 +37587,14 @@ var ts;
         var skipDefaultLib = options.noLib;
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
+        var currentDirectory = host.getCurrentDirectory();
         var resolveModuleNamesWorker = host.resolveModuleNames
             ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
             : (function (moduleNames, containingFile) { return ts.map(moduleNames, function (moduleName) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; }); });
-        var filesByName = ts.createFileMap(function (fileName) { return host.getCanonicalFileName(fileName); });
+        var filesByName = ts.createFileMap();
+        // stores 'filename -> file association' ignoring case
+        // used to track cases when two file names differ only in casing 
+        var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
         if (oldProgram) {
             // check properties that can affect structure of the program or module resolution strategy
             // if any of these properties has changed - structure cannot be reused
@@ -36291,7 +37636,7 @@ var ts;
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
             getCommonSourceDirectory: function () { return commonSourceDirectory; },
             emit: emit,
-            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            getCurrentDirectory: function () { return currentDirectory; },
             getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
@@ -36304,8 +37649,8 @@ var ts;
                 // Initialize a checker so that all our files are bound.
                 getTypeChecker();
                 classifiableNames = {};
-                for (var _i = 0; _i < files.length; _i++) {
-                    var sourceFile = files[_i];
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var sourceFile = files_3[_i];
                     ts.copyMap(sourceFile.classifiableNames, classifiableNames);
                 }
             }
@@ -36323,6 +37668,7 @@ var ts;
             }
             // check if program source files has changed in the way that can affect structure of the program
             var newSourceFiles = [];
+            var filePaths = [];
             var modifiedSourceFiles = [];
             for (var _i = 0, _a = oldProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var oldSourceFile = _a[_i];
@@ -36330,6 +37676,8 @@ var ts;
                 if (!newSourceFile) {
                     return false;
                 }
+                newSourceFile.path = oldSourceFile.path;
+                filePaths.push(newSourceFile.path);
                 if (oldSourceFile !== newSourceFile) {
                     if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
                         // value of no-default-lib has changed
@@ -36349,7 +37697,7 @@ var ts;
                     }
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(newSourceFile.imports, function (name) { return name.text; });
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFile.fileName);
+                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
                         // ensure that module resolution results are still correct
                         for (var i = 0; i < moduleNames.length; ++i) {
                             var newResolution = resolutions[i];
@@ -36376,14 +37724,13 @@ var ts;
                 newSourceFiles.push(newSourceFile);
             }
             // update fileName -> file mapping
-            for (var _b = 0; _b < newSourceFiles.length; _b++) {
-                var file = newSourceFiles[_b];
-                filesByName.set(file.fileName, file);
+            for (var i = 0, len = newSourceFiles.length; i < len; ++i) {
+                filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _c = 0; _c < modifiedSourceFiles.length; _c++) {
-                var modifiedFile = modifiedSourceFiles[_c];
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
             oldProgram.structureIsReused = true;
@@ -36391,10 +37738,10 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return {
-                getCanonicalFileName: function (fileName) { return host.getCanonicalFileName(fileName); },
+                getCanonicalFileName: getCanonicalFileName,
                 getCommonSourceDirectory: program.getCommonSourceDirectory,
                 getCompilerOptions: program.getCompilerOptions,
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
@@ -36433,9 +37780,7 @@ var ts;
             return emitResult;
         }
         function getSourceFile(fileName) {
-            // first try to use file name as is to find file
-            // then try to convert relative file name to absolute and use it to retrieve source file
-            return filesByName.get(fileName) || filesByName.get(ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory()));
+            return filesByName.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
         }
         function getDiagnosticsHelper(sourceFile, getDiagnostics, cancellationToken) {
             if (sourceFile) {
@@ -36531,43 +37876,55 @@ var ts;
             if (file.imports) {
                 return;
             }
+            var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var imports;
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var node = _a[_i];
-                collect(node, /* allowRelativeModuleNames */ true);
+                collect(node, /* allowRelativeModuleNames */ true, /* collectOnlyRequireCalls */ false);
             }
             file.imports = imports || emptyArray;
-            function collect(node, allowRelativeModuleNames) {
-                switch (node.kind) {
-                    case 222 /* ImportDeclaration */:
-                    case 221 /* ImportEqualsDeclaration */:
-                    case 228 /* ExportDeclaration */:
-                        var moduleNameExpr = ts.getExternalModuleName(node);
-                        if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
+            return;
+            function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) {
+                if (!collectOnlyRequireCalls) {
+                    switch (node.kind) {
+                        case 222 /* ImportDeclaration */:
+                        case 221 /* ImportEqualsDeclaration */:
+                        case 228 /* ExportDeclaration */:
+                            var moduleNameExpr = ts.getExternalModuleName(node);
+                            if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
+                                break;
+                            }
+                            if (!moduleNameExpr.text) {
+                                break;
+                            }
+                            if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
+                                (imports || (imports = [])).push(moduleNameExpr);
+                            }
                             break;
-                        }
-                        if (!moduleNameExpr.text) {
-                            break;
-                        }
-                        if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
-                            (imports || (imports = [])).push(moduleNameExpr);
-                        }
-                        break;
-                    case 218 /* ModuleDeclaration */:
-                        if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 2 /* Ambient */ || ts.isDeclarationFile(file))) {
-                            // TypeScript 1.0 spec (April 2014): 12.1.6
-                            // 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
-                            ts.forEachChild(node.body, function (node) {
+                        case 218 /* ModuleDeclaration */:
+                            if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) {
                                 // 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);
-                            });
-                        }
-                        break;
+                                // 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
+                                ts.forEachChild(node.body, function (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 (ts.isRequireCall(node)) {
+                        (imports || (imports = [])).push(node.arguments[0]);
+                    }
+                    else {
+                        ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, /* collectOnlyRequireCalls */ true); });
+                    }
                 }
             }
         }
@@ -36579,7 +37936,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + ts.supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -36589,13 +37946,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(ts.supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -36611,18 +37968,23 @@ var ts;
                 }
             }
         }
-        // Get source file from normalized fileName
-        function findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
-            if (filesByName.contains(fileName)) {
-                // We've already looked for this file, use cached result
-                return getSourceFileFromCache(fileName, /*useAbsolutePath*/ false);
+        function reportFileNamesDifferOnlyInCasingError(fileName, existingFileName, refFile, refPos, refEnd) {
+            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
-            var normalizedAbsolutePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+            else {
+                fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+        }
+        // Get source file from normalized fileName
+        function findSourceFile(fileName, normalizedAbsolutePath, isDefaultLib, refFile, refPos, refEnd) {
             if (filesByName.contains(normalizedAbsolutePath)) {
-                var file_1 = getSourceFileFromCache(normalizedAbsolutePath, /*useAbsolutePath*/ true);
-                // we don't have resolution for this relative file name but the match was found by absolute file name
-                // store resolution for relative name as well 
-                filesByName.set(fileName, file_1);
+                var file_1 = filesByName.get(normalizedAbsolutePath);
+                // try to check if we've already seen this file but with a different casing in path
+                // NOTE: this only makes sense for case-insensitive file systems
+                if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== normalizedAbsolutePath) {
+                    reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
+                }
                 return file_1;
             }
             // We haven't looked for this file, do so now and cache result
@@ -36634,11 +37996,20 @@ var ts;
                     fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
                 }
             });
-            filesByName.set(fileName, file);
+            filesByName.set(normalizedAbsolutePath, file);
             if (file) {
+                file.path = normalizedAbsolutePath;
+                if (host.useCaseSensitiveFileNames()) {
+                    // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
+                    var existingFile = filesByNameIgnoreCase.get(normalizedAbsolutePath);
+                    if (existingFile) {
+                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
+                    }
+                    else {
+                        filesByNameIgnoreCase.set(normalizedAbsolutePath, file);
+                    }
+                }
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
-                // Set the source file for normalized absolute path
-                filesByName.set(normalizedAbsolutePath, file);
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
                     processReferencedFiles(file, basePath);
@@ -36646,7 +38017,6 @@ var ts;
                 // always process imported modules to record module name resolutions
                 processImportedModules(file, basePath);
                 if (isDefaultLib) {
-                    file.isDefaultLib = true;
                     files.unshift(file);
                 }
                 else {
@@ -36654,21 +38024,6 @@ var ts;
                 }
             }
             return file;
-            function getSourceFileFromCache(fileName, useAbsolutePath) {
-                var file = filesByName.get(fileName);
-                if (file && host.useCaseSensitiveFileNames()) {
-                    var sourceFileName = useAbsolutePath ? ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()) : file.fileName;
-                    if (ts.normalizeSlashes(fileName) !== ts.normalizeSlashes(sourceFileName)) {
-                        if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                            fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                        else {
-                            fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                    }
-                }
-                return file;
-            }
         }
         function processReferencedFiles(file, basePath) {
             ts.forEach(file.referencedFiles, function (ref) {
@@ -36676,26 +38031,25 @@ var ts;
                 processSourceFile(referencedFileName, /* isDefaultLib */ false, file, ref.pos, ref.end);
             });
         }
+        function getCanonicalFileName(fileName) {
+            return host.getCanonicalFileName(fileName);
+        }
         function processImportedModules(file, basePath) {
             collectExternalModuleReferences(file);
             if (file.imports.length) {
                 file.resolvedModules = {};
                 var moduleNames = ts.map(file.imports, function (name) { return name.text; });
-                var resolutions = resolveModuleNamesWorker(moduleNames, file.fileName);
+                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
                 for (var i = 0; i < file.imports.length; ++i) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
                     if (resolution && !options.noResolve) {
-                        var importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /* isDefaultLib */ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             if (!ts.isExternalModule(importedFile)) {
                                 var start_2 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_2, file.imports[i].end - start_2, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
-                            else if (!ts.fileExtensionIs(importedFile.fileName, ".d.ts")) {
-                                var start_3 = ts.getTokenPosOfNode(file.imports[i], file);
-                                fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_3, file.imports[i].end - start_3, ts.Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
-                            }
                             else if (importedFile.referencedFiles.length) {
                                 var firstRef = importedFile.referencedFiles[0];
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, ts.Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
@@ -36709,13 +38063,9 @@ var ts;
                 file.resolvedModules = undefined;
             }
             return;
-            function findModuleSourceFile(fileName, nameLiteral) {
-                return findSourceFile(fileName, /* isDefaultLib */ false, file, ts.skipTrivia(file.text, nameLiteral.pos), nameLiteral.end);
-            }
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var commonPathComponents;
-            var currentDirectory = host.getCurrentDirectory();
             ts.forEach(files, function (sourceFile) {
                 // Each file contributes into common source file path
                 if (ts.isDeclarationFile(sourceFile)) {
@@ -36744,15 +38094,17 @@ var ts;
                     commonPathComponents.length = sourcePathComponents.length;
                 }
             });
+            if (!commonPathComponents) {
+                return currentDirectory;
+            }
             return ts.getNormalizedPathFromPathComponents(commonPathComponents);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
-                var currentDirectory = host.getCurrentDirectory();
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+                    var sourceFile = sourceFiles_1[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -36813,7 +38165,7 @@ var ts;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
                 if (!options.module && languageVersion < 2 /* ES6 */) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher));
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
                 if (firstNonExternalModuleSourceFile) {
@@ -36828,17 +38180,20 @@ var ts;
             }
             // Cannot specify module gen target of es6 when below es6
             if (options.module === 5 /* ES6 */ && languageVersion < 2 /* ES6 */) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
+            }
+            // Cannot specify module gen that isn't amd or system with --out
+            if (outFile && options.module && !(options.module === 2 /* AMD */ || options.module === 4 /* System */)) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             // there has to be common source directory if user specified --outdir || --sourceRoot
             // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted
             if (options.outDir ||
                 options.sourceRoot ||
-                (options.mapRoot &&
-                    (!outFile || firstExternalModuleSourceFile !== undefined))) {
+                options.mapRoot) {
                 if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
                     // If a rootDir is specified and is valid use it as the commonSourceDirectory
-                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, host.getCurrentDirectory());
+                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
                     // Compute the commonSourceDirectory from the input files
@@ -36876,6 +38231,7 @@ var ts;
 /// <reference path="sys.ts"/>
 /// <reference path="types.ts"/>
 /// <reference path="core.ts"/>
+/// <reference path="diagnosticInformationMap.generated.ts"/>
 /// <reference path="scanner.ts"/>
 var ts;
 (function (ts) {
@@ -36954,9 +38310,9 @@ var ts;
                 "es6": 5 /* ES6 */,
                 "es2015": 5 /* ES2015 */
             },
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6,
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
             paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6
+            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
         },
         {
             name: "newLine",
@@ -37025,6 +38381,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
+        {
+            name: "pretty",
+            paramType: ts.Diagnostics.KIND,
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
         {
             name: "project",
             shortName: "p",
@@ -37087,9 +38449,9 @@ var ts;
                 "es6": 2 /* ES6 */,
                 "es2015": 2 /* ES2015 */
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
             paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES6
+            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
         },
         {
             name: "version",
@@ -37122,6 +38484,31 @@ var ts;
             },
             description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
             error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         }
     ];
     var optionNameMapCache;
@@ -37261,70 +38648,52 @@ var ts;
       */
     function parseConfigFileTextToJson(fileName, jsonText) {
         try {
-            return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} };
+            var jsonTextWithoutComments = removeComments(jsonText);
+            return { config: /\S/.test(jsonTextWithoutComments) ? JSON.parse(jsonTextWithoutComments) : {} };
         }
         catch (e) {
             return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
         }
     }
     ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    /**
+     * Remove the comments from a json like text.
+     * Comments can be single line comments (starting with # or //) or multiline comments using / * * /
+     *
+     * This method replace comment content by whitespace rather than completely remove them to keep positions in json parsing error reporting accurate.
+     */
+    function removeComments(jsonText) {
+        var output = "";
+        var scanner = ts.createScanner(1 /* ES5 */, /* skipTrivia */ false, 0 /* Standard */, jsonText);
+        var token;
+        while ((token = scanner.scan()) !== 1 /* EndOfFileToken */) {
+            switch (token) {
+                case 2 /* SingleLineCommentTrivia */:
+                case 3 /* MultiLineCommentTrivia */:
+                    // replace comments with whitespace to preserve original character positions
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
+      * @param host Instance of ParseConfigHost used to enumerate files in folder.
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
     function parseJsonConfigFileContent(json, host, basePath) {
-        var errors = [];
+        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), options = _a.options, errors = _a.errors;
         return {
-            options: getCompilerOptions(),
+            options: options,
             fileNames: getFileNames(),
             errors: errors
         };
-        function getCompilerOptions() {
-            var options = {};
-            var optionNameMap = {};
-            ts.forEach(ts.optionDeclarations, function (option) {
-                optionNameMap[option.name] = option;
-            });
-            var jsonOptions = json["compilerOptions"];
-            if (jsonOptions) {
-                for (var id in jsonOptions) {
-                    if (ts.hasProperty(optionNameMap, id)) {
-                        var opt = optionNameMap[id];
-                        var optType = opt.type;
-                        var value = jsonOptions[id];
-                        var expectedType = typeof optType === "string" ? optType : "string";
-                        if (typeof value === expectedType) {
-                            if (typeof optType !== "string") {
-                                var key = value.toLowerCase();
-                                if (ts.hasProperty(optType, key)) {
-                                    value = optType[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                    value = 0;
-                                }
-                            }
-                            if (opt.isFilePath) {
-                                value = ts.normalizePath(ts.combinePaths(basePath, value));
-                                if (value === "") {
-                                    value = ".";
-                                }
-                            }
-                            options[opt.name] = value;
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-                    }
-                }
-            }
-            return options;
-        }
         function getFileNames() {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
@@ -37339,20 +38708,20 @@ var ts;
                 var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
                 var sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
                 for (var i = 0; i < sysFiles.length; i++) {
-                    var name_28 = sysFiles[i];
-                    if (ts.fileExtensionIs(name_28, ".d.ts")) {
-                        var baseName = name_28.substr(0, name_28.length - ".d.ts".length);
+                    var name_31 = sysFiles[i];
+                    if (ts.fileExtensionIs(name_31, ".d.ts")) {
+                        var baseName = name_31.substr(0, name_31.length - ".d.ts".length);
                         if (!ts.contains(sysFiles, baseName + ".tsx") && !ts.contains(sysFiles, baseName + ".ts")) {
-                            fileNames.push(name_28);
+                            fileNames.push(name_31);
                         }
                     }
-                    else if (ts.fileExtensionIs(name_28, ".ts")) {
-                        if (!ts.contains(sysFiles, name_28 + "x")) {
-                            fileNames.push(name_28);
+                    else if (ts.fileExtensionIs(name_31, ".ts")) {
+                        if (!ts.contains(sysFiles, name_31 + "x")) {
+                            fileNames.push(name_31);
                         }
                     }
                     else {
-                        fileNames.push(name_28);
+                        fileNames.push(name_31);
                     }
                 }
             }
@@ -37360,6 +38729,49 @@ var ts;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
+        var options = {};
+        var errors = [];
+        if (!jsonOptions) {
+            return { options: options, errors: errors };
+        }
+        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                var optType = opt.type;
+                var value = jsonOptions[id];
+                var expectedType = typeof optType === "string" ? optType : "string";
+                if (typeof value === expectedType) {
+                    if (typeof optType !== "string") {
+                        var key = value.toLowerCase();
+                        if (ts.hasProperty(optType, key)) {
+                            value = optType[key];
+                        }
+                        else {
+                            errors.push(ts.createCompilerDiagnostic(opt.error));
+                            value = 0;
+                        }
+                    }
+                    if (opt.isFilePath) {
+                        value = ts.normalizePath(ts.combinePaths(basePath, value));
+                        if (value === "") {
+                            value = ".";
+                        }
+                    }
+                    options[opt.name] = value;
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
+                }
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
+            }
+        }
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -37398,8 +38810,8 @@ var ts;
                     var lastSingleLineCommentEnd = -1;
                     var isFirstSingleLineComment = true;
                     var singleLineCommentCount = 0;
-                    for (var _i = 0; _i < comments.length; _i++) {
-                        var currentComment = comments[_i];
+                    for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
+                        var currentComment = comments_2[_i];
                         // For single line comments, combine consecutive ones (2 or more) into
                         // a single span from the start of the first till the end of the last
                         if (currentComment.kind === 2 /* SingleLineCommentTrivia */) {
@@ -37531,21 +38943,23 @@ var ts;
         function getNavigateToItems(program, cancellationToken, searchValue, maxResultCount) {
             var patternMatcher = ts.createPatternMatcher(searchValue);
             var rawItems = [];
+            // This means "compare in a case insensitive manner."
+            var baseSensitivity = { sensitivity: "base" };
             // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[] 
             ts.forEach(program.getSourceFiles(), function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_29 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_29);
+                for (var name_32 in nameToDeclarations) {
+                    var declarations = ts.getProperty(nameToDeclarations, name_32);
                     if (declarations) {
                         // First do a quick check to see if the name of the declaration matches the 
                         // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_29);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_32);
                         if (!matches) {
                             continue;
                         }
-                        for (var _i = 0; _i < declarations.length; _i++) {
-                            var declaration = declarations[_i];
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
                             // It was a match!  If the pattern has dots in it, then also see if the 
                             // declaration container matches as well.
                             if (patternMatcher.patternContainsDots) {
@@ -37553,14 +38967,14 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_29);
+                                matches = patternMatcher.getMatches(containers, name_32);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_29, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_32, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -37574,8 +38988,8 @@ var ts;
             function allMatchesAreCaseSensitive(matches) {
                 ts.Debug.assert(matches.length > 0);
                 // This is a case sensitive match, only if all the submatches were case sensitive.
-                for (var _i = 0; _i < matches.length; _i++) {
-                    var match = matches[_i];
+                for (var _i = 0, matches_1 = matches; _i < matches_1.length; _i++) {
+                    var match = matches_1[_i];
                     if (!match.isCaseSensitive) {
                         return false;
                     }
@@ -37650,8 +39064,8 @@ var ts;
             function bestMatchKind(matches) {
                 ts.Debug.assert(matches.length > 0);
                 var bestMatchKind = ts.PatternMatchKind.camelCase;
-                for (var _i = 0; _i < matches.length; _i++) {
-                    var match = matches[_i];
+                for (var _i = 0, matches_2 = matches; _i < matches_2.length; _i++) {
+                    var match = matches_2[_i];
                     var kind = match.kind;
                     if (kind < bestMatchKind) {
                         bestMatchKind = kind;
@@ -37659,8 +39073,6 @@ var ts;
                 }
                 return bestMatchKind;
             }
-            // This means "compare in a case insensitive manner."
-            var baseSensitivity = { sensitivity: "base" };
             function compareNavigateToItems(i1, i2) {
                 // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
                 // Right now we just sort by kind first, and then by name of the item.
@@ -37823,8 +39235,8 @@ var ts;
             }
             function addTopLevelNodes(nodes, topLevelNodes) {
                 nodes = sortNodes(nodes);
-                for (var _i = 0; _i < nodes.length; _i++) {
-                    var node = nodes[_i];
+                for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
+                    var node = nodes_4[_i];
                     switch (node.kind) {
                         case 214 /* ClassDeclaration */:
                         case 217 /* EnumDeclaration */:
@@ -37867,8 +39279,8 @@ var ts;
             function getItemsWorker(nodes, createItem) {
                 var items = [];
                 var keyToItem = {};
-                for (var _i = 0; _i < nodes.length; _i++) {
-                    var child = nodes[_i];
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var child = nodes_5[_i];
                     var item = createItem(child);
                     if (item !== undefined) {
                         if (item.text.length > 0) {
@@ -37916,7 +39328,7 @@ var ts;
                         if (ts.isBindingPattern(node.name)) {
                             break;
                         }
-                        if ((node.flags & 2035 /* Modifier */) === 0) {
+                        if ((node.flags & 1022 /* Modifier */) === 0) {
                             return undefined;
                         }
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
@@ -37943,9 +39355,9 @@ var ts;
                     case 211 /* VariableDeclaration */:
                     case 163 /* BindingElement */:
                         var variableDeclarationNode;
-                        var name_30;
+                        var name_33;
                         if (node.kind === 163 /* BindingElement */) {
-                            name_30 = node.name;
+                            name_33 = node.name;
                             variableDeclarationNode = node;
                             // binding elements are added only for variable declarations
                             // bubble up to the containing variable declaration
@@ -37957,16 +39369,16 @@ var ts;
                         else {
                             ts.Debug.assert(!ts.isBindingPattern(node.name));
                             variableDeclarationNode = node;
-                            name_30 = node.name;
+                            name_33 = node.name;
                         }
                         if (ts.isConst(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.constElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.constElement);
                         }
                         else if (ts.isLet(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.letElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.letElement);
                         }
                         else {
-                            return createItem(node, getTextOfNode(name_30), ts.ScriptElementKind.variableElement);
+                            return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.variableElement);
                         }
                     case 144 /* Constructor */:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
@@ -38220,8 +39632,8 @@ var ts;
                     //    word part. That way we don't match something like 'Class' when the user types 'a'.
                     //    But we would match 'FooAttribute' (since 'Attribute' starts with 'a').
                     var wordSpans = getWordSpans(candidate);
-                    for (var _i = 0; _i < wordSpans.length; _i++) {
-                        var span = wordSpans[_i];
+                    for (var _i = 0, wordSpans_1 = wordSpans; _i < wordSpans_1.length; _i++) {
+                        var span = wordSpans_1[_i];
                         if (partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ true)) {
                             return createPatternMatch(PatternMatchKind.substring, punctuationStripped, 
                             /*isCaseSensitive:*/ partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ false));
@@ -38327,8 +39739,8 @@ var ts;
             // Only if all words have some sort of match is the pattern considered matched.
             var subWordTextChunks = segment.subWordTextChunks;
             var matches = undefined;
-            for (var _i = 0; _i < subWordTextChunks.length; _i++) {
-                var subWordTextChunk = subWordTextChunks[_i];
+            for (var _i = 0, subWordTextChunks_1 = subWordTextChunks; _i < subWordTextChunks_1.length; _i++) {
+                var subWordTextChunk = subWordTextChunks_1[_i];
                 // Try to match the candidate with this word
                 var result = matchTextChunk(candidate, subWordTextChunk, /*punctuationStripped:*/ true);
                 if (!result) {
@@ -38886,7 +40298,7 @@ var ts;
             if (!candidates.length) {
                 // We didn't have any sig help items produced by the TS compiler.  If this is a JS 
                 // file, then see if we can figure out anything better.
-                if (ts.isJavaScript(sourceFile.fileName)) {
+                if (ts.isSourceFileJavaScript(sourceFile)) {
                     return createJavaScriptSignatureHelpItems(argumentInfo);
                 }
                 return undefined;
@@ -38913,8 +40325,8 @@ var ts;
                     var nameToDeclarations = sourceFile_1.getNamedDeclarations();
                     var declarations = ts.getProperty(nameToDeclarations, name.text);
                     if (declarations) {
-                        for (var _b = 0; _b < declarations.length; _b++) {
-                            var declaration = declarations[_b];
+                        for (var _b = 0, declarations_7 = declarations; _b < declarations_7.length; _b++) {
+                            var declaration = declarations_7[_b];
                             var symbol = declaration.symbol;
                             if (symbol) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
@@ -39030,8 +40442,8 @@ var ts;
                 // arg index.
                 var argumentIndex = 0;
                 var listChildren = argumentsList.getChildren();
-                for (var _i = 0; _i < listChildren.length; _i++) {
-                    var child = listChildren[_i];
+                for (var _i = 0, listChildren_1 = listChildren; _i < listChildren_1.length; _i++) {
+                    var child = listChildren_1[_i];
                     if (child === node) {
                         break;
                     }
@@ -39576,8 +40988,8 @@ var ts;
                 return n;
             }
             var children = n.getChildren();
-            for (var _i = 0; _i < children.length; _i++) {
-                var child = children[_i];
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
                 var shouldDiveInChildNode = 
                 // previous token is enclosed somewhere in the child
                 (child.pos <= previousToken.pos && child.end > previousToken.end) ||
@@ -39739,17 +41151,17 @@ var ts;
     function getNodeModifiers(node) {
         var flags = ts.getCombinedNodeFlags(node);
         var result = [];
-        if (flags & 32 /* Private */)
+        if (flags & 16 /* Private */)
             result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 64 /* Protected */)
+        if (flags & 32 /* Protected */)
             result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
-        if (flags & 16 /* Public */)
+        if (flags & 8 /* Public */)
             result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 128 /* Static */)
+        if (flags & 64 /* Static */)
             result.push(ts.ScriptElementKindModifier.staticModifier);
-        if (flags & 256 /* Abstract */)
+        if (flags & 128 /* Abstract */)
             result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 1 /* Export */)
+        if (flags & 2 /* Export */)
             result.push(ts.ScriptElementKindModifier.exportedModifier);
         if (ts.isInAmbientContext(node))
             result.push(ts.ScriptElementKindModifier.ambientModifier);
@@ -40746,9 +42158,9 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_31 in o) {
-                    if (o[name_31] === rule) {
-                        return name_31;
+                for (var name_34 in o) {
+                    if (o[name_34] === rule) {
+                        return name_34;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -41180,7 +42592,7 @@ var ts;
                 function TokenRangeAccess(from, to, except) {
                     this.tokens = [];
                     for (var token = from; token <= to; token++) {
-                        if (except.indexOf(token) < 0) {
+                        if (ts.indexOf(except, token) < 0) {
                             this.tokens.push(token);
                         }
                     }
@@ -41893,8 +43305,8 @@ var ts;
                         }
                     }
                     var inheritedIndentation = -1 /* Unknown */;
-                    for (var _i = 0; _i < nodes.length; _i++) {
-                        var child = nodes[_i];
+                    for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
+                        var child = nodes_6[_i];
                         inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, /*isListElement*/ true);
                     }
                     if (listEndToken !== 0 /* Unknown */) {
@@ -41923,8 +43335,8 @@ var ts;
                     var tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
                     if (isTokenInRange) {
                         var rangeHasError = rangeContainsError(currentTokenInfo.token);
-                        // save prevStartLine since processRange will overwrite this value with current ones
-                        var prevStartLine = previousRangeStartLine;
+                        // save previousRange since processRange will overwrite this value with current one
+                        var savePreviousRange = previousRange;
                         lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
                         if (rangeHasError) {
                             // do not indent comments\token if token range overlaps with some error
@@ -41935,7 +43347,9 @@ var ts;
                                 indentToken = lineAdded;
                             }
                             else {
-                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                                // indent token only if end line of previous range does not match start line of the token
+                                var prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
+                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
                             }
                         }
                     }
@@ -41983,8 +43397,8 @@ var ts;
                 }
             }
             function processTrivia(trivia, parent, contextNode, dynamicIndentation) {
-                for (var _i = 0; _i < trivia.length; _i++) {
-                    var triviaItem = trivia[_i];
+                for (var _i = 0, trivia_1 = trivia; _i < trivia_1.length; _i++) {
+                    var triviaItem = trivia_1[_i];
                     if (ts.isComment(triviaItem.kind) && ts.rangeContainsRange(originalRange, triviaItem)) {
                         var triviaItemStart = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos);
                         processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
@@ -42581,7 +43995,6 @@ var ts;
                                 return node;
                         }
                     }
-                    return node;
                 }
             }
             function deriveActualIndentationFromList(list, index, sourceFile, options) {
@@ -42792,15 +44205,18 @@ var ts;
     ];
     var jsDocCompletionEntries;
     function createNode(kind, pos, end, flags, parent) {
-        var node = new (ts.getNodeConstructor(kind))();
-        node.pos = pos;
-        node.end = end;
+        var node = new NodeObject(kind, pos, end);
         node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
-        function NodeObject() {
+        function NodeObject(kind, pos, end) {
+            this.kind = kind;
+            this.pos = pos;
+            this.end = end;
+            this.flags = 0 /* None */;
+            this.parent = undefined;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -42834,17 +44250,17 @@ var ts;
             while (pos < end) {
                 var token = scanner.scan();
                 var textPos = scanner.getTextPos();
-                nodes.push(createNode(token, pos, textPos, 4096 /* Synthetic */, this));
+                nodes.push(createNode(token, pos, textPos, 2048 /* Synthetic */, this));
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(271 /* SyntaxList */, nodes.pos, nodes.end, 4096 /* Synthetic */, this);
+            var list = createNode(271 /* SyntaxList */, nodes.pos, nodes.end, 2048 /* Synthetic */, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0; _i < nodes.length; _i++) {
-                var node = nodes[_i];
+            for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+                var node = nodes_7[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -43283,8 +44699,8 @@ var ts;
     })();
     var SourceFileObject = (function (_super) {
         __extends(SourceFileObject, _super);
-        function SourceFileObject() {
-            _super.apply(this, arguments);
+        function SourceFileObject(kind, pos, end) {
+            _super.call(this, kind, pos, end);
         }
         SourceFileObject.prototype.update = function (newText, textChangeRange) {
             return ts.updateSourceFile(this, newText, textChangeRange);
@@ -43399,7 +44815,7 @@ var ts;
                         break;
                     case 138 /* Parameter */:
                         // Only consider properties defined as constructor parameters
-                        if (!(node.flags & 112 /* AccessibilityModifier */)) {
+                        if (!(node.flags & 56 /* AccessibilityModifier */)) {
                             break;
                         }
                     // fall through
@@ -43606,6 +45022,9 @@ var ts;
         ClassificationTypeNames.typeAliasName = "type alias name";
         ClassificationTypeNames.parameterName = "parameter name";
         ClassificationTypeNames.docCommentTagName = "doc comment tag name";
+        ClassificationTypeNames.jsxOpenTagName = "jsx open tag name";
+        ClassificationTypeNames.jsxCloseTagName = "jsx close tag name";
+        ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name";
         return ClassificationTypeNames;
     })();
     ts.ClassificationTypeNames = ClassificationTypeNames;
@@ -43628,6 +45047,9 @@ var ts;
         ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
         ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
         ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
+        ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
+        ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
+        ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
     })(ts.ClassificationType || (ts.ClassificationType = {}));
     var ClassificationType = ts.ClassificationType;
     function displayPartsToString(displayParts) {
@@ -43675,13 +45097,15 @@ var ts;
     var HostCache = (function () {
         function HostCache(host, getCanonicalFileName) {
             this.host = host;
+            this.getCanonicalFileName = getCanonicalFileName;
             // script id => script index
-            this.fileNameToEntry = ts.createFileMap(getCanonicalFileName);
+            this.currentDirectory = host.getCurrentDirectory();
+            this.fileNameToEntry = ts.createFileMap();
             // Initialize the list with the root file names
             var rootFileNames = host.getScriptFileNames();
-            for (var _i = 0; _i < rootFileNames.length; _i++) {
-                var fileName = rootFileNames[_i];
-                this.createEntry(fileName);
+            for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) {
+                var fileName = rootFileNames_1[_i];
+                this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
             }
             // store the compilation settings
             this._compilationSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
@@ -43689,7 +45113,7 @@ var ts;
         HostCache.prototype.compilationSettings = function () {
             return this._compilationSettings;
         };
-        HostCache.prototype.createEntry = function (fileName) {
+        HostCache.prototype.createEntry = function (fileName, path) {
             var entry;
             var scriptSnapshot = this.host.getScriptSnapshot(fileName);
             if (scriptSnapshot) {
@@ -43699,36 +45123,37 @@ var ts;
                     scriptSnapshot: scriptSnapshot
                 };
             }
-            this.fileNameToEntry.set(fileName, entry);
+            this.fileNameToEntry.set(path, entry);
             return entry;
         };
-        HostCache.prototype.getEntry = function (fileName) {
-            return this.fileNameToEntry.get(fileName);
+        HostCache.prototype.getEntry = function (path) {
+            return this.fileNameToEntry.get(path);
         };
-        HostCache.prototype.contains = function (fileName) {
-            return this.fileNameToEntry.contains(fileName);
+        HostCache.prototype.contains = function (path) {
+            return this.fileNameToEntry.contains(path);
         };
         HostCache.prototype.getOrCreateEntry = function (fileName) {
-            if (this.contains(fileName)) {
-                return this.getEntry(fileName);
+            var path = ts.toPath(fileName, this.currentDirectory, this.getCanonicalFileName);
+            if (this.contains(path)) {
+                return this.getEntry(path);
             }
-            return this.createEntry(fileName);
+            return this.createEntry(fileName, path);
         };
         HostCache.prototype.getRootFileNames = function () {
             var fileNames = [];
-            this.fileNameToEntry.forEachValue(function (value) {
+            this.fileNameToEntry.forEachValue(function (path, value) {
                 if (value) {
                     fileNames.push(value.hostFileName);
                 }
             });
             return fileNames;
         };
-        HostCache.prototype.getVersion = function (fileName) {
-            var file = this.getEntry(fileName);
+        HostCache.prototype.getVersion = function (path) {
+            var file = this.getEntry(path);
             return file && file.version;
         };
-        HostCache.prototype.getScriptSnapshot = function (fileName) {
-            var file = this.getEntry(fileName);
+        HostCache.prototype.getScriptSnapshot = function (path) {
+            var file = this.getEntry(path);
             return file && file.scriptSnapshot;
         };
         return HostCache;
@@ -43910,7 +45335,8 @@ var ts;
             : (function (fileName) { return fileName.toLowerCase(); });
     }
     ts.createGetCanonicalFileName = createGetCanonicalFileName;
-    function createDocumentRegistry(useCaseSensitiveFileNames) {
+    function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
+        if (currentDirectory === void 0) { currentDirectory = ""; }
         // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
         // for those settings.
         var buckets = {};
@@ -43922,7 +45348,7 @@ var ts;
             var key = getKeyFromCompilationSettings(settings);
             var bucket = ts.lookUp(buckets, key);
             if (!bucket && createIfMissing) {
-                buckets[key] = bucket = ts.createFileMap(getCanonicalFileName);
+                buckets[key] = bucket = ts.createFileMap();
             }
             return bucket;
         }
@@ -43930,14 +45356,13 @@ var ts;
             var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === '_'; }).map(function (name) {
                 var entries = ts.lookUp(buckets, name);
                 var sourceFiles = [];
-                for (var i in entries) {
-                    var entry = entries.get(i);
+                entries.forEachValue(function (key, entry) {
                     sourceFiles.push({
-                        name: i,
+                        name: key,
                         refCount: entry.languageServiceRefCount,
                         references: entry.owners.slice(0)
                     });
-                }
+                });
                 sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
                 return {
                     bucket: name,
@@ -43954,7 +45379,8 @@ var ts;
         }
         function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) {
             var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
-            var entry = bucket.get(fileName);
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var entry = bucket.get(path);
             if (!entry) {
                 ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
                 // Have never seen this file with these settings.  Create a new source file for it.
@@ -43964,7 +45390,7 @@ var ts;
                     languageServiceRefCount: 0,
                     owners: []
                 };
-                bucket.set(fileName, entry);
+                bucket.set(path, entry);
             }
             else {
                 // We have an entry for this file.  However, it may be for a different version of
@@ -43987,11 +45413,12 @@ var ts;
         function releaseDocument(fileName, compilationSettings) {
             var bucket = getBucketForCompilationSettings(compilationSettings, false);
             ts.Debug.assert(bucket !== undefined);
-            var entry = bucket.get(fileName);
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var entry = bucket.get(path);
             entry.languageServiceRefCount--;
             ts.Debug.assert(entry.languageServiceRefCount >= 0);
             if (entry.languageServiceRefCount === 0) {
-                bucket.remove(fileName);
+                bucket.remove(path);
             }
         }
         return {
@@ -44002,8 +45429,9 @@ var ts;
         };
     }
     ts.createDocumentRegistry = createDocumentRegistry;
-    function preProcessFile(sourceText, readImportFiles) {
+    function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) {
         if (readImportFiles === void 0) { readImportFiles = true; }
+        if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
         var referencedFiles = [];
         var importedFiles = [];
         var ambientExternalModules;
@@ -44037,9 +45465,207 @@ var ts;
                 end: pos + importPath.length
             });
         }
-        function processImport() {
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeDeclare() {
+            var token = scanner.getToken();
+            if (token === 122 /* DeclareKeyword */) {
+                // declare module "mod"
+                token = scanner.scan();
+                if (token === 125 /* ModuleKeyword */) {
+                    token = scanner.scan();
+                    if (token === 9 /* StringLiteral */) {
+                        recordAmbientExternalModule();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeImport() {
+            var token = scanner.getToken();
+            if (token === 89 /* ImportKeyword */) {
+                token = scanner.scan();
+                if (token === 9 /* StringLiteral */) {
+                    // import "mod";
+                    recordModuleName();
+                    return true;
+                }
+                else {
+                    if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === 133 /* FromKeyword */) {
+                            token = scanner.scan();
+                            if (token === 9 /* StringLiteral */) {
+                                // import d from "mod";
+                                recordModuleName();
+                                return true;
+                            }
+                        }
+                        else if (token === 56 /* EqualsToken */) {
+                            if (tryConsumeRequireCall(/* skipCurrentToken */ true)) {
+                                return true;
+                            }
+                        }
+                        else if (token === 24 /* CommaToken */) {
+                            // consume comma and keep going
+                            token = scanner.scan();
+                        }
+                        else {
+                            // unknown syntax
+                            return true;
+                        }
+                    }
+                    if (token === 15 /* OpenBraceToken */) {
+                        token = scanner.scan();
+                        // consume "{ a as B, c, d as D}" clauses
+                        // make sure that it stops on EOF
+                        while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
+                            token = scanner.scan();
+                        }
+                        if (token === 16 /* CloseBraceToken */) {
+                            token = scanner.scan();
+                            if (token === 133 /* FromKeyword */) {
+                                token = scanner.scan();
+                                if (token === 9 /* StringLiteral */) {
+                                    // import {a as A} from "mod";
+                                    // import d, {a, b as B} from "mod"
+                                    recordModuleName();
+                                }
+                            }
+                        }
+                    }
+                    else if (token === 37 /* AsteriskToken */) {
+                        token = scanner.scan();
+                        if (token === 116 /* AsKeyword */) {
+                            token = scanner.scan();
+                            if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
+                                token = scanner.scan();
+                                if (token === 133 /* FromKeyword */) {
+                                    token = scanner.scan();
+                                    if (token === 9 /* StringLiteral */) {
+                                        // import * as NS from "mod"
+                                        // import d, * as NS from "mod"
+                                        recordModuleName();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeExport() {
+            var token = scanner.getToken();
+            if (token === 82 /* ExportKeyword */) {
+                token = scanner.scan();
+                if (token === 15 /* OpenBraceToken */) {
+                    token = scanner.scan();
+                    // consume "{ a as B, c, d as D}" clauses
+                    // make sure it stops on EOF
+                    while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
+                        token = scanner.scan();
+                    }
+                    if (token === 16 /* CloseBraceToken */) {
+                        token = scanner.scan();
+                        if (token === 133 /* FromKeyword */) {
+                            token = scanner.scan();
+                            if (token === 9 /* StringLiteral */) {
+                                // export {a as A} from "mod";
+                                // export {a, b as B} from "mod"
+                                recordModuleName();
+                            }
+                        }
+                    }
+                }
+                else if (token === 37 /* AsteriskToken */) {
+                    token = scanner.scan();
+                    if (token === 133 /* FromKeyword */) {
+                        token = scanner.scan();
+                        if (token === 9 /* StringLiteral */) {
+                            // export * from "mod"
+                            recordModuleName();
+                        }
+                    }
+                }
+                else if (token === 89 /* ImportKeyword */) {
+                    token = scanner.scan();
+                    if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === 56 /* EqualsToken */) {
+                            if (tryConsumeRequireCall(/* skipCurrentToken */ true)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeRequireCall(skipCurrentToken) {
+            var token = skipCurrentToken ? scanner.scan() : scanner.getToken();
+            if (token === 127 /* RequireKeyword */) {
+                token = scanner.scan();
+                if (token === 17 /* OpenParenToken */) {
+                    token = scanner.scan();
+                    if (token === 9 /* StringLiteral */) {
+                        //  require("mod");
+                        recordModuleName();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeDefine() {
+            var token = scanner.getToken();
+            if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") {
+                token = scanner.scan();
+                if (token !== 17 /* OpenParenToken */) {
+                    return true;
+                }
+                token = scanner.scan();
+                if (token === 9 /* StringLiteral */) {
+                    // looks like define ("modname", ... - skip string literal and comma
+                    token = scanner.scan();
+                    if (token === 24 /* CommaToken */) {
+                        token = scanner.scan();
+                    }
+                    else {
+                        // unexpected token
+                        return true;
+                    }
+                }
+                // should be start of dependency list
+                if (token !== 19 /* OpenBracketToken */) {
+                    return true;
+                }
+                // skip open bracket
+                token = scanner.scan();
+                var i = 0;
+                // scan until ']' or EOF
+                while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) {
+                    // record string literals as module names
+                    if (token === 9 /* StringLiteral */) {
+                        recordModuleName();
+                        i++;
+                    }
+                    token = scanner.scan();
+                }
+                return true;
+            }
+            return false;
+        }
+        function processImports() {
             scanner.setText(sourceText);
-            var token = scanner.scan();
+            scanner.scan();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -44051,152 +45677,26 @@ var ts;
             //    export * from "mod"
             //    export {a as b} from "mod"
             //    export import i = require("mod")
-            while (token !== 1 /* EndOfFileToken */) {
-                if (token === 122 /* DeclareKeyword */) {
-                    // declare module "mod"
-                    token = scanner.scan();
-                    if (token === 125 /* ModuleKeyword */) {
-                        token = scanner.scan();
-                        if (token === 9 /* StringLiteral */) {
-                            recordAmbientExternalModule();
-                            continue;
-                        }
-                    }
+            //    (for JavaScript files) require("mod")
+            while (true) {
+                if (scanner.getToken() === 1 /* EndOfFileToken */) {
+                    break;
                 }
-                else if (token === 89 /* ImportKeyword */) {
-                    token = scanner.scan();
-                    if (token === 9 /* StringLiteral */) {
-                        // import "mod";
-                        recordModuleName();
-                        continue;
-                    }
-                    else {
-                        if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === 133 /* FromKeyword */) {
-                                token = scanner.scan();
-                                if (token === 9 /* StringLiteral */) {
-                                    // import d from "mod";
-                                    recordModuleName();
-                                    continue;
-                                }
-                            }
-                            else if (token === 56 /* EqualsToken */) {
-                                token = scanner.scan();
-                                if (token === 127 /* RequireKeyword */) {
-                                    token = scanner.scan();
-                                    if (token === 17 /* OpenParenToken */) {
-                                        token = scanner.scan();
-                                        if (token === 9 /* StringLiteral */) {
-                                            //  import i = require("mod");
-                                            recordModuleName();
-                                            continue;
-                                        }
-                                    }
-                                }
-                            }
-                            else if (token === 24 /* CommaToken */) {
-                                // consume comma and keep going
-                                token = scanner.scan();
-                            }
-                            else {
-                                // unknown syntax
-                                continue;
-                            }
-                        }
-                        if (token === 15 /* OpenBraceToken */) {
-                            token = scanner.scan();
-                            // consume "{ a as B, c, d as D}" clauses
-                            while (token !== 16 /* CloseBraceToken */) {
-                                token = scanner.scan();
-                            }
-                            if (token === 16 /* CloseBraceToken */) {
-                                token = scanner.scan();
-                                if (token === 133 /* FromKeyword */) {
-                                    token = scanner.scan();
-                                    if (token === 9 /* StringLiteral */) {
-                                        // import {a as A} from "mod";
-                                        // import d, {a, b as B} from "mod"
-                                        recordModuleName();
-                                    }
-                                }
-                            }
-                        }
-                        else if (token === 37 /* AsteriskToken */) {
-                            token = scanner.scan();
-                            if (token === 116 /* AsKeyword */) {
-                                token = scanner.scan();
-                                if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                                    token = scanner.scan();
-                                    if (token === 133 /* FromKeyword */) {
-                                        token = scanner.scan();
-                                        if (token === 9 /* StringLiteral */) {
-                                            // import * as NS from "mod"
-                                            // import d, * as NS from "mod"
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                // check if at least one of alternative have moved scanner forward
+                if (tryConsumeDeclare() ||
+                    tryConsumeImport() ||
+                    tryConsumeExport() ||
+                    (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) {
+                    continue;
                 }
-                else if (token === 82 /* ExportKeyword */) {
-                    token = scanner.scan();
-                    if (token === 15 /* OpenBraceToken */) {
-                        token = scanner.scan();
-                        // consume "{ a as B, c, d as D}" clauses
-                        while (token !== 16 /* CloseBraceToken */) {
-                            token = scanner.scan();
-                        }
-                        if (token === 16 /* CloseBraceToken */) {
-                            token = scanner.scan();
-                            if (token === 133 /* FromKeyword */) {
-                                token = scanner.scan();
-                                if (token === 9 /* StringLiteral */) {
-                                    // export {a as A} from "mod";
-                                    // export {a, b as B} from "mod"
-                                    recordModuleName();
-                                }
-                            }
-                        }
-                    }
-                    else if (token === 37 /* AsteriskToken */) {
-                        token = scanner.scan();
-                        if (token === 133 /* FromKeyword */) {
-                            token = scanner.scan();
-                            if (token === 9 /* StringLiteral */) {
-                                // export * from "mod"
-                                recordModuleName();
-                            }
-                        }
-                    }
-                    else if (token === 89 /* ImportKeyword */) {
-                        token = scanner.scan();
-                        if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === 56 /* EqualsToken */) {
-                                token = scanner.scan();
-                                if (token === 127 /* RequireKeyword */) {
-                                    token = scanner.scan();
-                                    if (token === 17 /* OpenParenToken */) {
-                                        token = scanner.scan();
-                                        if (token === 9 /* StringLiteral */) {
-                                            //  export import i = require("mod");
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                else {
+                    scanner.scan();
                 }
-                token = scanner.scan();
             }
             scanner.setText(undefined);
         }
         if (readImportFiles) {
-            processImport();
+            processImports();
         }
         processTripleSlashDirectives();
         return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules };
@@ -44398,7 +45898,7 @@ var ts;
             case 144 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
             case 137 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
             case 247 /* EnumMember */: return ScriptElementKind.variableElement;
-            case 138 /* Parameter */: return (node.flags & 112 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 138 /* Parameter */: return (node.flags & 56 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
             case 221 /* ImportEqualsDeclaration */:
             case 226 /* ImportSpecifier */:
             case 223 /* ImportClause */:
@@ -44424,13 +45924,14 @@ var ts;
         return CancellationTokenObject;
     })();
     function createLanguageService(host, documentRegistry) {
-        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(); }
+        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var ruleProvider;
         var program;
         var lastProjectVersion;
         var useCaseSensitivefileNames = false;
         var cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
+        var currentDirectory = host.getCurrentDirectory();
         // Check if the localized messages json is set, otherwise query the host for it
         if (!ts.localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
             ts.localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
@@ -44442,8 +45943,7 @@ var ts;
         }
         var getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames);
         function getValidSourceFile(fileName) {
-            fileName = ts.normalizeSlashes(fileName);
-            var sourceFile = program.getSourceFile(getCanonicalFileName(fileName));
+            var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
@@ -44495,7 +45995,7 @@ var ts;
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
                 writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+                getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     // stub missing host functionality
                     ts.Debug.assert(!host.resolveModuleNames);
@@ -44515,11 +46015,10 @@ var ts;
             // not part of the new program.
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
-                for (var _i = 0; _i < oldSourceFiles.length; _i++) {
-                    var oldSourceFile = oldSourceFiles[_i];
-                    var fileName = oldSourceFile.fileName;
-                    if (!newProgram.getSourceFile(fileName) || changesInCompilationSettingsAffectSyntax) {
-                        documentRegistry.releaseDocument(fileName, oldSettings);
+                for (var _i = 0, oldSourceFiles_1 = oldSourceFiles; _i < oldSourceFiles_1.length; _i++) {
+                    var oldSourceFile = oldSourceFiles_1[_i];
+                    if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) {
+                        documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings);
                     }
                 }
             }
@@ -44575,7 +46074,8 @@ var ts;
                 return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
             }
             function sourceFileUpToDate(sourceFile) {
-                return sourceFile && sourceFile.version === hostCache.getVersion(sourceFile.fileName);
+                var path = sourceFile.path || ts.toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName);
+                return sourceFile && sourceFile.version === hostCache.getVersion(path);
             }
             function programUpToDate() {
                 // If we haven't create a program yet, then it is not up-to-date
@@ -44588,8 +46088,8 @@ var ts;
                     return false;
                 }
                 // If any file is not up-to-date, then the whole program is not up-to-date
-                for (var _i = 0; _i < rootFileNames.length; _i++) {
-                    var fileName = rootFileNames[_i];
+                for (var _i = 0, rootFileNames_2 = rootFileNames; _i < rootFileNames_2.length; _i++) {
+                    var fileName = rootFileNames_2[_i];
                     if (!sourceFileUpToDate(program.getSourceFile(fileName))) {
                         return false;
                     }
@@ -44627,7 +46127,7 @@ var ts;
             // For JavaScript files, we don't want to report the normal typescript semantic errors.
             // Instead, we just report errors for using TypeScript-only constructs from within a
             // JavaScript file.
-            if (ts.isJavaScript(fileName)) {
+            if (ts.isSourceFileJavaScript(targetSourceFile)) {
                 return getJavaScriptSemanticDiagnostics(targetSourceFile);
             }
             // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file.
@@ -44764,8 +46264,8 @@ var ts;
             }
             function checkModifiers(modifiers) {
                 if (modifiers) {
-                    for (var _i = 0; _i < modifiers.length; _i++) {
-                        var modifier = modifiers[_i];
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
                             case 112 /* PublicKeyword */:
                             case 110 /* PrivateKeyword */:
@@ -44839,7 +46339,7 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var syntacticStart = new Date().getTime();
             var sourceFile = getValidSourceFile(fileName);
-            var isJavaScriptFile = ts.isJavaScript(fileName);
+            var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile);
             var isJsDocTagName = false;
             var start = new Date().getTime();
             var currentToken = ts.getTokenAtPosition(sourceFile, position);
@@ -44893,9 +46393,9 @@ var ts;
             // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
             // Skip this partial identifier and adjust the contextToken to the token that precedes it.
             if (contextToken && position <= contextToken.end && ts.isWord(contextToken.kind)) {
-                var start_4 = new Date().getTime();
+                var start_3 = new Date().getTime();
                 contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile);
-                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_4));
+                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_3));
             }
             // Find the node where completion is requested on.
             // Also determine whether we are trying to complete with members of that node
@@ -45170,13 +46670,13 @@ var ts;
                 if (contextToken.kind === 9 /* StringLiteral */
                     || contextToken.kind === 10 /* RegularExpressionLiteral */
                     || ts.isTemplateLiteralKind(contextToken.kind)) {
-                    var start_5 = contextToken.getStart();
+                    var start_4 = contextToken.getStart();
                     var end = contextToken.getEnd();
                     // To be "in" one of these literals, the position has to be:
                     //   1. entirely within the token text.
                     //   2. at the end position of an unterminated token.
                     //   3. at the end of a regular expression (due to trailing flags like '/foo/g').
-                    if (start_5 < position && position < end) {
+                    if (start_4 < position && position < end) {
                         return true;
                     }
                     if (position === end) {
@@ -45467,14 +46967,14 @@ var ts;
              */
             function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
                 var exisingImportsOrExports = {};
-                for (var _i = 0; _i < namedImportsOrExports.length; _i++) {
-                    var element = namedImportsOrExports[_i];
+                for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
+                    var element = namedImportsOrExports_1[_i];
                     // If this is the current item we are editing right now, do not filter it out
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_32 = element.propertyName || element.name;
-                    exisingImportsOrExports[name_32.text] = true;
+                    var name_35 = element.propertyName || element.name;
+                    exisingImportsOrExports[name_35.text] = true;
                 }
                 if (ts.isEmpty(exisingImportsOrExports)) {
                     return exportsOfModule;
@@ -45492,8 +46992,8 @@ var ts;
                     return contextualMemberSymbols;
                 }
                 var existingMemberNames = {};
-                for (var _i = 0; _i < existingMembers.length; _i++) {
-                    var m = existingMembers[_i];
+                for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
+                    var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
                     if (m.kind !== 245 /* PropertyAssignment */ &&
                         m.kind !== 246 /* ShorthandPropertyAssignment */ &&
@@ -45506,7 +47006,10 @@ var ts;
                     }
                     var existingName = void 0;
                     if (m.kind === 163 /* BindingElement */ && m.propertyName) {
-                        existingName = m.propertyName.text;
+                        // include only identifiers in completion list
+                        if (m.propertyName.kind === 69 /* Identifier */) {
+                            existingName = m.propertyName.text;
+                        }
                     }
                     else {
                         // TODO(jfreeman): Account for computed property name
@@ -45526,8 +47029,8 @@ var ts;
              */
             function filterJsxAttributes(symbols, attributes) {
                 var seenNames = {};
-                for (var _i = 0; _i < attributes.length; _i++) {
-                    var attr = attributes[_i];
+                for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
+                    var attr = attributes_1[_i];
                     // If this is the current item we are editing right now, do not filter it out
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
@@ -45546,46 +47049,43 @@ var ts;
                 return undefined;
             }
             var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName;
-            var entries;
             if (isJsDocTagName) {
                 // If the current position is a jsDoc tag name, only tag names should be provided for completion
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
-            if (isRightOfDot && ts.isJavaScript(fileName)) {
-                entries = getCompletionEntriesFromSymbols(symbols);
-                ts.addRange(entries, getJavaScriptCompletionEntries());
+            var sourceFile = getValidSourceFile(fileName);
+            var entries = [];
+            if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) {
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
+                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     return undefined;
                 }
-                entries = getCompletionEntriesFromSymbols(symbols);
+                getCompletionEntriesFromSymbols(symbols, entries);
             }
             // Add keywords if this is not a member completion list
             if (!isMemberCompletion && !isJsDocTagName) {
                 ts.addRange(entries, keywordCompletions);
             }
             return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries() {
+            function getJavaScriptCompletionEntries(sourceFile, uniqueNames) {
                 var entries = [];
-                var allNames = {};
                 var target = program.getCompilerOptions().target;
-                for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
-                    var sourceFile = _a[_i];
-                    var nameTable = getNameTable(sourceFile);
-                    for (var name_33 in nameTable) {
-                        if (!allNames[name_33]) {
-                            allNames[name_33] = name_33;
-                            var displayName = getCompletionEntryDisplayName(name_33, target, /*performCharacterChecks:*/ true);
-                            if (displayName) {
-                                var entry = {
-                                    name: displayName,
-                                    kind: ScriptElementKind.warning,
-                                    kindModifiers: "",
-                                    sortText: "1"
-                                };
-                                entries.push(entry);
-                            }
+                var nameTable = getNameTable(sourceFile);
+                for (var name_36 in nameTable) {
+                    if (!uniqueNames[name_36]) {
+                        uniqueNames[name_36] = name_36;
+                        var displayName = getCompletionEntryDisplayName(name_36, target, /*performCharacterChecks:*/ true);
+                        if (displayName) {
+                            var entry = {
+                                name: displayName,
+                                kind: ScriptElementKind.warning,
+                                kindModifiers: "",
+                                sortText: "1"
+                            };
+                            entries.push(entry);
                         }
                     }
                 }
@@ -45623,25 +47123,24 @@ var ts;
                     sortText: "0"
                 };
             }
-            function getCompletionEntriesFromSymbols(symbols) {
+            function getCompletionEntriesFromSymbols(symbols, entries) {
                 var start = new Date().getTime();
-                var entries = [];
+                var uniqueNames = {};
                 if (symbols) {
-                    var nameToSymbol = {};
-                    for (var _i = 0; _i < symbols.length; _i++) {
-                        var symbol = symbols[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var symbol = symbols_3[_i];
                         var entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             var id = ts.escapeIdentifier(entry.name);
-                            if (!ts.lookUp(nameToSymbol, id)) {
+                            if (!ts.lookUp(uniqueNames, id)) {
                                 entries.push(entry);
-                                nameToSymbol[id] = symbol;
+                                uniqueNames[id] = id;
                             }
                         }
                     }
                 }
                 log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
-                return entries;
+                return uniqueNames;
             }
         }
         function getCompletionEntryDetails(fileName, position, entryName) {
@@ -45842,16 +47341,16 @@ var ts;
                                 case ScriptElementKind.parameterElement:
                                 case ScriptElementKind.localVariableElement:
                                     // If it is call or construct signature of lambda's write type name
-                                    displayParts.push(ts.punctuationPart(54 /* ColonToken */));
+                                    displayParts.push(ts.punctuationPart(ts.SyntaxKind.ColonToken));
                                     displayParts.push(ts.spacePart());
                                     if (useConstructSignatures) {
-                                        displayParts.push(ts.keywordPart(92 /* NewKeyword */));
+                                        displayParts.push(ts.keywordPart(ts.SyntaxKind.NewKeyword));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 65536 /* Anonymous */)) {
-                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */));
+                                    if (!(type.flags & ts.TypeFlags.Anonymous)) {
+                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, ts.SymbolFormatFlags.WriteTypeParametersOrArguments));
                                     }
-                                    addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */);
+                                    addSignatureDisplayParts(signature, allSignatures, ts.TypeFormatFlags.WriteArrowStyleSignature);
                                     break;
                                 default:
                                     // Just signature
@@ -46371,8 +47870,8 @@ var ts;
                     }
                     var fileNameToDocumentHighlights = {};
                     var result = [];
-                    for (var _i = 0; _i < referencedSymbols.length; _i++) {
-                        var referencedSymbol = referencedSymbols[_i];
+                    for (var _i = 0, referencedSymbols_1 = referencedSymbols; _i < referencedSymbols_1.length; _i++) {
+                        var referencedSymbol = referencedSymbols_1[_i];
                         for (var _a = 0, _b = referencedSymbol.references; _a < _b.length; _a++) {
                             var referenceEntry = _b[_a];
                             var fileName_1 = referenceEntry.fileName;
@@ -46516,7 +48015,6 @@ var ts;
                             ts.forEachChild(node, aggregate);
                         }
                     }
-                    ;
                 }
                 /**
                  * For lack of a better name, this function takes a throw statement and returns the
@@ -46554,7 +48052,6 @@ var ts;
                             ts.forEachChild(node, aggregate);
                         }
                     }
-                    ;
                 }
                 function ownsBreakOrContinueStatement(owner, statement) {
                     var actualOwner = getBreakOrContinueOwner(statement);
@@ -46623,7 +48120,7 @@ var ts;
                         case 219 /* ModuleBlock */:
                         case 248 /* SourceFile */:
                             // Container is either a class declaration or the declaration is a classDeclaration
-                            if (modifierFlag & 256 /* Abstract */) {
+                            if (modifierFlag & 128 /* Abstract */) {
                                 nodes = declaration.members.concat(declaration);
                             }
                             else {
@@ -46638,7 +48135,7 @@ var ts;
                             nodes = container.members;
                             // If we're an accessibility modifier, we're in an instance member and should search
                             // the constructor's parameter list for instance members as well.
-                            if (modifierFlag & 112 /* AccessibilityModifier */) {
+                            if (modifierFlag & 56 /* AccessibilityModifier */) {
                                 var constructor = ts.forEach(container.members, function (member) {
                                     return member.kind === 144 /* Constructor */ && member;
                                 });
@@ -46646,7 +48143,7 @@ var ts;
                                     nodes = nodes.concat(constructor.parameters);
                                 }
                             }
-                            else if (modifierFlag & 256 /* Abstract */) {
+                            else if (modifierFlag & 128 /* Abstract */) {
                                 nodes = nodes.concat(container);
                             }
                             break;
@@ -46662,19 +48159,19 @@ var ts;
                     function getFlagFromModifier(modifier) {
                         switch (modifier) {
                             case 112 /* PublicKeyword */:
-                                return 16 /* Public */;
+                                return 8 /* Public */;
                             case 110 /* PrivateKeyword */:
-                                return 32 /* Private */;
+                                return 16 /* Private */;
                             case 111 /* ProtectedKeyword */:
-                                return 64 /* Protected */;
+                                return 32 /* Protected */;
                             case 113 /* StaticKeyword */:
-                                return 128 /* Static */;
+                                return 64 /* Static */;
                             case 82 /* ExportKeyword */:
-                                return 1 /* Export */;
+                                return 2 /* Export */;
                             case 122 /* DeclareKeyword */:
-                                return 2 /* Ambient */;
+                                return 4 /* Ambient */;
                             case 115 /* AbstractKeyword */:
-                                return 256 /* Abstract */;
+                                return 128 /* Abstract */;
                             default:
                                 ts.Debug.fail();
                         }
@@ -46873,8 +48370,8 @@ var ts;
                     return undefined;
                 }
                 var result = [];
-                for (var _i = 0; _i < documentHighlights.length; _i++) {
-                    var entry = documentHighlights[_i];
+                for (var _i = 0, documentHighlights_1 = documentHighlights; _i < documentHighlights_1.length; _i++) {
+                    var entry = documentHighlights_1[_i];
                     for (var _a = 0, _b = entry.highlightSpans; _a < _b.length; _a++) {
                         var highlightSpan = _b[_a];
                         result.push({
@@ -46892,8 +48389,8 @@ var ts;
                 return undefined;
             }
             var referenceEntries = [];
-            for (var _i = 0; _i < referenceSymbols.length; _i++) {
-                var referenceSymbol = referenceSymbols[_i];
+            for (var _i = 0, referenceSymbols_1 = referenceSymbols; _i < referenceSymbols_1.length; _i++) {
+                var referenceSymbol = referenceSymbols_1[_i];
                 ts.addRange(referenceEntries, referenceSymbol.references);
             }
             return referenceEntries;
@@ -46978,8 +48475,8 @@ var ts;
             }
             else {
                 var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0; _i < sourceFiles.length; _i++) {
-                    var sourceFile = sourceFiles[_i];
+                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                    var sourceFile = sourceFiles_2[_i];
                     cancellationToken.throwIfCancellationRequested();
                     var nameTable = getNameTable(sourceFile);
                     if (ts.lookUp(nameTable, internedName)) {
@@ -47039,7 +48536,7 @@ var ts;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32 /* Private */) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 16 /* Private */) ? d : undefined; });
                     if (privateDeclaration) {
                         return ts.getAncestor(privateDeclaration, 214 /* ClassDeclaration */);
                     }
@@ -47057,8 +48554,8 @@ var ts;
                 var scope = undefined;
                 var declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var _i = 0; _i < declarations.length; _i++) {
-                        var declaration = declarations[_i];
+                    for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                        var declaration = declarations_8[_i];
                         var container = getContainerNode(declaration);
                         if (!container) {
                             return undefined;
@@ -47238,7 +48735,7 @@ var ts;
                     return undefined;
                 }
                 // Whether 'super' occurs in a static context within a class.
-                var staticFlag = 128 /* Static */;
+                var staticFlag = 64 /* Static */;
                 switch (searchSpaceNode.kind) {
                     case 141 /* PropertyDeclaration */:
                     case 140 /* PropertySignature */:
@@ -47266,7 +48763,7 @@ var ts;
                     // If we have a 'super' container, we must have an enclosing class.
                     // Now make sure the owning class is the same as the search-space
                     // and has the same static qualifier as the original 'super's owner.
-                    if (container && (128 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (64 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -47276,7 +48773,7 @@ var ts;
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
-                var staticFlag = 128 /* Static */;
+                var staticFlag = 64 /* Static */;
                 switch (searchSpaceNode.kind) {
                     case 143 /* MethodDeclaration */:
                     case 142 /* MethodSignature */:
@@ -47354,7 +48851,7 @@ var ts;
                             case 214 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
-                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 128 /* Static */) === staticFlag) {
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 64 /* Static */) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -47478,19 +48975,19 @@ var ts;
                 if (isNameOfPropertyAssignment(node)) {
                     var objectLiteral = node.parent.parent;
                     var contextualType = typeChecker.getContextualType(objectLiteral);
-                    var name_34 = node.text;
+                    var name_37 = node.text;
                     if (contextualType) {
                         if (contextualType.flags & 16384 /* Union */) {
                             // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types)
                             // if not, search the constituent types for the property
-                            var unionProperty = contextualType.getProperty(name_34);
+                            var unionProperty = contextualType.getProperty(name_37);
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
                                 var result_4 = [];
                                 ts.forEach(contextualType.types, function (t) {
-                                    var symbol = t.getProperty(name_34);
+                                    var symbol = t.getProperty(name_37);
                                     if (symbol) {
                                         result_4.push(symbol);
                                     }
@@ -47499,7 +48996,7 @@ var ts;
                             }
                         }
                         else {
-                            var symbol_1 = contextualType.getProperty(name_34);
+                            var symbol_1 = contextualType.getProperty(name_37);
                             if (symbol_1) {
                                 return [symbol_1];
                             }
@@ -47525,8 +49022,8 @@ var ts;
                         // To achieve that we will keep iterating until the result stabilizes.
                         // Remember the last meaning
                         lastIterationMeaning = meaning;
-                        for (var _i = 0; _i < declarations.length; _i++) {
-                            var declaration = declarations[_i];
+                        for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                            var declaration = declarations_9[_i];
                             var declarationMeaning = getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -47642,7 +49139,6 @@ var ts;
                     return 4 /* Namespace */ | 1 /* Value */;
             }
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
-            ts.Debug.fail("Unknown declaration type");
         }
         function isTypeReference(node) {
             if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
@@ -47911,6 +49407,9 @@ var ts;
                 case 16 /* typeAliasName */: return ClassificationTypeNames.typeAliasName;
                 case 17 /* parameterName */: return ClassificationTypeNames.parameterName;
                 case 18 /* docCommentTagName */: return ClassificationTypeNames.docCommentTagName;
+                case 19 /* jsxOpenTagName */: return ClassificationTypeNames.jsxOpenTagName;
+                case 20 /* jsxCloseTagName */: return ClassificationTypeNames.jsxCloseTagName;
+                case 21 /* jsxSelfClosingTagName */: return ClassificationTypeNames.jsxSelfClosingTagName;
             }
         }
         function convertClassifications(classifications) {
@@ -48180,6 +49679,21 @@ var ts;
                                     return 17 /* parameterName */;
                                 }
                                 return;
+                            case 235 /* JsxOpeningElement */:
+                                if (token.parent.tagName === token) {
+                                    return 19 /* jsxOpenTagName */;
+                                }
+                                return;
+                            case 237 /* JsxClosingElement */:
+                                if (token.parent.tagName === token) {
+                                    return 20 /* jsxCloseTagName */;
+                                }
+                                return;
+                            case 234 /* JsxSelfClosingElement */:
+                                if (token.parent.tagName === token) {
+                                    return 21 /* jsxSelfClosingTagName */;
+                                }
+                                return;
                         }
                     }
                     return 2 /* identifier */;
@@ -48221,8 +49735,8 @@ var ts;
                 if (matchKind) {
                     var parentElement = token.parent;
                     var childNodes = parentElement.getChildren(sourceFile);
-                    for (var _i = 0; _i < childNodes.length; _i++) {
-                        var current = childNodes[_i];
+                    for (var _i = 0, childNodes_1 = childNodes; _i < childNodes_1.length; _i++) {
+                        var current = childNodes_1[_i];
                         if (current.kind === matchKind) {
                             var range1 = ts.createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile));
                             var range2 = ts.createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile));
@@ -48552,12 +50066,12 @@ var ts;
                         // Disallow rename for elements that are defined in the standard TypeScript library.
                         var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         if (defaultLibFileName) {
-                            for (var _i = 0; _i < declarations.length; _i++) {
-                                var current = declarations[_i];
+                            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                                var current = declarations_10[_i];
                                 var sourceFile_2 = current.getSourceFile();
                                 var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
                                 if (sourceFile_2 && getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) {
-                                    return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                                    return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
                             }
                         }
@@ -48577,7 +50091,7 @@ var ts;
                     }
                 }
             }
-            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element.key));
+            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element));
             function getRenameInfoError(localizedErrorMessage) {
                 return {
                     canRename: false,
@@ -49104,18 +50618,8 @@ var ts;
     ts.getDefaultLibFilePath = getDefaultLibFilePath;
     function initializeServices() {
         ts.objectAllocator = {
-            getNodeConstructor: function (kind) {
-                function Node() {
-                }
-                var proto = kind === 248 /* SourceFile */ ? new SourceFileObject() : new NodeObject();
-                proto.kind = kind;
-                proto.pos = -1;
-                proto.end = -1;
-                proto.flags = 0;
-                proto.parent = undefined;
-                Node.prototype = proto;
-                return Node;
-            },
+            getNodeConstructor: function () { return NodeObject; },
+            getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
             getSignatureConstructor: function () { return SignatureObject; }
@@ -49136,7 +50640,7 @@ var ts;
          */
         function spanInSourceFileAtLocation(sourceFile, position) {
             // Cannot set breakpoint in dts file
-            if (sourceFile.flags & 8192 /* DeclarationFile */) {
+            if (sourceFile.flags & 4096 /* DeclarationFile */) {
                 return undefined;
             }
             var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
@@ -49354,7 +50858,7 @@ var ts;
                             ? variableDeclaration.parent.parent.initializer.declarations
                             : undefined;
                     // Breakpoint is possible in variableDeclaration only if there is initialization
-                    if (variableDeclaration.initializer || (variableDeclaration.flags & 1 /* Export */)) {
+                    if (variableDeclaration.initializer || (variableDeclaration.flags & 2 /* Export */)) {
                         if (declarations && declarations[0] === variableDeclaration) {
                             if (isParentVariableStatement) {
                                 // First declaration - include let keyword
@@ -49380,7 +50884,7 @@ var ts;
                 function canHaveSpanInParameterDeclaration(parameter) {
                     // Breakpoint is possible on parameter only if it has initializer, is a rest parameter, or has public or private modifier
                     return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 16 /* Public */) || !!(parameter.flags & 32 /* Private */);
+                        !!(parameter.flags & 8 /* Public */) || !!(parameter.flags & 16 /* Private */);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (canHaveSpanInParameterDeclaration(parameter)) {
@@ -49400,7 +50904,7 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1 /* Export */) ||
+                    return !!(functionDeclaration.flags & 2 /* Export */) ||
                         (functionDeclaration.parent.kind === 214 /* ClassDeclaration */ && functionDeclaration.kind !== 144 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
@@ -49494,7 +50998,6 @@ var ts;
                         // fall through.
                         case 244 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                            ;
                         case 220 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
@@ -49535,8 +51038,6 @@ var ts;
                         default:
                             return spanInNode(node.parent);
                     }
-                    // Default to parent node
-                    return spanInNode(node.parent);
                 }
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
@@ -49665,7 +51166,6 @@ var ts;
             // TODO: should this be '==='?
             if (settingsJson == null || settingsJson == "") {
                 throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-                return null;
             }
             return JSON.parse(settingsJson);
         };
@@ -50189,7 +51689,8 @@ var ts;
         };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
             return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
-                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()));
+                // for now treat files as JavaScript 
+                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
                 var convertResult = {
                     referencedFiles: [],
                     importedFiles: [],
@@ -50253,7 +51754,7 @@ var ts;
         TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
             try {
                 if (this.documentRegistry === undefined) {
-                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
                 }
                 var hostAdapter = new LanguageServiceShimHostAdapter(host);
                 var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
@@ -50286,7 +51787,7 @@ var ts;
         TypeScriptServicesFactory.prototype.close = function () {
             // Forget all the registered shims
             this._shims = [];
-            this.documentRegistry = ts.createDocumentRegistry();
+            this.documentRegistry = undefined;
         };
         TypeScriptServicesFactory.prototype.registerShim = function (shim) {
             this._shims.push(shim);
diff --git a/package.json b/package.json
index 7b8abfaae43..261cdfa64b7 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
         "browserify": "latest",
         "istanbul": "latest",
         "mocha-fivemat-progress-reporter": "latest",
-        "tslint": "latest",
+        "tslint": "next",
+        "typescript": "next",
         "tsd": "latest"
     },
     "scripts": {
diff --git a/scripts/processDiagnosticMessages.ts b/scripts/processDiagnosticMessages.ts
index 1eead82d9fe..26632ba6bab 100644
--- a/scripts/processDiagnosticMessages.ts
+++ b/scripts/processDiagnosticMessages.ts
@@ -18,6 +18,13 @@ function main(): void {
         return;
     }
 
+    function writeFile(fileName: string, contents: string) {
+        // TODO: Fix path joining
+        var inputDirectory = inputFilePath.substr(0,inputFilePath.lastIndexOf("/"));
+        var fileOutputPath = inputDirectory + "/" + fileName;
+        sys.writeFile(fileOutputPath, contents);
+    }
+
     var inputFilePath = sys.args[0].replace(/\\/g, "/");
     var inputStr = sys.readFile(inputFilePath);
     
@@ -28,11 +35,10 @@ function main(): void {
 
     var infoFileOutput = buildInfoFileOutput(diagnosticMessages, nameMap);
     checkForUniqueCodes(names, diagnosticMessages);
+    writeFile("diagnosticInformationMap.generated.ts", infoFileOutput);
 
-    // TODO: Fix path joining
-    var inputDirectory = inputFilePath.substr(0,inputFilePath.lastIndexOf("/"));
-    var fileOutputPath = inputDirectory + "/diagnosticInformationMap.generated.ts";
-    sys.writeFile(fileOutputPath, infoFileOutput);
+    var messageOutput = buildDiagnosticMessageOutput(diagnosticMessages, nameMap);
+    writeFile("diagnosticMessages.generated.json", messageOutput);
 }
 
 function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
@@ -85,12 +91,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
     for (var i = 0; i < names.length; i++) {
         var name = names[i];
         var diagnosticDetails = messageTable[name];
+        var propName = convertPropertyName(nameMap[name]);
 
         result +=
-        '        ' + convertPropertyName(nameMap[name]) +
+        '        ' + propName +
         ': { code: ' + diagnosticDetails.code +
         ', category: DiagnosticCategory.' + diagnosticDetails.category +
-        ', key: "' + name.replace(/[\"]/g, '\\"') + '"' +
+        ', key: "' + createKey(propName, diagnosticDetails.code) + '"' +
+        ', message: "' + name.replace(/[\"]/g, '\\"') + '"' +
         ' },\r\n';
     }
 
@@ -99,6 +107,30 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
     return result;
 }
 
+function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
+    var result =
+        '{';
+    var names = Utilities.getObjectKeys(messageTable);
+    for (var i = 0; i < names.length; i++) {
+        var name = names[i];
+        var diagnosticDetails = messageTable[name];
+        var propName = convertPropertyName(nameMap[name]);
+
+        result += '\r\n  "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
+        if (i !== names.length - 1) {
+            result += ',';
+        }
+    }
+
+    result += '\r\n}';
+
+    return result;
+}
+
+function createKey(name: string, code: number) : string {
+    return name.slice(0, 100) + '_' + code;
+}
+
 function convertPropertyName(origName: string): string {
     var result = origName.split("").map(char => {
         if (char === '*') { return "_Asterisk"; }
diff --git a/scripts/tslint/booleanTriviaRule.ts b/scripts/tslint/booleanTriviaRule.ts
index be32a870ff4..93c312ab870 100644
--- a/scripts/tslint/booleanTriviaRule.ts
+++ b/scripts/tslint/booleanTriviaRule.ts
@@ -1,6 +1,5 @@
-/// <reference path="../../node_modules/tslint/typings/typescriptServices.d.ts" />
-/// <reference path="../../node_modules/tslint/lib/tslint.d.ts" />
-
+import * as Lint from "tslint/lib/lint";
+import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {
     public static FAILURE_STRING_FACTORY = (name: string, currently: string) => `Tag boolean argument as '${name}' (currently '${currently}')`;
@@ -19,7 +18,7 @@ class BooleanTriviaWalker extends Lint.RuleWalker {
 
     visitCallExpression(node: ts.CallExpression) {
         super.visitCallExpression(node);
-		if (node.arguments) {
+        if (node.arguments) {
             const targetCallSignature = this.checker.getResolvedSignature(node);
             if (!!targetCallSignature) {
                 const targetParameters = targetCallSignature.getParameters();
@@ -37,7 +36,7 @@ class BooleanTriviaWalker extends Lint.RuleWalker {
                         let triviaContent: string;
                         const ranges = ts.getLeadingCommentRanges(arg.getFullText(), 0);
                         if (ranges && ranges.length === 1 && ranges[0].kind === ts.SyntaxKind.MultiLineCommentTrivia) {
-                            triviaContent = arg.getFullText().slice(ranges[0].pos + 2, ranges[0].end - 2); //+/-2 to remove /**/
+                            triviaContent = arg.getFullText().slice(ranges[0].pos + 2, ranges[0].end - 2); // +/-2 to remove /**/
                         }
                         if (triviaContent !== param.getName()) {
                             this.addFailure(this.createFailure(arg.getStart(source), arg.getWidth(source), Rule.FAILURE_STRING_FACTORY(param.getName(), triviaContent)));
@@ -45,6 +44,6 @@ class BooleanTriviaWalker extends Lint.RuleWalker {
                     }
                 }
             }
-		}			
+        }
     }
 }
diff --git a/scripts/tslint/nextLineRule.ts b/scripts/tslint/nextLineRule.ts
index 6d803fc7f88..d25652f7bce 100644
--- a/scripts/tslint/nextLineRule.ts
+++ b/scripts/tslint/nextLineRule.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../node_modules/tslint/typings/typescriptServices.d.ts" />
-/// <reference path="../../node_modules/tslint/lib/tslint.d.ts" />
+import * as Lint from "tslint/lib/lint";
+import * as ts from "typescript";
 
 const OPTION_CATCH = "check-catch";
 const OPTION_ELSE = "check-else";
diff --git a/scripts/tslint/noNullRule.ts b/scripts/tslint/noNullRule.ts
index 2a2c5bc3717..8e9deca996b 100644
--- a/scripts/tslint/noNullRule.ts
+++ b/scripts/tslint/noNullRule.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../node_modules/tslint/typings/typescriptServices.d.ts" />
-/// <reference path="../../node_modules/tslint/lib/tslint.d.ts" />
+import * as Lint from "tslint/lib/lint";
+import * as ts from "typescript";
 
 
 export class Rule extends Lint.Rules.AbstractRule {
diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts
new file mode 100644
index 00000000000..aaa1b0e53d5
--- /dev/null
+++ b/scripts/tslint/preferConstRule.ts
@@ -0,0 +1,230 @@
+import * as Lint from "tslint/lib/lint";
+import * as ts from "typescript";
+
+
+export class Rule extends Lint.Rules.AbstractRule {
+    public static FAILURE_STRING_FACTORY = (identifier: string) => `Identifier '${identifier}' never appears on the LHS of an assignment - use const instead of let for its declaration.`;
+
+    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+        return this.applyWithWalker(new PreferConstWalker(sourceFile, this.getOptions()));
+    }
+}
+
+function isBindingPattern(node: ts.Node): node is ts.BindingPattern {
+    return !!node && (node.kind === ts.SyntaxKind.ArrayBindingPattern || node.kind === ts.SyntaxKind.ObjectBindingPattern);
+}
+
+function walkUpBindingElementsAndPatterns(node: ts.Node): ts.Node {
+    while (node && (node.kind === ts.SyntaxKind.BindingElement || isBindingPattern(node))) {
+        node = node.parent;
+    }
+
+    return node;
+}
+
+function getCombinedNodeFlags(node: ts.Node): ts.NodeFlags {
+    node = walkUpBindingElementsAndPatterns(node);
+
+    let flags = node.flags;
+    if (node.kind === ts.SyntaxKind.VariableDeclaration) {
+        node = node.parent;
+    }
+
+    if (node && node.kind === ts.SyntaxKind.VariableDeclarationList) {
+        flags |= node.flags;
+        node = node.parent;
+    }
+
+    if (node && node.kind === ts.SyntaxKind.VariableStatement) {
+        flags |= node.flags;
+    }
+
+    return flags;
+}
+
+function isLet(node: ts.Node) {
+    return !!(getCombinedNodeFlags(node) & ts.NodeFlags.Let);
+}
+
+function isExported(node: ts.Node) {
+    return !!(getCombinedNodeFlags(node) & ts.NodeFlags.Export);
+}
+
+function isAssignmentOperator(token: ts.SyntaxKind): boolean {
+    return token >= ts.SyntaxKind.FirstAssignment && token <= ts.SyntaxKind.LastAssignment;
+}
+
+function isBindingLiteralExpression(node: ts.Node): node is (ts.ArrayLiteralExpression | ts.ObjectLiteralExpression) {
+    return (!!node) && (node.kind === ts.SyntaxKind.ObjectLiteralExpression || node.kind === ts.SyntaxKind.ArrayLiteralExpression);
+}
+
+interface DeclarationUsages {
+    declaration: ts.VariableDeclaration;
+    usages: number;
+}
+
+class PreferConstWalker extends Lint.RuleWalker {
+    private inScopeLetDeclarations: ts.Map<DeclarationUsages>[] = [];
+    private errors: Lint.RuleFailure[] = [];
+    private markAssignment(identifier: ts.Identifier) {
+        const name = identifier.text;
+        for (let i = this.inScopeLetDeclarations.length - 1; i >= 0; i--) {
+            const declarations = this.inScopeLetDeclarations[i];
+            if (declarations[name]) {
+                declarations[name].usages++;
+                break;
+            }
+        }
+    }
+
+    visitSourceFile(node: ts.SourceFile) {
+        super.visitSourceFile(node);
+        // Sort errors by position because tslint doesn't
+        this.errors.sort((a, b) => a.getStartPosition().getPosition() - b.getStartPosition().getPosition()).forEach(e => this.addFailure(e));
+    }
+
+    visitBinaryExpression(node: ts.BinaryExpression) {
+        if (isAssignmentOperator(node.operatorToken.kind)) {
+            this.visitLeftHandSideExpression(node.left);
+        }
+        super.visitBinaryExpression(node);
+    }
+
+    private visitLeftHandSideExpression(node: ts.Expression) {
+        while (node.kind === ts.SyntaxKind.ParenthesizedExpression) {
+            node = (node as ts.ParenthesizedExpression).expression;
+        }
+        if (node.kind === ts.SyntaxKind.Identifier) {
+            this.markAssignment(node as ts.Identifier);
+        }
+        else if (isBindingLiteralExpression(node)) {
+            this.visitBindingLiteralExpression(node as (ts.ArrayLiteralExpression | ts.ObjectLiteralExpression));
+        }
+    }
+
+    private visitBindingLiteralExpression(node: ts.ArrayLiteralExpression | ts.ObjectLiteralExpression) {
+        if (node.kind === ts.SyntaxKind.ObjectLiteralExpression) {
+            const pattern = node as ts.ObjectLiteralExpression;
+            for (const element of pattern.properties) {
+                const kind = element.kind;
+
+                if (kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
+                    this.markAssignment((element as ts.ShorthandPropertyAssignment).name);
+                }
+                else if (kind === ts.SyntaxKind.PropertyAssignment) {
+                    this.visitLeftHandSideExpression((element as ts.PropertyAssignment).initializer);
+                }
+            }
+        }
+        else if (node.kind === ts.SyntaxKind.ArrayLiteralExpression) {
+            const pattern = node as ts.ArrayLiteralExpression;
+            for (const element of pattern.elements) {
+                this.visitLeftHandSideExpression(element);
+            }
+        }
+    }
+
+    private visitBindingPatternIdentifiers(pattern: ts.BindingPattern) {
+        for (const element of pattern.elements) {
+            if (element.name.kind === ts.SyntaxKind.Identifier) {
+                this.markAssignment(element.name as ts.Identifier);
+            }
+            else {
+                this.visitBindingPatternIdentifiers(element.name as ts.BindingPattern);
+            }
+        }
+    }
+
+    visitPrefixUnaryExpression(node: ts.PrefixUnaryExpression) {
+        this.visitAnyUnaryExpression(node);
+        super.visitPrefixUnaryExpression(node);
+    }
+
+    visitPostfixUnaryExpression(node: ts.PostfixUnaryExpression) {
+        this.visitAnyUnaryExpression(node);
+        super.visitPostfixUnaryExpression(node);
+    }
+
+    private visitAnyUnaryExpression(node: ts.PrefixUnaryExpression | ts.PostfixUnaryExpression) {
+        if (node.operator === ts.SyntaxKind.PlusPlusToken || node.operator === ts.SyntaxKind.MinusMinusToken) {
+            this.visitLeftHandSideExpression(node.operand);
+        }
+    }
+
+    visitModuleDeclaration(node: ts.ModuleDeclaration) {
+        if (node.body.kind === ts.SyntaxKind.ModuleBlock) {
+            // For some reason module blocks are left out of the visit block traversal
+            this.visitBlock(node.body as ts.ModuleBlock);
+        }
+        super.visitModuleDeclaration(node);
+    }
+
+    visitForOfStatement(node: ts.ForOfStatement) {
+        this.visitAnyForStatement(node);
+        super.visitForOfStatement(node);
+        this.popDeclarations();
+    }
+
+    visitForInStatement(node: ts.ForInStatement) {
+        this.visitAnyForStatement(node);
+        super.visitForInStatement(node);
+        this.popDeclarations();
+    }
+
+    private visitAnyForStatement(node: ts.ForOfStatement | ts.ForInStatement) {
+        const names: ts.Map<DeclarationUsages> = {};
+        if (isLet(node.initializer)) {
+            if (node.initializer.kind === ts.SyntaxKind.VariableDeclarationList) {
+                this.collectLetIdentifiers(node.initializer as ts.VariableDeclarationList, names);
+            }
+        }
+        this.inScopeLetDeclarations.push(names);
+    }
+
+    private popDeclarations() {
+        const completed = this.inScopeLetDeclarations.pop();
+        for (const name in completed) {
+            if (Object.hasOwnProperty.call(completed, name)) {
+                const element = completed[name];
+                if (element.usages === 0) {
+                    this.errors.push(this.createFailure(element.declaration.getStart(this.getSourceFile()), element.declaration.getWidth(this.getSourceFile()), Rule.FAILURE_STRING_FACTORY(name)));
+                }
+            }
+        }
+    }
+
+    visitBlock(node: ts.Block) {
+        const names: ts.Map<DeclarationUsages> = {};
+        for (const statement of node.statements) {
+            if (statement.kind === ts.SyntaxKind.VariableStatement) {
+                this.collectLetIdentifiers((statement as ts.VariableStatement).declarationList, names);
+            }
+        }
+        this.inScopeLetDeclarations.push(names);
+        super.visitBlock(node);
+        this.popDeclarations();
+    }
+
+    private collectLetIdentifiers(list: ts.VariableDeclarationList, ret: ts.Map<DeclarationUsages>) {
+        for (const node of list.declarations) {
+            if (isLet(node) && !isExported(node)) {
+                this.collectNameIdentifiers(node, node.name, ret);
+            }
+        }
+    }
+
+    private collectNameIdentifiers(declaration: ts.VariableDeclaration, node: ts.Identifier | ts.BindingPattern, table: ts.Map<DeclarationUsages>) {
+        if (node.kind === ts.SyntaxKind.Identifier) {
+            table[(node as ts.Identifier).text] = { declaration, usages: 0 };
+        }
+        else {
+            this.collectBindingPatternIdentifiers(declaration, node as ts.BindingPattern, table);
+        }
+    }
+
+    private collectBindingPatternIdentifiers(value: ts.VariableDeclaration, pattern: ts.BindingPattern, table: ts.Map<DeclarationUsages>) {
+        for (const element of pattern.elements) {
+            this.collectNameIdentifiers(value, element.name, table);
+        }
+    }
+}
diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts
new file mode 100644
index 00000000000..4196d024768
--- /dev/null
+++ b/scripts/tslint/typeOperatorSpacingRule.ts
@@ -0,0 +1,29 @@
+import * as Lint from "tslint/lib/lint";
+import * as ts from "typescript";
+
+
+export class Rule extends Lint.Rules.AbstractRule {
+    public static FAILURE_STRING = "The '|' and '&' operators must be surrounded by single spaces";
+
+    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+        return this.applyWithWalker(new TypeOperatorSpacingWalker(sourceFile, this.getOptions()));
+    }
+}
+
+class TypeOperatorSpacingWalker extends Lint.RuleWalker {
+    public visitNode(node: ts.Node) {
+        if (node.kind === ts.SyntaxKind.UnionType || node.kind === ts.SyntaxKind.IntersectionType) {
+            let types = (<ts.UnionOrIntersectionTypeNode>node).types;
+            let expectedStart = types[0].end + 2; // space, | or &
+            for (let i = 1; i < types.length; i++) {
+                let currentType = types[i];
+                if (expectedStart !== currentType.pos || currentType.getLeadingTriviaWidth() !== 1) {
+                    const failure = this.createFailure(currentType.pos, currentType.getWidth(), Rule.FAILURE_STRING);
+                    this.addFailure(failure);
+                }
+                expectedStart = currentType.end + 2;
+            }
+        }
+        super.visitNode(node);
+    }
+}
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index c12a9afad62..6b04e22551d 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1,3 +1,4 @@
+/// <reference path="utilities.ts"/>
 /// <reference path="parser.ts"/>
 
 /* @internal */
@@ -6,8 +7,23 @@ namespace ts {
 
     export const enum ModuleInstanceState {
         NonInstantiated = 0,
-        Instantiated    = 1,
-        ConstEnumOnly   = 2
+        Instantiated = 1,
+        ConstEnumOnly = 2
+    }
+
+    const enum Reachability {
+        Unintialized        = 1 << 0,
+        Reachable           = 1 << 1,
+        Unreachable         = 1 << 2,
+        ReportedUnreachable = 1 << 3
+    }
+
+    function or(state1: Reachability, state2: Reachability): Reachability {
+        return (state1 | state2) & Reachability.Reachable
+            ? Reachability.Reachable
+            : (state1 & state2) & Reachability.ReportedUnreachable
+                ? Reachability.ReportedUnreachable
+                : Reachability.Unreachable;
     }
 
     export function getModuleInstanceState(node: Node): ModuleInstanceState {
@@ -77,35 +93,66 @@ namespace ts {
         IsContainerWithLocals = IsContainer | HasLocals
     }
 
-    export function bindSourceFile(file: SourceFile) {
-        let start = new Date().getTime();
-        bindSourceFileWorker(file);
+    const binder = createBinder();
+
+    export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
+        const start = new Date().getTime();
+        binder(file, options);
         bindTime += new Date().getTime() - start;
     }
 
-    function bindSourceFileWorker(file: SourceFile) {
+    function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
+        let file: SourceFile;
+        let options: CompilerOptions;
         let parent: Node;
         let container: Node;
         let blockScopeContainer: Node;
         let lastContainer: Node;
         let seenThisKeyword: boolean;
 
+        // state used by reachability checks
+        let hasExplicitReturn: boolean;
+        let currentReachabilityState: Reachability;
+        let labelStack: Reachability[];
+        let labelIndexMap: Map<number>;
+        let implicitLabels: number[];
+
         // If this file is an external module, then it is automatically in strict-mode according to
         // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
         // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
-        let inStrictMode = !!file.externalModuleIndicator;
+        let inStrictMode: boolean;
 
         let symbolCount = 0;
-        let Symbol = objectAllocator.getSymbolConstructor();
-        let classifiableNames: Map<string> = {};
+        let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
+        let classifiableNames: Map<string>;
 
-        if (!file.locals) {
-            bind(file);
-            file.symbolCount = symbolCount;
-            file.classifiableNames = classifiableNames;
+        function bindSourceFile(f: SourceFile, opts: CompilerOptions) {
+            file = f;
+            options = opts;
+            inStrictMode = !!file.externalModuleIndicator;
+            classifiableNames = {};
+            Symbol = objectAllocator.getSymbolConstructor();
+
+            if (!file.locals) {
+                bind(file);
+                file.symbolCount = symbolCount;
+                file.classifiableNames = classifiableNames;
+            }
+
+            file = undefined;
+            options = undefined;
+            parent = undefined;
+            container = undefined;
+            blockScopeContainer = undefined;
+            lastContainer = undefined;
+            seenThisKeyword = false;
+            hasExplicitReturn = false;
+            labelStack = undefined;
+            labelIndexMap = undefined;
+            implicitLabels = undefined;
         }
 
-        return;
+        return bindSourceFile;
 
         function createSymbol(flags: SymbolFlags, name: string): Symbol {
             symbolCount++;
@@ -130,9 +177,14 @@ namespace ts {
                 symbol.members = {};
             }
 
-            if (symbolFlags & SymbolFlags.Value && !symbol.valueDeclaration) {
-                symbol.valueDeclaration = node;
-            }
+            if (symbolFlags & SymbolFlags.Value) {
+                const valueDeclaration = symbol.valueDeclaration;
+                if (!valueDeclaration ||
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) {
+                    // other kinds of value declarations take precedence over modules
+                    symbol.valueDeclaration = node;
+                }
+        }
         }
 
         // Should not be called on a declaration with a computed property name,
@@ -143,7 +195,12 @@ namespace ts {
                     return `"${(<LiteralExpression>node.name).text}"`;
                 }
                 if (node.name.kind === SyntaxKind.ComputedPropertyName) {
-                    let nameExpression = (<ComputedPropertyName>node.name).expression;
+                    const nameExpression = (<ComputedPropertyName>node.name).expression;
+                    // treat computed property names where expression is string/numeric literal as just string/numeric literal 
+                    if (isStringOrNumericLiteral(nameExpression.kind)) {
+                        return (<LiteralExpression>nameExpression).text;
+                    }
+
                     Debug.assert(isWellKnownSymbolSyntactically(nameExpression));
                     return getPropertyNameForKnownSymbolName((<PropertyAccessExpression>nameExpression).name.text);
                 }
@@ -164,6 +221,9 @@ namespace ts {
                     return "__export";
                 case SyntaxKind.ExportAssignment:
                     return (<ExportAssignment>node).isExportEquals ? "export=" : "default";
+                case SyntaxKind.BinaryExpression:
+                    // Binary expression case is for JS module 'module.exports = expr'
+                    return "export=";
                 case SyntaxKind.FunctionDeclaration:
                 case SyntaxKind.ClassDeclaration:
                     return node.flags & NodeFlags.Default ? "default" : undefined;
@@ -185,9 +245,9 @@ namespace ts {
         function declareSymbol(symbolTable: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol {
             Debug.assert(!hasDynamicName(node));
 
-            let isDefaultExport = node.flags & NodeFlags.Default;
+            const isDefaultExport = node.flags & NodeFlags.Default;
             // The exported symbol for an export default function/class node is always named "default"
-            let name = isDefaultExport && parent ? "default" : getDeclarationName(node);
+            const name = isDefaultExport && parent ? "default" : getDeclarationName(node);
 
             let symbol: Symbol;
             if (name !== undefined) {
@@ -254,7 +314,7 @@ namespace ts {
         }
 
         function declareModuleMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags): Symbol {
-            let hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;
+            const hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;
             if (symbolFlags & SymbolFlags.Alias) {
                 if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
@@ -276,11 +336,11 @@ namespace ts {
                 //      but return the export symbol (by calling getExportSymbolOfValueSymbolIfExported). That way
                 //      when the emitter comes back to it, it knows not to qualify the name if it was found in a containing scope.
                 if (hasExportModifier || container.flags & NodeFlags.ExportContext) {
-                    let exportKind =
+                    const exportKind =
                         (symbolFlags & SymbolFlags.Value ? SymbolFlags.ExportValue : 0) |
                         (symbolFlags & SymbolFlags.Type ? SymbolFlags.ExportType : 0) |
                         (symbolFlags & SymbolFlags.Namespace ? SymbolFlags.ExportNamespace : 0);
-                    let local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
+                    const local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                     node.localSymbol = local;
                     return local;
@@ -298,9 +358,9 @@ namespace ts {
             // Before we recurse into a node's chilren, we first save the existing parent, container
             // and block-container.  Then after we pop out of processing the children, we restore
             // these saved values.
-            let saveParent = parent;
-            let saveContainer = container;
-            let savedBlockScopeContainer = blockScopeContainer;
+            const saveParent = parent;
+            const saveContainer = container;
+            const savedBlockScopeContainer = blockScopeContainer;
 
             // This node will now be set as the parent of all of its children as we recurse into them.
             parent = node;
@@ -322,7 +382,7 @@ namespace ts {
             // reusing a node from a previous compilation, that node may have had 'locals' created
             // for it.  We must clear this so we don't accidently move any stale data forward from
             // a previous compilation.
-            let containerFlags = getContainerFlags(node);
+            const containerFlags = getContainerFlags(node);
             if (containerFlags & ContainerFlags.IsContainer) {
                 container = blockScopeContainer = node;
 
@@ -338,13 +398,56 @@ namespace ts {
                 blockScopeContainer.locals = undefined;
             }
 
-            if (node.kind === SyntaxKind.InterfaceDeclaration) {
+            let savedReachabilityState: Reachability;
+            let savedLabelStack: Reachability[];
+            let savedLabels: Map<number>;
+            let savedImplicitLabels: number[];
+            let savedHasExplicitReturn: boolean;
+
+            const kind = node.kind;
+            let flags = node.flags;
+
+            // reset all reachability check related flags on node (for incremental scenarios)
+            flags &= ~NodeFlags.ReachabilityCheckFlags;
+
+            if (kind === SyntaxKind.InterfaceDeclaration) {
                 seenThisKeyword = false;
-                forEachChild(node, bind);
-                node.flags = seenThisKeyword ? node.flags | NodeFlags.ContainsThis : node.flags & ~NodeFlags.ContainsThis;
             }
-            else {
-                forEachChild(node, bind);
+
+            const saveState = kind === SyntaxKind.SourceFile || kind === SyntaxKind.ModuleBlock || isFunctionLikeKind(kind);
+            if (saveState) {
+                savedReachabilityState = currentReachabilityState;
+                savedLabelStack = labelStack;
+                savedLabels = labelIndexMap;
+                savedImplicitLabels = implicitLabels;
+                savedHasExplicitReturn = hasExplicitReturn;
+
+                currentReachabilityState = Reachability.Reachable;
+                hasExplicitReturn = false;
+                labelStack = labelIndexMap = implicitLabels = undefined;
+            }
+
+            bindReachableStatement(node);
+
+            if (currentReachabilityState === Reachability.Reachable && isFunctionLikeKind(kind) && nodeIsPresent((<FunctionLikeDeclaration>node).body)) {
+                flags |= NodeFlags.HasImplicitReturn;
+                if (hasExplicitReturn) {
+                    flags |= NodeFlags.HasExplicitReturn;
+                }
+            }
+
+            if (kind === SyntaxKind.InterfaceDeclaration) {
+                flags = seenThisKeyword ? flags | NodeFlags.ContainsThis : flags & ~NodeFlags.ContainsThis;
+            }
+
+            node.flags = flags;
+
+            if (saveState) {
+                hasExplicitReturn = savedHasExplicitReturn;
+                currentReachabilityState = savedReachabilityState;
+                labelStack = savedLabelStack;
+                labelIndexMap = savedLabels;
+                implicitLabels = savedImplicitLabels;
             }
 
             container = saveContainer;
@@ -352,6 +455,220 @@ namespace ts {
             blockScopeContainer = savedBlockScopeContainer;
         }
 
+        /**
+         * Returns true if node and its subnodes were successfully traversed.
+         * Returning false means that node was not examined and caller needs to dive into the node himself. 
+         */
+        function bindReachableStatement(node: Node): void {
+            if (checkUnreachable(node)) {
+                forEachChild(node, bind);
+                return;
+            }
+
+            switch (node.kind) {
+                case SyntaxKind.WhileStatement:
+                    bindWhileStatement(<WhileStatement>node);
+                    break;
+                case SyntaxKind.DoStatement:
+                    bindDoStatement(<DoStatement>node);
+                    break;
+                case SyntaxKind.ForStatement:
+                    bindForStatement(<ForStatement>node);
+                    break;
+                case SyntaxKind.ForInStatement:
+                case SyntaxKind.ForOfStatement:
+                    bindForInOrForOfStatement(<ForInStatement | ForOfStatement>node);
+                    break;
+                case SyntaxKind.IfStatement:
+                    bindIfStatement(<IfStatement>node);
+                    break;
+                case SyntaxKind.ReturnStatement:
+                case SyntaxKind.ThrowStatement:
+                    bindReturnOrThrow(<ReturnStatement | ThrowStatement>node);
+                    break;
+                case SyntaxKind.BreakStatement:
+                case SyntaxKind.ContinueStatement:
+                    bindBreakOrContinueStatement(<BreakOrContinueStatement>node);
+                    break;
+                case SyntaxKind.TryStatement:
+                    bindTryStatement(<TryStatement>node);
+                    break;
+                case SyntaxKind.SwitchStatement:
+                    bindSwitchStatement(<SwitchStatement>node);
+                    break;
+                case SyntaxKind.CaseBlock:
+                    bindCaseBlock(<CaseBlock>node);
+                    break;
+                case SyntaxKind.LabeledStatement:
+                    bindLabeledStatement(<LabeledStatement>node);
+                    break;
+                default:
+                    forEachChild(node, bind);
+                    break;
+            }
+        }
+
+        function bindWhileStatement(n: WhileStatement): void {
+            const preWhileState =
+                n.expression.kind === SyntaxKind.FalseKeyword ? Reachability.Unreachable : currentReachabilityState;
+            const postWhileState =
+                n.expression.kind === SyntaxKind.TrueKeyword ? Reachability.Unreachable : currentReachabilityState;
+
+            // bind expressions (don't affect reachability)
+            bind(n.expression);
+
+            currentReachabilityState = preWhileState;
+            const postWhileLabel = pushImplicitLabel();
+            bind(n.statement);
+            popImplicitLabel(postWhileLabel, postWhileState);
+        }
+
+        function bindDoStatement(n: DoStatement): void {
+            const preDoState = currentReachabilityState;
+
+            const postDoLabel = pushImplicitLabel();
+            bind(n.statement);
+            const postDoState = n.expression.kind === SyntaxKind.TrueKeyword ? Reachability.Unreachable : preDoState;
+            popImplicitLabel(postDoLabel, postDoState);
+
+            // bind expressions (don't affect reachability)
+            bind(n.expression);
+        }
+
+        function bindForStatement(n: ForStatement): void {
+            const preForState = currentReachabilityState;
+            const postForLabel = pushImplicitLabel();
+
+            // bind expressions (don't affect reachability)
+            bind(n.initializer);
+            bind(n.condition);
+            bind(n.incrementor);
+
+            bind(n.statement);
+
+            // for statement is considered infinite when it condition is either omitted or is true keyword
+            // - for(..;;..)
+            // - for(..;true;..)
+            const isInfiniteLoop = (!n.condition || n.condition.kind === SyntaxKind.TrueKeyword);
+            const postForState = isInfiniteLoop ? Reachability.Unreachable : preForState;
+            popImplicitLabel(postForLabel, postForState);
+        }
+
+        function bindForInOrForOfStatement(n: ForInStatement | ForOfStatement): void {
+            const preStatementState = currentReachabilityState;
+            const postStatementLabel = pushImplicitLabel();
+
+            // bind expressions (don't affect reachability)
+            bind(n.initializer);
+            bind(n.expression);
+
+            bind(n.statement);
+            popImplicitLabel(postStatementLabel, preStatementState);
+        }
+
+        function bindIfStatement(n: IfStatement): void {
+            // denotes reachability state when entering 'thenStatement' part of the if statement: 
+            // i.e. if condition is false then thenStatement is unreachable
+            const ifTrueState = n.expression.kind === SyntaxKind.FalseKeyword ? Reachability.Unreachable : currentReachabilityState;
+            // denotes reachability state when entering 'elseStatement':
+            // i.e. if condition is true then elseStatement is unreachable
+            const ifFalseState = n.expression.kind === SyntaxKind.TrueKeyword ? Reachability.Unreachable : currentReachabilityState;
+
+            currentReachabilityState = ifTrueState;
+
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+
+            bind(n.thenStatement);
+            if (n.elseStatement) {
+                const preElseState = currentReachabilityState;
+                currentReachabilityState = ifFalseState;
+                bind(n.elseStatement);
+                currentReachabilityState = or(currentReachabilityState, preElseState);
+            }
+            else {
+                currentReachabilityState = or(currentReachabilityState, ifFalseState);
+            }
+        }
+
+        function bindReturnOrThrow(n: ReturnStatement | ThrowStatement): void {
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+            if (n.kind === SyntaxKind.ReturnStatement) {
+                hasExplicitReturn = true;
+            }
+            currentReachabilityState = Reachability.Unreachable;
+        }
+
+        function bindBreakOrContinueStatement(n: BreakOrContinueStatement): void {
+            // call bind on label (don't affect reachability)
+            bind(n.label);
+            // for continue case touch label so it will be marked a used
+            const isValidJump = jumpToLabel(n.label, n.kind === SyntaxKind.BreakStatement ? currentReachabilityState : Reachability.Unreachable);
+            if (isValidJump) {
+                currentReachabilityState = Reachability.Unreachable;
+            }
+        }
+
+        function bindTryStatement(n: TryStatement): void {
+            // catch\finally blocks has the same reachability as try block
+            const preTryState = currentReachabilityState;
+            bind(n.tryBlock);
+            const postTryState = currentReachabilityState;
+
+            currentReachabilityState = preTryState;
+            bind(n.catchClause);
+            const postCatchState = currentReachabilityState;
+
+            currentReachabilityState = preTryState;
+            bind(n.finallyBlock);
+
+            // post catch/finally state is reachable if
+            // - post try state is reachable - control flow can fall out of try block
+            // - post catch state is reachable - control flow can fall out of catch block
+            currentReachabilityState = or(postTryState, postCatchState);
+        }
+
+        function bindSwitchStatement(n: SwitchStatement): void {
+            const preSwitchState = currentReachabilityState;
+            const postSwitchLabel = pushImplicitLabel();
+
+            // bind expression (don't affect reachability)
+            bind(n.expression);
+
+            bind(n.caseBlock);
+
+            const hasDefault = forEach(n.caseBlock.clauses, c => c.kind === SyntaxKind.DefaultClause);
+
+            // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case
+            const postSwitchState = hasDefault && currentReachabilityState !== Reachability.Reachable ? Reachability.Unreachable : preSwitchState;
+
+            popImplicitLabel(postSwitchLabel, postSwitchState);
+        }
+
+        function bindCaseBlock(n: CaseBlock): void {
+            const startState = currentReachabilityState;
+
+            for (const clause of n.clauses) {
+                currentReachabilityState = startState;
+                bind(clause);
+                if (clause.statements.length && currentReachabilityState === Reachability.Reachable && options.noFallthroughCasesInSwitch) {
+                    errorOnFirstToken(clause, Diagnostics.Fallthrough_case_in_switch);
+                }
+            }
+        }
+
+        function bindLabeledStatement(n: LabeledStatement): void {
+            // call bind on label (don't affect reachability)
+            bind(n.label);
+
+            const ok = pushNamedLabel(n.label);
+            bind(n.statement);
+            if (ok) {
+                popNamedLabel(n.label, currentReachabilityState);
+            }
+        }
+
         function getContainerFlags(node: Node): ContainerFlags {
             switch (node.kind) {
                 case SyntaxKind.ClassExpression:
@@ -488,21 +805,10 @@ namespace ts {
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
 
-        function isAmbientContext(node: Node): boolean {
-            while (node) {
-                if (node.flags & NodeFlags.Ambient) {
-                    return true;
-                }
-
-                node = node.parent;
-            }
-            return false;
-        }
-
         function hasExportDeclarations(node: ModuleDeclaration | SourceFile): boolean {
-            let body = node.kind === SyntaxKind.SourceFile ? node : (<ModuleDeclaration>node).body;
+            const body = node.kind === SyntaxKind.SourceFile ? node : (<ModuleDeclaration>node).body;
             if (body.kind === SyntaxKind.SourceFile || body.kind === SyntaxKind.ModuleBlock) {
-                for (let stat of (<Block>body).statements) {
+                for (const stat of (<Block>body).statements) {
                     if (stat.kind === SyntaxKind.ExportDeclaration || stat.kind === SyntaxKind.ExportAssignment) {
                         return true;
                     }
@@ -514,7 +820,7 @@ namespace ts {
         function setExportContextFlag(node: ModuleDeclaration | SourceFile) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
             // declarations with export modifiers) is an export context in which declarations are implicitly exported.
-            if (isAmbientContext(node) && !hasExportDeclarations(node)) {
+            if (isInAmbientContext(node) && !hasExportDeclarations(node)) {
                 node.flags |= NodeFlags.ExportContext;
             }
             else {
@@ -528,7 +834,7 @@ namespace ts {
                 declareSymbolAndAddToSymbolTable(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes);
             }
             else {
-                let state = getModuleInstanceState(node);
+                const state = getModuleInstanceState(node);
                 if (state === ModuleInstanceState.NonInstantiated) {
                     declareSymbolAndAddToSymbolTable(node, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes);
                 }
@@ -540,7 +846,7 @@ namespace ts {
                         node.symbol.constEnumOnlyModule = false;
                     }
                     else {
-                        let currentModuleIsConstEnumOnly = state === ModuleInstanceState.ConstEnumOnly;
+                        const currentModuleIsConstEnumOnly = state === ModuleInstanceState.ConstEnumOnly;
                         if (node.symbol.constEnumOnlyModule === undefined) {
                             // non-merged case - use the current state
                             node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
@@ -561,10 +867,10 @@ namespace ts {
             // We do that by making an anonymous type literal symbol, and then setting the function
             // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable
             // from an actual type literal symbol you would have gotten had you used the long form.
-            let symbol = createSymbol(SymbolFlags.Signature, getDeclarationName(node));
+            const symbol = createSymbol(SymbolFlags.Signature, getDeclarationName(node));
             addDeclarationToSymbol(symbol, node, SymbolFlags.Signature);
 
-            let typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
+            const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
             addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
             typeLiteralSymbol.members = { [symbol.name]: symbol };
         }
@@ -576,14 +882,14 @@ namespace ts {
             }
 
             if (inStrictMode) {
-                let seen: Map<ElementKind> = {};
+                const seen: Map<ElementKind> = {};
 
-                for (let prop of node.properties) {
+                for (const prop of node.properties) {
                     if (prop.name.kind !== SyntaxKind.Identifier) {
                         continue;
                     }
 
-                    let identifier = <Identifier>prop.name;
+                    const identifier = <Identifier>prop.name;
 
                     // ECMA-262 11.1.5 Object Initialiser
                     // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
@@ -593,18 +899,18 @@ namespace ts {
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    let currentKind = prop.kind === SyntaxKind.PropertyAssignment || prop.kind === SyntaxKind.ShorthandPropertyAssignment || prop.kind === SyntaxKind.MethodDeclaration
+                    const currentKind = prop.kind === SyntaxKind.PropertyAssignment || prop.kind === SyntaxKind.ShorthandPropertyAssignment || prop.kind === SyntaxKind.MethodDeclaration
                         ? ElementKind.Property
                         : ElementKind.Accessor;
 
-                    let existingKind = seen[identifier.text];
+                    const existingKind = seen[identifier.text];
                     if (!existingKind) {
                         seen[identifier.text] = currentKind;
                         continue;
                     }
 
                     if (currentKind === ElementKind.Property && existingKind === ElementKind.Property) {
-                        let span = getErrorSpanForNode(file, identifier);
+                        const span = getErrorSpanForNode(file, identifier);
                         file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length,
                             Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
                     }
@@ -615,7 +921,7 @@ namespace ts {
         }
 
         function bindAnonymousDeclaration(node: Declaration, symbolFlags: SymbolFlags, name: string) {
-            let symbol = createSymbol(symbolFlags, name);
+            const symbol = createSymbol(symbolFlags, name);
             addDeclarationToSymbol(symbol, node, symbolFlags);
         }
 
@@ -694,7 +1000,7 @@ namespace ts {
             if (inStrictMode && node.expression.kind === SyntaxKind.Identifier) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
-                let span = getErrorSpanForNode(file, node.expression);
+                const span = getErrorSpanForNode(file, node.expression);
                 file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length, Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
             }
         }
@@ -706,11 +1012,11 @@ namespace ts {
 
         function checkStrictModeEvalOrArguments(contextNode: Node, name: Node) {
             if (name && name.kind === SyntaxKind.Identifier) {
-                let identifier = <Identifier>name;
+                const identifier = <Identifier>name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
-                    let span = getErrorSpanForNode(file, name);
+                    const span = getErrorSpanForNode(file, name);
                     file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length,
                         getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
                 }
@@ -766,12 +1072,12 @@ namespace ts {
         function checkStrictModeWithStatement(node: WithStatement) {
             // Grammar checking for withStatement
             if (inStrictMode) {
-                grammarErrorOnFirstToken(node, Diagnostics.with_statements_are_not_allowed_in_strict_mode);
+                errorOnFirstToken(node, Diagnostics.with_statements_are_not_allowed_in_strict_mode);
             }
         }
 
-        function grammarErrorOnFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any) {
-            let span = getSpanOfTokenAtPosition(file, node.pos);
+        function errorOnFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any) {
+            const span = getSpanOfTokenAtPosition(file, node.pos);
             file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
         }
 
@@ -779,10 +1085,14 @@ namespace ts {
             return "__" + indexOf((<SignatureDeclaration>node.parent).parameters, node);
         }
 
-        function bind(node: Node) {
+        function bind(node: Node): void {
+            if (!node) {
+                return;
+            }
+
             node.parent = parent;
 
-            let savedInStrictMode = inStrictMode;
+            const savedInStrictMode = inStrictMode;
             if (!savedInStrictMode) {
                 updateStrictMode(node);
             }
@@ -828,7 +1138,7 @@ namespace ts {
         }
 
         function updateStrictModeStatementList(statements: NodeArray<Statement>) {
-            for (let statement of statements) {
+            for (const statement of statements) {
                 if (!isPrologueDirective(statement)) {
                     return;
                 }
@@ -842,7 +1152,7 @@ namespace ts {
 
         /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
         function isUseStrictPrologueDirective(node: ExpressionStatement): boolean {
-            let nodeText = getTextOfNodeFromSourceText(file.text, node.expression);
+            const nodeText = getTextOfNodeFromSourceText(file.text, node.expression);
 
             // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
             // string to contain unicode escapes (as per ES5).
@@ -851,9 +1161,18 @@ namespace ts {
 
         function bindWorker(node: Node) {
             switch (node.kind) {
+                /* Strict mode checks */
                 case SyntaxKind.Identifier:
                     return checkStrictModeIdentifier(<Identifier>node);
                 case SyntaxKind.BinaryExpression:
+                    if (isInJavaScriptFile(node)) {
+                        if (isExportsPropertyAssignment(node)) {
+                            bindExportsPropertyAssignment(<BinaryExpression>node);
+                        }
+                        else if (isModuleExportsAssignment(node)) {
+                            bindModuleExportsAssignment(<BinaryExpression>node);
+                        }
+                    }
                     return checkStrictModeBinaryExpression(<BinaryExpression>node);
                 case SyntaxKind.CatchClause:
                     return checkStrictModeCatchClause(<CatchClause>node);
@@ -917,8 +1236,16 @@ namespace ts {
                 case SyntaxKind.FunctionExpression:
                 case SyntaxKind.ArrowFunction:
                     checkStrictModeFunctionName(<FunctionExpression>node);
-                    let bindingName = (<FunctionExpression>node).name ? (<FunctionExpression>node).name.text : "__function";
+                    const bindingName = (<FunctionExpression>node).name ? (<FunctionExpression>node).name.text : "__function";
                     return bindAnonymousDeclaration(<FunctionExpression>node, SymbolFlags.Function, bindingName);
+
+                case SyntaxKind.CallExpression:
+                    if (isInJavaScriptFile(node)) {
+                        bindCallExpression(<CallExpression>node);
+                    }
+                    break;
+
+                // Members of classes, interfaces, and modules
                 case SyntaxKind.ClassExpression:
                 case SyntaxKind.ClassDeclaration:
                     return bindClassLikeDeclaration(<ClassLikeDeclaration>node);
@@ -930,6 +1257,8 @@ namespace ts {
                     return bindEnumDeclaration(<EnumDeclaration>node);
                 case SyntaxKind.ModuleDeclaration:
                     return bindModuleDeclaration(<ModuleDeclaration>node);
+
+                // Imports and exports
                 case SyntaxKind.ImportEqualsDeclaration:
                 case SyntaxKind.NamespaceImport:
                 case SyntaxKind.ImportSpecifier:
@@ -949,16 +1278,21 @@ namespace ts {
         function bindSourceFileIfExternalModule() {
             setExportContextFlag(file);
             if (isExternalModule(file)) {
-                bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName)}"`);
+                bindSourceFileAsExternalModule();
             }
         }
 
-        function bindExportAssignment(node: ExportAssignment) {
+        function bindSourceFileAsExternalModule() {
+            bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName) }"`);
+        }
+
+        function bindExportAssignment(node: ExportAssignment | BinaryExpression) {
+            const boundExpression = node.kind === SyntaxKind.ExportAssignment ? (<ExportAssignment>node).expression : (<BinaryExpression>node).right;
             if (!container.symbol || !container.symbol.exports) {
                 // Export assignment in some sort of block construct
                 bindAnonymousDeclaration(node, SymbolFlags.Alias, getDeclarationName(node));
             }
-            else if (node.expression.kind === SyntaxKind.Identifier) {
+            else if (boundExpression.kind === SyntaxKind.Identifier) {
                 // An export default clause with an identifier exports all meanings of that identifier
                 declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Alias, SymbolFlags.PropertyExcludes | SymbolFlags.AliasExcludes);
             }
@@ -985,12 +1319,40 @@ namespace ts {
             }
         }
 
+        function setCommonJsModuleIndicator(node: Node) {
+            if (!file.commonJsModuleIndicator) {
+                file.commonJsModuleIndicator = node;
+                bindSourceFileAsExternalModule();
+            }
+        }
+
+        function bindExportsPropertyAssignment(node: BinaryExpression) {
+            // When we create a property via 'exports.foo = bar', the 'exports.foo' property access
+            // expression is the declaration
+            setCommonJsModuleIndicator(node);
+            declareSymbol(file.symbol.exports, file.symbol, <PropertyAccessExpression>node.left, SymbolFlags.Property | SymbolFlags.Export, SymbolFlags.None);
+        }
+
+        function bindModuleExportsAssignment(node: BinaryExpression) {
+            // 'module.exports = expr' assignment
+            setCommonJsModuleIndicator(node);
+            bindExportAssignment(node);
+        }
+
+        function bindCallExpression(node: CallExpression) {
+            // We're only inspecting call expressions to detect CommonJS modules, so we can skip
+            // this check if we've already seen the module indicator
+            if (!file.commonJsModuleIndicator && isRequireCall(node)) {
+                setCommonJsModuleIndicator(node);
+            }
+        }
+
         function bindClassLikeDeclaration(node: ClassLikeDeclaration) {
             if (node.kind === SyntaxKind.ClassDeclaration) {
                 bindBlockScopedDeclaration(node, SymbolFlags.Class, SymbolFlags.ClassExcludes);
             }
             else {
-                let bindingName = node.name ? node.name.text : "__class";
+                const bindingName = node.name ? node.name.text : "__class";
                 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
                 // Add name of class expression into the map for semantic classifier
                 if (node.name) {
@@ -998,7 +1360,7 @@ namespace ts {
                 }
             }
 
-            let symbol = node.symbol;
+            const symbol = node.symbol;
 
             // TypeScript 1.0 spec (April 2014): 8.4
             // Every class automatically contains a static property member named 'prototype', the
@@ -1009,7 +1371,7 @@ namespace ts {
             // Note: we check for this here because this class may be merging into a module.  The
             // module might have an exported variable called 'prototype'.  We can't allow that as
             // that would clash with the built-in 'prototype' for the class.
-            let prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
+            const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
             if (hasProperty(symbol.exports, prototypeSymbol.name)) {
                 if (node.name) {
                     node.name.parent = node;
@@ -1074,7 +1436,7 @@ namespace ts {
                 node.parent.kind === SyntaxKind.Constructor &&
                 isClassLike(node.parent.parent)) {
 
-                let classDeclaration = <ClassLikeDeclaration>node.parent.parent;
+                const classDeclaration = <ClassLikeDeclaration>node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
             }
         }
@@ -1084,5 +1446,135 @@ namespace ts {
                 ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
                 : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
         }
+
+        // reachability checks
+
+        function pushNamedLabel(name: Identifier): boolean {
+            initializeReachabilityStateIfNecessary();
+
+            if (hasProperty(labelIndexMap, name.text)) {
+                return false;
+            }
+            labelIndexMap[name.text] = labelStack.push(Reachability.Unintialized) - 1;
+            return true;
+        }
+
+        function pushImplicitLabel(): number {
+            initializeReachabilityStateIfNecessary();
+
+            const index = labelStack.push(Reachability.Unintialized) - 1;
+            implicitLabels.push(index);
+            return index;
+        }
+
+        function popNamedLabel(label: Identifier, outerState: Reachability): void {
+            const index = labelIndexMap[label.text];
+            Debug.assert(index !== undefined);
+            Debug.assert(labelStack.length == index + 1);
+
+            labelIndexMap[label.text] = undefined;
+
+            setCurrentStateAtLabel(labelStack.pop(), outerState, label);
+        }
+
+        function popImplicitLabel(implicitLabelIndex: number, outerState: Reachability): void {
+            if (labelStack.length !== implicitLabelIndex + 1) {
+                Debug.assert(false, `Label stack: ${labelStack.length}, index:${implicitLabelIndex}`);
+            }
+
+            const i = implicitLabels.pop();
+
+            if (implicitLabelIndex !== i) {
+                Debug.assert(false, `i: ${i}, index: ${implicitLabelIndex}`);
+            }
+
+            setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined);
+        }
+
+        function setCurrentStateAtLabel(innerMergedState: Reachability, outerState: Reachability, label: Identifier): void {
+            if (innerMergedState === Reachability.Unintialized) {
+                if (label && !options.allowUnusedLabels) {
+                    file.bindDiagnostics.push(createDiagnosticForNode(label, Diagnostics.Unused_label));
+                }
+                currentReachabilityState = outerState;
+            }
+            else {
+                currentReachabilityState = or(innerMergedState, outerState);
+            }
+        }
+
+        function jumpToLabel(label: Identifier, outerState: Reachability): boolean {
+            initializeReachabilityStateIfNecessary();
+
+            const index = label ? labelIndexMap[label.text] : lastOrUndefined(implicitLabels);
+            if (index === undefined) {
+                // reference to unknown label or
+                // break/continue used outside of loops
+                return false;
+            }
+            const stateAtLabel = labelStack[index];
+            labelStack[index] = stateAtLabel === Reachability.Unintialized ? outerState : or(stateAtLabel, outerState);
+            return true;
+        }
+
+        function checkUnreachable(node: Node): boolean {
+            switch (currentReachabilityState) {
+                case Reachability.Unreachable:
+                    const reportError =
+                        // report error on all statements except empty ones
+                        (isStatement(node) && node.kind !== SyntaxKind.EmptyStatement) ||
+                        // report error on class declarations
+                        node.kind === SyntaxKind.ClassDeclaration ||
+                        // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
+                        (node.kind === SyntaxKind.ModuleDeclaration && shouldReportErrorOnModuleDeclaration(<ModuleDeclaration>node)) ||
+                        // report error on regular enums and const enums if preserveConstEnums is set
+                        (node.kind === SyntaxKind.EnumDeclaration && (!isConstEnumDeclaration(node) || options.preserveConstEnums));
+
+                    if (reportError) {
+                        currentReachabilityState = Reachability.ReportedUnreachable;
+
+                        // unreachable code is reported if
+                        // - user has explicitly asked about it AND
+                        // - statement is in not ambient context (statements in ambient context is already an error 
+                        //   so we should not report extras) AND
+                        //   - node is not variable statement OR
+                        //   - node is block scoped variable statement OR
+                        //   - node is not block scoped variable statement and at least one variable declaration has initializer
+                        //   Rationale: we don't want to report errors on non-initialized var's since they are hoisted
+                        //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
+                        const reportUnreachableCode =
+                            !options.allowUnreachableCode &&
+                            !isInAmbientContext(node) &&
+                            (
+                                node.kind !== SyntaxKind.VariableStatement ||
+                                getCombinedNodeFlags((<VariableStatement>node).declarationList) & NodeFlags.BlockScoped ||
+                                forEach((<VariableStatement>node).declarationList.declarations, d => d.initializer)
+                            );
+
+                        if (reportUnreachableCode) {
+                            errorOnFirstToken(node, Diagnostics.Unreachable_code_detected);
+                        }
+                    }
+                case Reachability.ReportedUnreachable:
+                    return true;
+                default:
+                    return false;
+            }
+
+            function shouldReportErrorOnModuleDeclaration(node: ModuleDeclaration): boolean {
+                const instanceState = getModuleInstanceState(node);
+                return instanceState === ModuleInstanceState.Instantiated || (instanceState === ModuleInstanceState.ConstEnumOnly && options.preserveConstEnums);
+            }
+        }
+
+        function initializeReachabilityStateIfNecessary(): void {
+            if (labelIndexMap) {
+                return;
+            }
+            currentReachabilityState = Reachability.Reachable;
+            labelIndexMap = {};
+            labelStack = [];
+            implicitLabels = [];
+        }
     }
 }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 04cc9a2e426..256a84bbde7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -33,26 +33,26 @@ namespace ts {
         // they no longer need the information (for example, if the user started editing again).
         let cancellationToken: CancellationToken;
 
-        let Symbol = objectAllocator.getSymbolConstructor();
-        let Type = objectAllocator.getTypeConstructor();
-        let Signature = objectAllocator.getSignatureConstructor();
+        const Symbol = objectAllocator.getSymbolConstructor();
+        const Type = objectAllocator.getTypeConstructor();
+        const Signature = objectAllocator.getSignatureConstructor();
 
         let typeCount = 0;
         let symbolCount = 0;
 
-        let emptyArray: any[] = [];
-        let emptySymbols: SymbolTable = {};
+        const emptyArray: any[] = [];
+        const emptySymbols: SymbolTable = {};
 
-        let compilerOptions = host.getCompilerOptions();
-        let languageVersion = compilerOptions.target || ScriptTarget.ES3;
-        let modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None;
+        const compilerOptions = host.getCompilerOptions();
+        const languageVersion = compilerOptions.target || ScriptTarget.ES3;
+        const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None;
 
-        let emitResolver = createResolver();
+        const emitResolver = createResolver();
 
-        let undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
-        let argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments");
+        const undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
+        const argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments");
 
-        let checker: TypeChecker = {
+        const checker: TypeChecker = {
             getNodeCount: () => sum(host.getSourceFiles(), "nodeCount"),
             getIdentifierCount: () => sum(host.getSourceFiles(), "identifierCount"),
             getSymbolCount: () => sum(host.getSourceFiles(), "symbolCount") + symbolCount,
@@ -97,35 +97,35 @@ namespace ts {
             isOptionalParameter
         };
 
-        let unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
-        let resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
+        const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
+        const resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
 
-        let anyType = createIntrinsicType(TypeFlags.Any, "any");
-        let stringType = createIntrinsicType(TypeFlags.String, "string");
-        let numberType = createIntrinsicType(TypeFlags.Number, "number");
-        let booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean");
-        let esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol");
-        let voidType = createIntrinsicType(TypeFlags.Void, "void");
-        let undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
-        let nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
-        let unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
-        let circularType = createIntrinsicType(TypeFlags.Any, "__circular__");
+        const anyType = createIntrinsicType(TypeFlags.Any, "any");
+        const stringType = createIntrinsicType(TypeFlags.String, "string");
+        const numberType = createIntrinsicType(TypeFlags.Number, "number");
+        const booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean");
+        const esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol");
+        const voidType = createIntrinsicType(TypeFlags.Void, "void");
+        const undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
+        const nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
+        const unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
 
-        let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        let emptyGenericType = <GenericType><ObjectType>createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        const emptyUnionType = emptyObjectType;
+        const emptyGenericType = <GenericType><ObjectType>createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         emptyGenericType.instantiations = {};
 
-        let anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        const anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
         anyFunctionType.flags |= TypeFlags.ContainsAnyFunctionType;
 
-        let noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
-        let anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
-        let unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
+        const anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
 
-        let globals: SymbolTable = {};
+        const globals: SymbolTable = {};
 
         let globalESSymbolConstructorSymbol: Symbol;
 
@@ -160,29 +160,31 @@ namespace ts {
         let getGlobalPromiseConstructorLikeType: () => ObjectType;
         let getGlobalThenableType: () => ObjectType;
 
-        let tupleTypes: Map<TupleType> = {};
-        let unionTypes: Map<UnionType> = {};
-        let intersectionTypes: Map<IntersectionType> = {};
-        let stringLiteralTypes: Map<StringLiteralType> = {};
+        let jsxElementClassType: Type;
+
+        const tupleTypes: Map<TupleType> = {};
+        const unionTypes: Map<UnionType> = {};
+        const intersectionTypes: Map<IntersectionType> = {};
+        const stringLiteralTypes: Map<StringLiteralType> = {};
         let emitExtends = false;
         let emitDecorate = false;
         let emitParam = false;
         let emitAwaiter = false;
-        let emitGenerator = false;
+        const emitGenerator = false;
 
-        let resolutionTargets: TypeSystemEntity[] = [];
-        let resolutionResults: boolean[] = [];
-        let resolutionPropertyNames: TypeSystemPropertyName[] = [];
+        const resolutionTargets: TypeSystemEntity[] = [];
+        const resolutionResults: boolean[] = [];
+        const resolutionPropertyNames: TypeSystemPropertyName[] = [];
 
-        let mergedSymbols: Symbol[] = [];
-        let symbolLinks: SymbolLinks[] = [];
-        let nodeLinks: NodeLinks[] = [];
-        let potentialThisCollisions: Node[] = [];
-        let awaitedTypeStack: number[] = [];
+        const mergedSymbols: Symbol[] = [];
+        const symbolLinks: SymbolLinks[] = [];
+        const nodeLinks: NodeLinks[] = [];
+        const potentialThisCollisions: Node[] = [];
+        const awaitedTypeStack: number[] = [];
 
-        let diagnostics = createDiagnosticCollection();
+        const diagnostics = createDiagnosticCollection();
 
-        let primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = {
+        const primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = {
             "string": {
                 type: stringType,
                 flags: TypeFlags.StringLike
@@ -198,6 +200,10 @@ namespace ts {
             "symbol": {
                 type: esSymbolType,
                 flags: TypeFlags.ESSymbol
+            },
+            "undefined": {
+                type: undefinedType,
+                flags: TypeFlags.ContainsUndefinedOrNull
             }
         };
 
@@ -209,9 +215,9 @@ namespace ts {
             Element: "Element"
         };
 
-        let subtypeRelation: Map<RelationComparisonResult> = {};
-        let assignableRelation: Map<RelationComparisonResult> = {};
-        let identityRelation: Map<RelationComparisonResult> = {};
+        const subtypeRelation: Map<RelationComparisonResult> = {};
+        const assignableRelation: Map<RelationComparisonResult> = {};
+        const identityRelation: Map<RelationComparisonResult> = {};
 
         // This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
         let _displayBuilder: SymbolDisplayBuilder;
@@ -237,7 +243,7 @@ namespace ts {
         }
 
         function error(location: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): void {
-            let diagnostic = location
+            const diagnostic = location
                 ? createDiagnosticForNode(location, message, arg0, arg1, arg2)
                 : createCompilerDiagnostic(message, arg0, arg1, arg2);
             diagnostics.add(diagnostic);
@@ -275,7 +281,7 @@ namespace ts {
         }
 
         function cloneSymbol(symbol: Symbol): Symbol {
-            let result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name);
+            const result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name);
             result.declarations = symbol.declarations.slice(0);
             result.parent = symbol.parent;
             if (symbol.valueDeclaration) result.valueDeclaration = symbol.valueDeclaration;
@@ -293,7 +299,12 @@ namespace ts {
                     target.constEnumOnlyModule = false;
                 }
                 target.flags |= source.flags;
-                if (!target.valueDeclaration && source.valueDeclaration) target.valueDeclaration = source.valueDeclaration;
+                if (source.valueDeclaration &&
+                    (!target.valueDeclaration ||
+                     (target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && source.valueDeclaration.kind !== SyntaxKind.ModuleDeclaration))) {
+                    // other kinds of value declarations take precedence over modules
+                    target.valueDeclaration = source.valueDeclaration;
+                }
                 forEach(source.declarations, node => {
                     target.declarations.push(node);
                 });
@@ -308,7 +319,7 @@ namespace ts {
                 recordMergedSymbol(target, source);
             }
             else {
-                let message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
+                const message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
                     ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
                 forEach(source.declarations, node => {
                     error(node.name ? node.name : node, message, symbolToString(source));
@@ -320,8 +331,8 @@ namespace ts {
         }
 
         function cloneSymbolTable(symbolTable: SymbolTable): SymbolTable {
-            let result: SymbolTable = {};
-            for (let id in symbolTable) {
+            const result: SymbolTable = {};
+            for (const id in symbolTable) {
                 if (hasProperty(symbolTable, id)) {
                     result[id] = symbolTable[id];
                 }
@@ -330,7 +341,7 @@ namespace ts {
         }
 
         function mergeSymbolTable(target: SymbolTable, source: SymbolTable) {
-            for (let id in source) {
+            for (const id in source) {
                 if (hasProperty(source, id)) {
                     if (!hasProperty(target, id)) {
                         target[id] = source[id];
@@ -348,12 +359,12 @@ namespace ts {
 
         function getSymbolLinks(symbol: Symbol): SymbolLinks {
             if (symbol.flags & SymbolFlags.Transient) return <TransientSymbol>symbol;
-            let id = getSymbolId(symbol);
+            const id = getSymbolId(symbol);
             return symbolLinks[id] || (symbolLinks[id] = {});
         }
 
         function getNodeLinks(node: Node): NodeLinks {
-            let nodeId = getNodeId(node);
+            const nodeId = getNodeId(node);
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
         }
 
@@ -362,18 +373,18 @@ namespace ts {
         }
 
         function isGlobalSourceFile(node: Node) {
-            return node.kind === SyntaxKind.SourceFile && !isExternalModule(<SourceFile>node);
+            return node.kind === SyntaxKind.SourceFile && !isExternalOrCommonJsModule(<SourceFile>node);
         }
 
         function getSymbol(symbols: SymbolTable, name: string, meaning: SymbolFlags): Symbol {
             if (meaning && hasProperty(symbols, name)) {
-                let symbol = symbols[name];
+                const symbol = symbols[name];
                 Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
                 if (symbol.flags & meaning) {
                     return symbol;
                 }
                 if (symbol.flags & SymbolFlags.Alias) {
-                    let target = resolveAlias(symbol);
+                    const target = resolveAlias(symbol);
                     // Unknown symbol means an error occurred in alias resolution, treat it as positive answer to avoid cascading errors
                     if (target === unknownSymbol || target.flags & meaning) {
                         return symbol;
@@ -419,7 +430,7 @@ namespace ts {
                 else if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement ||
                     declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
                     // ForIn/ForOf case - use site should not be used in expression part
-                    let expression = (<ForInStatement | ForOfStatement>declaration.parent.parent).expression;
+                    const expression = (<ForInStatement | ForOfStatement>declaration.parent.parent).expression;
                     return isSameScopeDescendentOf(usage, expression, container);
                 }
             }
@@ -458,35 +469,71 @@ namespace ts {
             let result: Symbol;
             let lastLocation: Node;
             let propertyWithInvalidInitializer: Node;
-            let errorLocation = location;
+            const errorLocation = location;
             let grandparent: Node;
 
             loop: while (location) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
                 if (location.locals && !isGlobalSourceFile(location)) {
                     if (result = getSymbol(location.locals, name, meaning)) {
-                        // Type parameters of a function are in scope in the entire function declaration, including the parameter
-                        // list and return type. However, local types are only in scope in the function body.
-                        if (!(meaning & SymbolFlags.Type) ||
-                            !(result.flags & (SymbolFlags.Type & ~SymbolFlags.TypeParameter)) ||
-                            !isFunctionLike(location) ||
-                            lastLocation === (<FunctionLikeDeclaration>location).body) {
+                        let useResult = true;
+                        if (isFunctionLike(location) && lastLocation && lastLocation !== (<FunctionLikeDeclaration>location).body) {
+                            // symbol lookup restrictions for function-like declarations
+                            // - Type parameters of a function are in scope in the entire function declaration, including the parameter
+                            //   list and return type. However, local types are only in scope in the function body.
+                            // - parameters are only in the scope of function body
+                            if (meaning & result.flags & SymbolFlags.Type) {
+                                useResult = result.flags & SymbolFlags.TypeParameter
+                                    // type parameters are visible in parameter list, return type and type parameter list
+                                    ? lastLocation === (<FunctionLikeDeclaration>location).type ||
+                                      lastLocation.kind === SyntaxKind.Parameter ||
+                                      lastLocation.kind === SyntaxKind.TypeParameter
+                                    // local types not visible outside the function body
+                                    : false;
+                            }
+                            if (meaning & SymbolFlags.Value && result.flags & SymbolFlags.FunctionScopedVariable) {
+                                // parameters are visible only inside function body, parameter list and return type
+                                // technically for parameter list case here we might mix parameters and variables declared in function,
+                                // however it is detected separately when checking initializers of parameters
+                                // to make sure that they reference no variables declared after them.
+                                useResult =
+                                    lastLocation.kind === SyntaxKind.Parameter ||
+                                    (
+                                        lastLocation === (<FunctionLikeDeclaration>location).type &&
+                                        result.valueDeclaration.kind === SyntaxKind.Parameter
+                                    );
+                            }
+                        }
+
+                        if (useResult) {
                             break loop;
                         }
-                        result = undefined;
+                        else {
+                            result = undefined;
+                        }
                     }
                 }
                 switch (location.kind) {
                     case SyntaxKind.SourceFile:
-                        if (!isExternalModule(<SourceFile>location)) break;
+                        if (!isExternalOrCommonJsModule(<SourceFile>location)) break;
                     case SyntaxKind.ModuleDeclaration:
-                        let moduleExports = getSymbolOfNode(location).exports;
+                        const moduleExports = getSymbolOfNode(location).exports;
                         if (location.kind === SyntaxKind.SourceFile ||
                             (location.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>location).name.kind === SyntaxKind.StringLiteral)) {
 
-                            // It's an external module. Because of module/namespace merging, a module's exports are in scope,
-                            // yet we never want to treat an export specifier as putting a member in scope. Therefore,
-                            // if the name we find is purely an export specifier, it is not actually considered in scope.
+                            // It's an external module. First see if the module has an export default and if the local
+                            // name of that export default matches.
+                            if (result = moduleExports["default"]) {
+                                const localSymbol = getLocalSymbolForExportDefault(result);
+                                if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
+                                    break loop;
+                                }
+                                result = undefined;
+                            }
+
+                            // Because of module/namespace merging, a module's exports are in scope,
+                            // yet we never want to treat an export specifier as putting a member in scope. 
+                            // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope.
                             // Two things to note about this:
                             //     1. We have to check this without calling getSymbol. The problem with calling getSymbol
                             //        on an export specifier is that it might find the export specifier itself, and try to
@@ -500,13 +547,6 @@ namespace ts {
                                 getDeclarationOfKind(moduleExports[name], SyntaxKind.ExportSpecifier)) {
                                 break;
                             }
-
-                            result = moduleExports["default"];
-                            let localSymbol = getLocalSymbolForExportDefault(result);
-                            if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) {
-                                break loop;
-                            }
-                            result = undefined;
                         }
 
                         if (result = getSymbol(moduleExports, name, meaning & SymbolFlags.ModuleMember)) {
@@ -527,7 +567,7 @@ namespace ts {
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
                         if (isClassLike(location.parent) && !(location.flags & NodeFlags.Static)) {
-                            let ctor = findConstructorDeclaration(<ClassLikeDeclaration>location.parent);
+                            const ctor = findConstructorDeclaration(<ClassLikeDeclaration>location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & SymbolFlags.Value)) {
                                     // Remember the property node, it will be used later to report appropriate error
@@ -550,7 +590,7 @@ namespace ts {
                             break loop;
                         }
                         if (location.kind === SyntaxKind.ClassExpression && meaning & SymbolFlags.Class) {
-                            let className = (<ClassExpression>location).name;
+                            const className = (<ClassExpression>location).name;
                             if (className && name === className.text) {
                                 result = location.symbol;
                                 break loop;
@@ -595,7 +635,7 @@ namespace ts {
                         }
 
                         if (meaning & SymbolFlags.Function) {
-                            let functionName = (<FunctionExpression>location).name;
+                            const functionName = (<FunctionExpression>location).name;
                             if (functionName && name === functionName.text) {
                                 result = location.symbol;
                                 break loop;
@@ -645,7 +685,7 @@ namespace ts {
                 if (propertyWithInvalidInitializer) {
                     // We have a match, but the reference occurred within a property initializer and the identifier also binds
                     // to a local variable in the constructor where the code will be emitted.
-                    let propertyName = (<PropertyDeclaration>propertyWithInvalidInitializer).name;
+                    const propertyName = (<PropertyDeclaration>propertyWithInvalidInitializer).name;
                     error(errorLocation, Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor,
                         declarationNameToString(propertyName), typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
                     return undefined;
@@ -657,7 +697,7 @@ namespace ts {
                 //          declare module foo {
                 //              interface bar {}
                 //          }
-                //      let foo/*1*/: foo/*2*/.bar;
+                //      const foo/*1*/: foo/*2*/.bar;
                 // The foo at /*1*/ and /*2*/ will share same symbol with two meaning
                 // block - scope variable and namespace module. However, only when we
                 // try to resolve name in /*1*/ which is used in variable position,
@@ -675,7 +715,7 @@ namespace ts {
         function checkResolvedBlockScopedVariable(result: Symbol, errorLocation: Node): void {
             Debug.assert((result.flags & SymbolFlags.BlockScopedVariable) !== 0);
             // Block-scoped variables cannot be used before their definition
-            let declaration = forEach(result.declarations, d => isBlockOrCatchScoped(d) ? d : undefined);
+            const declaration = forEach(result.declarations, d => isBlockOrCatchScoped(d) ? d : undefined);
 
             Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
 
@@ -725,9 +765,9 @@ namespace ts {
         }
 
         function getTargetOfImportClause(node: ImportClause): Symbol {
-            let moduleSymbol = resolveExternalModuleName(node, (<ImportDeclaration>node.parent).moduleSpecifier);
+            const moduleSymbol = resolveExternalModuleName(node, (<ImportDeclaration>node.parent).moduleSpecifier);
             if (moduleSymbol) {
-                let exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
+                const exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
                 if (!exportDefaultSymbol) {
                     error(node.name, Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 }
@@ -736,13 +776,13 @@ namespace ts {
         }
 
         function getTargetOfNamespaceImport(node: NamespaceImport): Symbol {
-            let moduleSpecifier = (<ImportDeclaration>node.parent.parent).moduleSpecifier;
+            const moduleSpecifier = (<ImportDeclaration>node.parent.parent).moduleSpecifier;
             return resolveESModuleSymbol(resolveExternalModuleName(node, moduleSpecifier), moduleSpecifier);
         }
 
         function getMemberOfModuleVariable(moduleSymbol: Symbol, name: string): Symbol {
             if (moduleSymbol.flags & SymbolFlags.Variable) {
-                let typeAnnotation = (<VariableDeclaration>moduleSymbol.valueDeclaration).type;
+                const typeAnnotation = (<VariableDeclaration>moduleSymbol.valueDeclaration).type;
                 if (typeAnnotation) {
                     return getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name);
                 }
@@ -771,7 +811,7 @@ namespace ts {
             if (valueSymbol.flags & (SymbolFlags.Type | SymbolFlags.Namespace)) {
                 return valueSymbol;
             }
-            let result = createSymbol(valueSymbol.flags | typeSymbol.flags, valueSymbol.name);
+            const result = createSymbol(valueSymbol.flags | typeSymbol.flags, valueSymbol.name);
             result.declarations = concatenate(valueSymbol.declarations, typeSymbol.declarations);
             result.parent = valueSymbol.parent || typeSymbol.parent;
             if (valueSymbol.valueDeclaration) result.valueDeclaration = valueSymbol.valueDeclaration;
@@ -782,7 +822,7 @@ namespace ts {
 
         function getExportOfModule(symbol: Symbol, name: string): Symbol {
             if (symbol.flags & SymbolFlags.Module) {
-                let exports = getExportsOfSymbol(symbol);
+                const exports = getExportsOfSymbol(symbol);
                 if (hasProperty(exports, name)) {
                     return resolveSymbol(exports[name]);
                 }
@@ -791,7 +831,7 @@ namespace ts {
 
         function getPropertyOfVariable(symbol: Symbol, name: string): Symbol {
             if (symbol.flags & SymbolFlags.Variable) {
-                let typeAnnotation = (<VariableDeclaration>symbol.valueDeclaration).type;
+                const typeAnnotation = (<VariableDeclaration>symbol.valueDeclaration).type;
                 if (typeAnnotation) {
                     return resolveSymbol(getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name));
                 }
@@ -799,14 +839,14 @@ namespace ts {
         }
 
         function getExternalModuleMember(node: ImportDeclaration | ExportDeclaration, specifier: ImportOrExportSpecifier): Symbol {
-            let moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-            let targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
+            const moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
+            const targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
             if (targetSymbol) {
-                let name = specifier.propertyName || specifier.name;
+                const name = specifier.propertyName || specifier.name;
                 if (name.text) {
-                    let symbolFromModule = getExportOfModule(targetSymbol, name.text);
-                    let symbolFromVariable = getPropertyOfVariable(targetSymbol, name.text);
-                    let symbol = symbolFromModule && symbolFromVariable ?
+                    const symbolFromModule = getExportOfModule(targetSymbol, name.text);
+                    const symbolFromVariable = getPropertyOfVariable(targetSymbol, name.text);
+                    const symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
@@ -854,11 +894,11 @@ namespace ts {
 
         function resolveAlias(symbol: Symbol): Symbol {
             Debug.assert((symbol.flags & SymbolFlags.Alias) !== 0, "Should only get Alias here.");
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.target) {
                 links.target = resolvingSymbol;
-                let node = getDeclarationOfAliasSymbol(symbol);
-                let target = getTargetOfAliasDeclaration(node);
+                const node = getDeclarationOfAliasSymbol(symbol);
+                const target = getTargetOfAliasDeclaration(node);
                 if (links.target === resolvingSymbol) {
                     links.target = target || unknownSymbol;
                 }
@@ -873,10 +913,10 @@ namespace ts {
         }
 
         function markExportAsReferenced(node: ImportEqualsDeclaration | ExportAssignment | ExportSpecifier) {
-            let symbol = getSymbolOfNode(node);
-            let target = resolveAlias(symbol);
+            const symbol = getSymbolOfNode(node);
+            const target = resolveAlias(symbol);
             if (target) {
-                let markAlias =
+                const markAlias =
                     (target === unknownSymbol && compilerOptions.isolatedModules) ||
                     (target !== unknownSymbol && (target.flags & SymbolFlags.Value) && !isConstEnumOrConstEnumOnlyModule(target));
 
@@ -890,10 +930,10 @@ namespace ts {
         // we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking the target of
         // the alias as an expression (which recursively takes us back here if the target references another alias).
         function markAliasSymbolAsReferenced(symbol: Symbol) {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.referenced) {
                 links.referenced = true;
-                let node = getDeclarationOfAliasSymbol(symbol);
+                const node = getDeclarationOfAliasSymbol(symbol);
                 if (node.kind === SyntaxKind.ExportAssignment) {
                     // export default <symbol>
                     checkExpressionCached((<ExportAssignment>node).expression);
@@ -948,7 +988,7 @@ namespace ts {
 
             let symbol: Symbol;
             if (name.kind === SyntaxKind.Identifier) {
-                let message = meaning === SymbolFlags.Namespace ? Diagnostics.Cannot_find_namespace_0 : Diagnostics.Cannot_find_name_0;
+                const message = meaning === SymbolFlags.Namespace ? Diagnostics.Cannot_find_namespace_0 : Diagnostics.Cannot_find_name_0;
 
                 symbol = resolveName(name, (<Identifier>name).text, meaning, ignoreErrors ? undefined : message, <Identifier>name);
                 if (!symbol) {
@@ -956,10 +996,10 @@ namespace ts {
                 }
             }
             else if (name.kind === SyntaxKind.QualifiedName || name.kind === SyntaxKind.PropertyAccessExpression) {
-                let left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessExpression>name).expression;
-                let right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;
+                const left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessExpression>name).expression;
+                const right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;
 
-                let namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors);
+                const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors);
                 if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) {
                     return undefined;
                 }
@@ -983,8 +1023,8 @@ namespace ts {
                 return;
             }
 
-            let moduleReferenceLiteral = <LiteralExpression>moduleReferenceExpression;
-            let searchPath = getDirectoryPath(getSourceFile(location).fileName);
+            const moduleReferenceLiteral = <LiteralExpression>moduleReferenceExpression;
+            const searchPath = getDirectoryPath(getSourceFile(location).fileName);
 
             // Module names are escaped in our symbol table.  However, string literal values aren't.
             // Escape the name in the "require(...)" clause to ensure we find the right symbol.
@@ -993,16 +1033,21 @@ namespace ts {
             if (moduleName === undefined) {
                 return;
             }
-            let isRelative = isExternalModuleNameRelative(moduleName);
+
+            if (moduleName.indexOf("!") >= 0) {
+                moduleName = moduleName.substr(0, moduleName.indexOf("!"));
+            }
+
+            const isRelative = isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                let symbol = getSymbol(globals, "\"" + moduleName + "\"", SymbolFlags.ValueModule);
+                const symbol = getSymbol(globals, "\"" + moduleName + "\"", SymbolFlags.ValueModule);
                 if (symbol) {
                     return symbol;
                 }
             }
 
-            let resolvedModule = getResolvedModule(getSourceFile(location), moduleReferenceLiteral.text);
-            let sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
+            const resolvedModule = getResolvedModule(getSourceFile(location), moduleReferenceLiteral.text);
+            const sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
                     return sourceFile.symbol;
@@ -1044,12 +1089,12 @@ namespace ts {
         }
 
         function getExportsOfModule(moduleSymbol: Symbol): SymbolTable {
-            let links = getSymbolLinks(moduleSymbol);
+            const links = getSymbolLinks(moduleSymbol);
             return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol));
         }
 
         function extendExportSymbols(target: SymbolTable, source: SymbolTable) {
-            for (let id in source) {
+            for (const id in source) {
                 if (id !== "default" && !hasProperty(target, id)) {
                     target[id] = source[id];
                 }
@@ -1058,7 +1103,7 @@ namespace ts {
 
         function getExportsForModule(moduleSymbol: Symbol): SymbolTable {
             let result: SymbolTable;
-            let visitedSymbols: Symbol[] = [];
+            const visitedSymbols: Symbol[] = [];
             visit(moduleSymbol);
             return result || moduleSymbol.exports;
 
@@ -1074,9 +1119,9 @@ namespace ts {
                         extendExportSymbols(result, symbol.exports);
                     }
                     // All export * declarations are collected in an __export symbol by the binder
-                    let exportStars = symbol.exports["__export"];
+                    const exportStars = symbol.exports["__export"];
                     if (exportStars) {
-                        for (let node of exportStars.declarations) {
+                        for (const node of exportStars.declarations) {
                             visit(resolveExternalModuleName(node, (<ExportDeclaration>node).moduleSpecifier));
                         }
                     }
@@ -1124,8 +1169,8 @@ namespace ts {
         }
 
         function findConstructorDeclaration(node: ClassLikeDeclaration): ConstructorDeclaration {
-            let members = node.members;
-            for (let member of members) {
+            const members = node.members;
+            for (const member of members) {
                 if (member.kind === SyntaxKind.Constructor && nodeIsPresent((<ConstructorDeclaration>member).body)) {
                     return <ConstructorDeclaration>member;
                 }
@@ -1133,19 +1178,19 @@ namespace ts {
         }
 
         function createType(flags: TypeFlags): Type {
-            let result = new Type(checker, flags);
+            const result = new Type(checker, flags);
             result.id = typeCount++;
             return result;
         }
 
         function createIntrinsicType(kind: TypeFlags, intrinsicName: string): IntrinsicType {
-            let type = <IntrinsicType>createType(kind);
+            const type = <IntrinsicType>createType(kind);
             type.intrinsicName = intrinsicName;
             return type;
         }
 
         function createObjectType(kind: TypeFlags, symbol?: Symbol): ObjectType {
-            let type = <ObjectType>createType(kind);
+            const type = <ObjectType>createType(kind);
             type.symbol = symbol;
             return type;
         }
@@ -1163,11 +1208,11 @@ namespace ts {
 
         function getNamedMembers(members: SymbolTable): Symbol[] {
             let result: Symbol[];
-            for (let id in members) {
+            for (const id in members) {
                 if (hasProperty(members, id)) {
                     if (!isReservedMemberName(id)) {
                         if (!result) result = [];
-                        let symbol = members[id];
+                        const symbol = members[id];
                         if (symbolIsValue(symbol)) {
                             result.push(symbol);
                         }
@@ -1203,7 +1248,7 @@ namespace ts {
                 }
                 switch (location.kind) {
                     case SyntaxKind.SourceFile:
-                        if (!isExternalModule(<SourceFile>location)) {
+                        if (!isExternalOrCommonJsModule(<SourceFile>location)) {
                             break;
                         }
                     case SyntaxKind.ModuleDeclaration:
@@ -1237,7 +1282,7 @@ namespace ts {
                     }
 
                     // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too
-                    let accessibleParent = getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
+                    const accessibleParent = getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
                     return !!accessibleParent;
                 }
 
@@ -1265,14 +1310,14 @@ namespace ts {
                             // Is this external alias, then use it to name
                             ts.forEach(symbolFromSymbolTable.declarations, isExternalModuleImportEqualsDeclaration)) {
 
-                            let resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
+                            const resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                             if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) {
                                 return [symbolFromSymbolTable];
                             }
 
                             // Look in the exported members, if we can find accessibleSymbolChain, symbol is accessible using this chain
                             // but only if the symbolFromSymbolTable can be qualified
-                            let accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
+                            const accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
                             if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
                                 return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
                             }
@@ -1317,13 +1362,13 @@ namespace ts {
 
         function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult {
             if (symbol && enclosingDeclaration && !(symbol.flags & SymbolFlags.TypeParameter)) {
-                let initialSymbol = symbol;
+                const initialSymbol = symbol;
                 let meaningToLook = meaning;
                 while (symbol) {
                     // Symbol is accessible if it by itself is accessible
-                    let accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, /*useOnlyExternalAliasing*/ false);
+                    const accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, /*useOnlyExternalAliasing*/ false);
                     if (accessibleSymbolChain) {
-                        let hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
+                        const hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
                         if (!hasAccessibleDeclarations) {
                             return <SymbolAccessiblityResult>{
                                 accessibility: SymbolAccessibility.NotAccessible,
@@ -1341,7 +1386,7 @@ namespace ts {
                     //     export class c {
                     //     }
                     // }
-                    // let x: typeof m.c
+                    // const x: typeof m.c
                     // In the above example when we start with checking if typeof m.c symbol is accessible,
                     // we are going to see if c can be accessed in scope directly.
                     // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible
@@ -1352,9 +1397,9 @@ namespace ts {
 
                 // This could be a symbol that is not exported in the external module
                 // or it could be a symbol from different external module that is not aliased and hence cannot be named
-                let symbolExternalModule = forEach(initialSymbol.declarations, getExternalModuleContainer);
+                const symbolExternalModule = forEach(initialSymbol.declarations, getExternalModuleContainer);
                 if (symbolExternalModule) {
-                    let enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration);
+                    const enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration);
                     if (symbolExternalModule !== enclosingExternalModule) {
                         // name from different external module that is not visible
                         return {
@@ -1385,7 +1430,7 @@ namespace ts {
 
         function hasExternalModuleSymbol(declaration: Node) {
             return (declaration.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>declaration).name.kind === SyntaxKind.StringLiteral) ||
-                (declaration.kind === SyntaxKind.SourceFile && isExternalModule(<SourceFile>declaration));
+                (declaration.kind === SyntaxKind.SourceFile && isExternalOrCommonJsModule(<SourceFile>declaration));
         }
 
         function hasVisibleDeclarations(symbol: Symbol): SymbolVisibilityResult {
@@ -1400,7 +1445,7 @@ namespace ts {
                     // Mark the unexported alias as visible if its parent is visible
                     // because these kind of aliases can be used to name types in declaration file
 
-                    let anyImportSyntax = getAnyImportSyntax(declaration);
+                    const anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
                         !(anyImportSyntax.flags & NodeFlags.Export) && // import clause without export
                         isDeclarationVisible(<Declaration>anyImportSyntax.parent)) {
@@ -1442,8 +1487,8 @@ namespace ts {
                 meaning = SymbolFlags.Type;
             }
 
-            let firstIdentifier = getFirstIdentifier(entityName);
-            let symbol = resolveName(enclosingDeclaration, (<Identifier>firstIdentifier).text, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
+            const firstIdentifier = getFirstIdentifier(entityName);
+            const symbol = resolveName(enclosingDeclaration, (<Identifier>firstIdentifier).text, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
 
             // Verify if the symbol is accessible
             return (symbol && hasVisibleDeclarations(symbol)) || <SymbolVisibilityResult>{
@@ -1466,30 +1511,30 @@ namespace ts {
         }
 
         function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string {
-            let writer = getSingleLineStringWriter();
+            const writer = getSingleLineStringWriter();
             getSymbolDisplayBuilder().buildSymbolDisplay(symbol, writer, enclosingDeclaration, meaning);
-            let result = writer.string();
+            const result = writer.string();
             releaseStringWriter(writer);
 
             return result;
         }
 
         function signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string {
-            let writer = getSingleLineStringWriter();
+            const writer = getSingleLineStringWriter();
             getSymbolDisplayBuilder().buildSignatureDisplay(signature, writer, enclosingDeclaration, flags);
-            let result = writer.string();
+            const result = writer.string();
             releaseStringWriter(writer);
 
             return result;
         }
 
         function typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string {
-            let writer = getSingleLineStringWriter();
+            const writer = getSingleLineStringWriter();
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
             let result = writer.string();
             releaseStringWriter(writer);
 
-            let maxLength = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation ? undefined : 100;
+            const maxLength = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation ? undefined : 100;
             if (maxLength && result.length >= maxLength) {
                 result = result.substr(0, maxLength - "...".length) + "...";
             }
@@ -1513,7 +1558,7 @@ namespace ts {
 
             function getNameOfSymbol(symbol: Symbol): string {
                 if (symbol.declarations && symbol.declarations.length) {
-                    let declaration = symbol.declarations[0];
+                    const declaration = symbol.declarations[0];
                     if (declaration.name) {
                         return declarationNameToString(declaration.name);
                     }
@@ -1560,7 +1605,7 @@ namespace ts {
                     appendSymbolNameOnly(symbol, writer);
                 }
 
-                // Let the writer know we just wrote out a symbol.  The declaration emitter writer uses
+                // const the writer know we just wrote out a symbol.  The declaration emitter writer uses
                 // this to determine if an import it has previously seen (and not written out) needs
                 // to be written to the file once the walk of the tree is complete.
                 //
@@ -1570,7 +1615,7 @@ namespace ts {
                 writer.trackSymbol(symbol, enclosingDeclaration, meaning);
                 function walkSymbol(symbol: Symbol, meaning: SymbolFlags): void {
                     if (symbol) {
-                        let accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & SymbolFormatFlags.UseOnlyExternalAliasing));
+                        const accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & SymbolFormatFlags.UseOnlyExternalAliasing));
 
                         if (!accessibleSymbolChain ||
                             needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
@@ -1582,7 +1627,7 @@ namespace ts {
                         }
 
                         if (accessibleSymbolChain) {
-                            for (let accessibleSymbol of accessibleSymbolChain) {
+                            for (const accessibleSymbol of accessibleSymbolChain) {
                                 appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
                             }
                         }
@@ -1605,8 +1650,8 @@ namespace ts {
                 // Get qualified name if the symbol is not a type parameter
                 // and there is an enclosing declaration or we specifically
                 // asked for it
-                let isTypeParameter = symbol.flags & SymbolFlags.TypeParameter;
-                let typeFormatFlag = TypeFormatFlags.UseFullyQualifiedType & typeFlags;
+                const isTypeParameter = symbol.flags & SymbolFlags.TypeParameter;
+                const typeFormatFlag = TypeFormatFlags.UseFullyQualifiedType & typeFlags;
                 if (!isTypeParameter && (enclosingDeclaration || typeFormatFlag)) {
                     walkSymbol(symbol, meaning);
                     return;
@@ -1616,7 +1661,7 @@ namespace ts {
             }
 
             function buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, globalFlags?: TypeFormatFlags, symbolStack?: Symbol[]) {
-                let globalFlagsToPass = globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike;
+                const globalFlagsToPass = globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike;
                 let inObjectTypeLiteral = false;
                 return writeType(type, globalFlags);
 
@@ -1651,7 +1696,7 @@ namespace ts {
                         writeAnonymousType(<ObjectType>type, flags);
                     }
                     else if (type.flags & TypeFlags.StringLiteral) {
-                        writer.writeStringLiteral((<StringLiteralType>type).text);
+                        writer.writeStringLiteral(`"${escapeString((<StringLiteralType>type).text)}"`);
                     }
                     else {
                         // Should never get here
@@ -1695,7 +1740,7 @@ namespace ts {
                 }
 
                 function writeTypeReference(type: TypeReference, flags: TypeFormatFlags) {
-                    let typeArguments = type.typeArguments || emptyArray;
+                    const typeArguments = type.typeArguments || emptyArray;
                     if (type.target === globalArrayType && !(flags & TypeFormatFlags.WriteArrayAsGenericType)) {
                         writeType(typeArguments[0], TypeFormatFlags.InElementType);
                         writePunctuation(writer, SyntaxKind.OpenBracketToken);
@@ -1705,14 +1750,14 @@ namespace ts {
                         // Write the type reference in the format f<A>.g<B>.C<X, Y> where A and B are type arguments
                         // for outer type parameters, and f and g are the respective declaring containers of those
                         // type parameters.
-                        let outerTypeParameters = type.target.outerTypeParameters;
+                        const outerTypeParameters = type.target.outerTypeParameters;
                         let i = 0;
                         if (outerTypeParameters) {
-                            let length = outerTypeParameters.length;
+                            const length = outerTypeParameters.length;
                             while (i < length) {
                                 // Find group of type arguments for type parameters with the same declaring container.
-                                let start = i;
-                                let parent = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                const start = i;
+                                const parent = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
                                 } while (i < length && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent);
@@ -1724,7 +1769,7 @@ namespace ts {
                                 }
                             }
                         }
-                        let typeParameterCount = (type.target.typeParameters || emptyArray).length;
+                        const typeParameterCount = (type.target.typeParameters || emptyArray).length;
                         writeSymbolTypeReference(type.symbol, typeArguments, i, typeParameterCount, flags);
                     }
                 }
@@ -1746,7 +1791,7 @@ namespace ts {
                 }
 
                 function writeAnonymousType(type: ObjectType, flags: TypeFormatFlags) {
-                    let symbol = type.symbol;
+                    const symbol = type.symbol;
                     if (symbol) {
                         // Always use 'typeof T' for type of class, enum, and module objects
                         if (symbol.flags & (SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.ValueModule)) {
@@ -1757,7 +1802,7 @@ namespace ts {
                         }
                         else if (contains(symbolStack, symbol)) {
                             // If type is an anonymous type literal in a type alias declaration, use type alias name
-                            let typeAlias = getTypeAliasForTypeLiteral(type);
+                            const typeAlias = getTypeAliasForTypeLiteral(type);
                             if (typeAlias) {
                                 // The specified symbol flags need to be reinterpreted as type flags
                                 buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, flags);
@@ -1784,9 +1829,9 @@ namespace ts {
                     }
 
                     function shouldWriteTypeOfFunctionSymbol() {
-                        let isStaticMethodSymbol = !!(symbol.flags & SymbolFlags.Method &&  // typeof static method
+                        const isStaticMethodSymbol = !!(symbol.flags & SymbolFlags.Method &&  // typeof static method
                             forEach(symbol.declarations, declaration => declaration.flags & NodeFlags.Static));
-                        let isNonLocalFunctionSymbol = !!(symbol.flags & SymbolFlags.Function) &&
+                        const isNonLocalFunctionSymbol = !!(symbol.flags & SymbolFlags.Function) &&
                             (symbol.parent || // is exported function symbol
                                 forEach(symbol.declarations, declaration =>
                                     declaration.parent.kind === SyntaxKind.SourceFile || declaration.parent.kind === SyntaxKind.ModuleBlock));
@@ -1805,7 +1850,7 @@ namespace ts {
                 }
 
                 function getIndexerParameterName(type: ObjectType, indexKind: IndexKind, fallbackName: string): string {
-                    let declaration = <SignatureDeclaration>getIndexDeclarationOfSymbol(type.symbol, indexKind);
+                    const declaration = <SignatureDeclaration>getIndexDeclarationOfSymbol(type.symbol, indexKind);
                     if (!declaration) {
                         // declaration might not be found if indexer was added from the contextual type.
                         // in this case use fallback name
@@ -1816,7 +1861,7 @@ namespace ts {
                 }
 
                 function writeLiteralType(type: ObjectType, flags: TypeFormatFlags) {
-                    let resolved = resolveStructuredTypeMembers(type);
+                    const resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
                             writePunctuation(writer, SyntaxKind.OpenBraceToken);
@@ -1848,17 +1893,17 @@ namespace ts {
                         }
                     }
 
-                    let saveInObjectTypeLiteral = inObjectTypeLiteral;
+                    const saveInObjectTypeLiteral = inObjectTypeLiteral;
                     inObjectTypeLiteral = true;
                     writePunctuation(writer, SyntaxKind.OpenBraceToken);
                     writer.writeLine();
                     writer.increaseIndent();
-                    for (let signature of resolved.callSignatures) {
+                    for (const signature of resolved.callSignatures) {
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, symbolStack);
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
                         writer.writeLine();
                     }
-                    for (let signature of resolved.constructSignatures) {
+                    for (const signature of resolved.constructSignatures) {
                         writeKeyword(writer, SyntaxKind.NewKeyword);
                         writeSpace(writer);
 
@@ -1894,11 +1939,11 @@ namespace ts {
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
                         writer.writeLine();
                     }
-                    for (let p of resolved.properties) {
-                        let t = getTypeOfSymbol(p);
+                    for (const p of resolved.properties) {
+                        const t = getTypeOfSymbol(p);
                         if (p.flags & (SymbolFlags.Function | SymbolFlags.Method) && !getPropertiesOfObjectType(t).length) {
-                            let signatures = getSignaturesOfType(t, SignatureKind.Call);
-                            for (let signature of signatures) {
+                            const signatures = getSignaturesOfType(t, SignatureKind.Call);
+                            for (const signature of signatures) {
                                 buildSymbolDisplay(p, writer);
                                 if (p.flags & SymbolFlags.Optional) {
                                     writePunctuation(writer, SyntaxKind.QuestionToken);
@@ -1927,7 +1972,7 @@ namespace ts {
             }
 
             function buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags) {
-                let targetSymbol = getTargetSymbol(symbol);
+                const targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & SymbolFlags.Class || targetSymbol.flags & SymbolFlags.Interface || targetSymbol.flags & SymbolFlags.TypeAlias) {
                     buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaraiton, flags);
                 }
@@ -1935,7 +1980,7 @@ namespace ts {
 
             function buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
                 appendSymbolNameOnly(tp.symbol, writer);
-                let constraint = getConstraintOfTypeParameter(tp);
+                const constraint = getConstraintOfTypeParameter(tp);
                 if (constraint) {
                     writeSpace(writer);
                     writeKeyword(writer, SyntaxKind.ExtendsKeyword);
@@ -1945,7 +1990,7 @@ namespace ts {
             }
 
             function buildParameterDisplay(p: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
-                let parameterNode = <ParameterDeclaration>p.valueDeclaration;
+                const parameterNode = <ParameterDeclaration>p.valueDeclaration;
                 if (isRestParameter(parameterNode)) {
                     writePunctuation(writer, SyntaxKind.DotDotDotToken);
                 }
@@ -2059,7 +2104,7 @@ namespace ts {
                         }
                     }
                     else if (node.kind === SyntaxKind.SourceFile) {
-                        return isExternalModule(<SourceFile>node) ? node : undefined;
+                        return isExternalOrCommonJsModule(<SourceFile>node) ? node : undefined;
                     }
                 }
                 Debug.fail("getContainingModule cant reach here");
@@ -2067,14 +2112,14 @@ namespace ts {
 
             function isUsedInExportAssignment(node: Node) {
                 // Get source File and see if it is external module and has export assigned symbol
-                let externalModule = getContainingExternalModule(node);
+                const externalModule = getContainingExternalModule(node);
                 let exportAssignmentSymbol: Symbol;
                 let resolvedExportSymbol: Symbol;
                 if (externalModule) {
                     // This is export assigned symbol node
-                    let externalModuleSymbol = getSymbolOfNode(externalModule);
+                    const externalModuleSymbol = getSymbolOfNode(externalModule);
                     exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol);
-                    let symbolOfNode = getSymbolOfNode(node);
+                    const symbolOfNode = getSymbolOfNode(node);
                     if (isSymbolUsedInExportAssignment(symbolOfNode)) {
                         return true;
                     }
@@ -2129,7 +2174,7 @@ namespace ts {
                     case SyntaxKind.FunctionDeclaration:
                     case SyntaxKind.EnumDeclaration:
                     case SyntaxKind.ImportEqualsDeclaration:
-                        let parent = getDeclarationContainer(node);
+                        const parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(getCombinedNodeFlags(node) & NodeFlags.Export) &&
                             !(node.kind !== SyntaxKind.ImportEqualsDeclaration && parent.kind !== SyntaxKind.SourceFile && isInAmbientContext(parent))) {
@@ -2148,7 +2193,7 @@ namespace ts {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
-                    // Public properties/methods are visible if its parents are visible, so let it fall into next case statement
+                    // Public properties/methods are visible if its parents are visible, so const it fall into next case statement
 
                     case SyntaxKind.Constructor:
                     case SyntaxKind.ConstructSignature:
@@ -2180,7 +2225,7 @@ namespace ts {
                     case SyntaxKind.SourceFile:
                         return true;
 
-                    // Export assignements do not create name bindings outside the module
+                    // Export assignments do not create name bindings outside the module
                     case SyntaxKind.ExportAssignment:
                         return false;
 
@@ -2190,7 +2235,7 @@ namespace ts {
             }
 
             if (node) {
-                let links = getNodeLinks(node);
+                const links = getNodeLinks(node);
                 if (links.isVisible === undefined) {
                     links.isVisible = !!determineIfDeclarationIsVisible();
                 }
@@ -2204,12 +2249,12 @@ namespace ts {
                 exportSymbol = resolveName(node.parent, node.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias, Diagnostics.Cannot_find_name_0, node);
             }
             else if (node.parent.kind === SyntaxKind.ExportSpecifier) {
-                let exportSpecifier = <ExportSpecifier>node.parent;
+                const exportSpecifier = <ExportSpecifier>node.parent;
                 exportSymbol = (<ExportDeclaration>exportSpecifier.parent.parent).moduleSpecifier ?
                     getExternalModuleMember(<ExportDeclaration>exportSpecifier.parent.parent, exportSpecifier) :
                     resolveEntityName(exportSpecifier.propertyName || exportSpecifier.name, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias);
             }
-            let result: Node[] = [];
+            const result: Node[] = [];
             if (exportSymbol) {
                 buildVisibleNodeList(exportSymbol.declarations);
             }
@@ -2218,16 +2263,16 @@ namespace ts {
             function buildVisibleNodeList(declarations: Declaration[]) {
                 forEach(declarations, declaration => {
                     getNodeLinks(declaration).isVisible = true;
-                    let resultNode = getAnyImportSyntax(declaration) || declaration;
+                    const resultNode = getAnyImportSyntax(declaration) || declaration;
                     if (!contains(result, resultNode)) {
                         result.push(resultNode);
                     }
 
                     if (isInternalModuleImportEqualsDeclaration(declaration)) {
                         // Add the referenced top container visible
-                        let internalModuleReference = <Identifier | QualifiedName>(<ImportEqualsDeclaration>declaration).moduleReference;
-                        let firstIdentifier = getFirstIdentifier(internalModuleReference);
-                        let importSymbol = resolveName(declaration, firstIdentifier.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace,
+                        const internalModuleReference = <Identifier | QualifiedName>(<ImportEqualsDeclaration>declaration).moduleReference;
+                        const firstIdentifier = getFirstIdentifier(internalModuleReference);
+                        const importSymbol = resolveName(declaration, firstIdentifier.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace,
                             Diagnostics.Cannot_find_name_0, firstIdentifier);
                         buildVisibleNodeList(importSymbol.declarations);
                     }
@@ -2247,17 +2292,17 @@ namespace ts {
          * @param propertyName The property name that should be used to query the target for its type
          */
         function pushTypeResolution(target: TypeSystemEntity, propertyName: TypeSystemPropertyName): boolean {
-            let resolutionCycleStartIndex = findResolutionCycleStartIndex(target, propertyName);
+            const resolutionCycleStartIndex = findResolutionCycleStartIndex(target, propertyName);
             if (resolutionCycleStartIndex >= 0) {
                 // A cycle was found
-                let { length } = resolutionTargets;
+                const { length } = resolutionTargets;
                 for (let i = resolutionCycleStartIndex; i < length; i++) {
                     resolutionResults[i] = false;
                 }
                 return false;
             }
             resolutionTargets.push(target);
-            resolutionResults.push(true);
+            resolutionResults.push(/*items*/ true);
             resolutionPropertyNames.push(propertyName);
             return true;
         }
@@ -2314,13 +2359,13 @@ namespace ts {
             // Every class automatically contains a static property member named 'prototype',
             // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
             // It is an error to explicitly declare a static property member with the name 'prototype'.
-            let classType = <InterfaceType>getDeclaredTypeOfSymbol(prototype.parent);
+            const classType = <InterfaceType>getDeclaredTypeOfSymbol(prototype.parent);
             return classType.typeParameters ? createTypeReference(<GenericType>classType, map(classType.typeParameters, _ => anyType)) : classType;
         }
 
         // Return the type of the given property in the given type, or undefined if no such property exists
         function getTypeOfPropertyOfType(type: Type, name: string): Type {
-            let prop = getPropertyOfType(type, name);
+            const prop = getPropertyOfType(type, name);
             return prop ? getTypeOfSymbol(prop) : undefined;
         }
 
@@ -2331,14 +2376,34 @@ namespace ts {
         // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
         // assigned by contextual typing.
         function getTypeForBindingElementParent(node: VariableLikeDeclaration) {
-            let symbol = getSymbolOfNode(node);
+            const symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node);
         }
 
+        function getTextOfPropertyName(name: PropertyName): string {
+            switch (name.kind) {
+                case SyntaxKind.Identifier:
+                    return (<Identifier>name).text;
+                case SyntaxKind.StringLiteral:
+                case SyntaxKind.NumericLiteral:
+                    return (<LiteralExpression>name).text;
+                case SyntaxKind.ComputedPropertyName:
+                    if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind)) {
+                        return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
+                    }
+            }
+
+            return undefined;
+        }
+
+        function isComputedNonLiteralName(name: PropertyName): boolean {
+            return name.kind === SyntaxKind.ComputedPropertyName && !isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind);
+        }
+
         // Return the inferred type for a binding element
         function getTypeForBindingElement(declaration: BindingElement): Type {
-            let pattern = <BindingPattern>declaration.parent;
-            let parentType = getTypeForBindingElementParent(<VariableLikeDeclaration>pattern.parent);
+            const pattern = <BindingPattern>declaration.parent;
+            const parentType = getTypeForBindingElementParent(<VariableLikeDeclaration>pattern.parent);
             // If parent has the unknown (error) type, then so does this binding element
             if (parentType === unknownType) {
                 return unknownType;
@@ -2356,11 +2421,18 @@ namespace ts {
             let type: Type;
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                 // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
-                let name = declaration.propertyName || <Identifier>declaration.name;
+                const name = declaration.propertyName || <Identifier>declaration.name;
+                if (isComputedNonLiteralName(name)) {
+                    // computed properties with non-literal names are treated as 'any'
+                    return anyType;
+                }
+
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
-                type = getTypeOfPropertyOfType(parentType, name.text) ||
-                    isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, IndexKind.Number) ||
+                const text = getTextOfPropertyName(name);
+
+                type = getTypeOfPropertyOfType(parentType, text) ||
+                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, IndexKind.Number) ||
                     getIndexTypeOfType(parentType, IndexKind.String);
                 if (!type) {
                     error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), declarationNameToString(name));
@@ -2371,10 +2443,10 @@ namespace ts {
                 // This elementType will be used if the specific property corresponding to this index is not
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
-                let elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false);
+                const elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false);
                 if (!declaration.dotDotDotToken) {
                     // Use specific property type when parent is a tuple or numeric index type when parent is an array
-                    let propName = "" + indexOf(pattern.elements, declaration);
+                    const propName = "" + indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
                         ? getTypeOfPropertyOfType(parentType, propName)
                         : elementType;
@@ -2421,16 +2493,16 @@ namespace ts {
             }
 
             if (declaration.kind === SyntaxKind.Parameter) {
-                let func = <FunctionLikeDeclaration>declaration.parent;
+                const func = <FunctionLikeDeclaration>declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
                 if (func.kind === SyntaxKind.SetAccessor && !hasDynamicName(func)) {
-                    let getter = <AccessorDeclaration>getDeclarationOfKind(declaration.parent.symbol, SyntaxKind.GetAccessor);
+                    const getter = <AccessorDeclaration>getDeclarationOfKind(declaration.parent.symbol, SyntaxKind.GetAccessor);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
                     }
                 }
                 // Use contextual parameter type if one is available
-                let type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
+                const type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
                 if (type) {
                     return type;
                 }
@@ -2470,32 +2542,43 @@ namespace ts {
 
         // Return the type implied by an object binding pattern
         function getTypeFromObjectBindingPattern(pattern: BindingPattern, includePatternInType: boolean): Type {
-            let members: SymbolTable = {};
+            const members: SymbolTable = {};
+            let hasComputedProperties = false;
             forEach(pattern.elements, e => {
-                let flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
-                let name = e.propertyName || <Identifier>e.name;
-                let symbol = <TransientSymbol>createSymbol(flags, name.text);
+                const name = e.propertyName || <Identifier>e.name;
+                if (isComputedNonLiteralName(name)) {
+                    // do not include computed properties in the implied type
+                    hasComputedProperties = true;
+                    return;
+                }
+
+                const text = getTextOfPropertyName(name);
+                const flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
+                const symbol = <TransientSymbol>createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType);
                 symbol.bindingElement = e;
                 members[symbol.name] = symbol;
             });
-            let result = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined);
+            const result = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined);
             if (includePatternInType) {
                 result.pattern = pattern;
             }
+            if (hasComputedProperties) {
+                result.flags |= TypeFlags.ObjectLiteralPatternWithComputedProperties;
+            }
             return result;
         }
 
         // Return the type implied by an array binding pattern
         function getTypeFromArrayBindingPattern(pattern: BindingPattern, includePatternInType: boolean): Type {
-            let elements = pattern.elements;
+            const elements = pattern.elements;
             if (elements.length === 0 || elements[elements.length - 1].dotDotDotToken) {
                 return languageVersion >= ScriptTarget.ES6 ? createIterableType(anyType) : anyArrayType;
             }
             // If the pattern has at least one element, and no rest element, then it should imply a tuple type.
-            let elementTypes = map(elements, e => e.kind === SyntaxKind.OmittedExpression ? anyType : getTypeFromBindingElement(e, includePatternInType));
+            const elementTypes = map(elements, e => e.kind === SyntaxKind.OmittedExpression ? anyType : getTypeFromBindingElement(e, includePatternInType));
             if (includePatternInType) {
-                let result = createNewTupleType(elementTypes);
+                const result = createNewTupleType(elementTypes);
                 result.pattern = pattern;
                 return result;
             }
@@ -2541,7 +2624,7 @@ namespace ts {
 
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && compilerOptions.noImplicitAny) {
-                let root = getRootDeclaration(declaration);
+                const root = getRootDeclaration(declaration);
                 if (!isPrivateWithinAmbient(root) && !(root.kind === SyntaxKind.Parameter && isPrivateWithinAmbient(root.parent))) {
                     reportImplicitAnyError(declaration, type);
                 }
@@ -2550,14 +2633,14 @@ namespace ts {
         }
 
         function getTypeOfVariableOrParameterOrProperty(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.type) {
                 // Handle prototype property
                 if (symbol.flags & SymbolFlags.Prototype) {
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 // Handle catch clause variables
-                let declaration = symbol.valueDeclaration;
+                const declaration = symbol.valueDeclaration;
                 if (declaration.parent.kind === SyntaxKind.CatchClause) {
                     return links.type = anyType;
                 }
@@ -2565,6 +2648,14 @@ namespace ts {
                 if (declaration.kind === SyntaxKind.ExportAssignment) {
                     return links.type = checkExpression((<ExportAssignment>declaration).expression);
                 }
+                // Handle module.exports = expr
+                if (declaration.kind === SyntaxKind.BinaryExpression) {
+                    return links.type = checkExpression((<BinaryExpression>declaration).right);
+                }
+                // Handle exports.p = expr
+                if (declaration.kind === SyntaxKind.PropertyAccessExpression) {
+                    return checkExpressionCached((<BinaryExpression>declaration.parent).right);
+                }
                 // Handle variable, parameter or property
                 if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) {
                     return unknownType;
@@ -2597,7 +2688,7 @@ namespace ts {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
-                    let setterTypeAnnotation = getSetAccessorTypeAnnotationNode(accessor);
+                    const setterTypeAnnotation = getSetAccessorTypeAnnotationNode(accessor);
                     return setterTypeAnnotation && getTypeFromTypeNode(setterTypeAnnotation);
                 }
             }
@@ -2605,22 +2696,22 @@ namespace ts {
         }
 
         function getTypeOfAccessors(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.type) {
                 if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) {
                     return unknownType;
                 }
-                let getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
-                let setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
+                const getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
+                const setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
                 let type: Type;
                 // First try to see if the user specified a return type on the get-accessor.
-                let getterReturnType = getAnnotatedAccessorType(getter);
+                const getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
                     type = getterReturnType;
                 }
                 else {
                     // If the user didn't specify a return type, try to use the set-accessor's parameter type.
-                    let setterParameterType = getAnnotatedAccessorType(setter);
+                    const setterParameterType = getAnnotatedAccessorType(setter);
                     if (setterParameterType) {
                         type = setterParameterType;
                     }
@@ -2641,7 +2732,7 @@ namespace ts {
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        let getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
+                        const getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
                         error(getter, Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
                 }
@@ -2651,7 +2742,7 @@ namespace ts {
         }
 
         function getTypeOfFuncClassEnumModule(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = createObjectType(TypeFlags.Anonymous, symbol);
             }
@@ -2659,7 +2750,7 @@ namespace ts {
         }
 
         function getTypeOfEnumMember(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
             }
@@ -2667,9 +2758,9 @@ namespace ts {
         }
 
         function getTypeOfAlias(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.type) {
-                let targetSymbol = resolveAlias(symbol);
+                const targetSymbol = resolveAlias(symbol);
 
                 // It only makes sense to get the type of a value symbol. If the result of resolving
                 // the alias is not a value, then it has no type. To get the type associated with a
@@ -2684,7 +2775,7 @@ namespace ts {
         }
 
         function getTypeOfInstantiatedSymbol(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = instantiateType(getTypeOfSymbol(links.target), links.mapper);
             }
@@ -2720,7 +2811,7 @@ namespace ts {
         function hasBaseType(type: InterfaceType, checkBase: InterfaceType) {
             return check(type);
             function check(type: InterfaceType): boolean {
-                let target = <InterfaceType>getTargetType(type);
+                const target = <InterfaceType>getTargetType(type);
                 return target === checkBase || forEach(getBaseTypes(target), check);
             }
         }
@@ -2729,8 +2820,8 @@ namespace ts {
         // The function allocates a new array if the input type parameter set is undefined, but otherwise it modifies the set
         // in-place and returns the same array.
         function appendTypeParameters(typeParameters: TypeParameter[], declarations: TypeParameterDeclaration[]): TypeParameter[] {
-            for (let declaration of declarations) {
-                let tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
+            for (const declaration of declarations) {
+                const tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
                 if (!typeParameters) {
                     typeParameters = [tp];
                 }
@@ -2753,7 +2844,7 @@ namespace ts {
                 if (node.kind === SyntaxKind.ClassDeclaration || node.kind === SyntaxKind.ClassExpression ||
                     node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression ||
                     node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.ArrowFunction) {
-                    let declarations = (<ClassLikeDeclaration | FunctionLikeDeclaration>node).typeParameters;
+                    const declarations = (<ClassLikeDeclaration | FunctionLikeDeclaration>node).typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
                     }
@@ -2763,7 +2854,7 @@ namespace ts {
 
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol: Symbol): TypeParameter[] {
-            let declaration = symbol.flags & SymbolFlags.Class ? symbol.valueDeclaration : getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
+            const declaration = symbol.flags & SymbolFlags.Class ? symbol.valueDeclaration : getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
             return appendOuterTypeParameters(undefined, declaration);
         }
 
@@ -2771,10 +2862,10 @@ namespace ts {
         // interface, or type alias.
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol: Symbol): TypeParameter[] {
             let result: TypeParameter[];
-            for (let node of symbol.declarations) {
+            for (const node of symbol.declarations) {
                 if (node.kind === SyntaxKind.InterfaceDeclaration || node.kind === SyntaxKind.ClassDeclaration ||
                     node.kind === SyntaxKind.ClassExpression || node.kind === SyntaxKind.TypeAliasDeclaration) {
-                    let declaration = <InterfaceDeclaration | TypeAliasDeclaration>node;
+                    const declaration = <InterfaceDeclaration | TypeAliasDeclaration>node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
                     }
@@ -2798,7 +2889,7 @@ namespace ts {
         }
 
         function getConstructorsForTypeArguments(type: ObjectType, typeArgumentNodes: TypeNode[]): Signature[] {
-            let typeArgCount = typeArgumentNodes ? typeArgumentNodes.length : 0;
+            const typeArgCount = typeArgumentNodes ? typeArgumentNodes.length : 0;
             return filter(getSignaturesOfType(type, SignatureKind.Construct),
                 sig => (sig.typeParameters ? sig.typeParameters.length : 0) === typeArgCount);
         }
@@ -2806,7 +2897,7 @@ namespace ts {
         function getInstantiatedConstructorsForTypeArguments(type: ObjectType, typeArgumentNodes: TypeNode[]): Signature[] {
             let signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                let typeArguments = map(typeArgumentNodes, getTypeFromTypeNode);
+                const typeArguments = map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = map(signatures, sig => getSignatureInstantiation(sig, typeArguments));
             }
             return signatures;
@@ -2819,14 +2910,14 @@ namespace ts {
         // an object type with at least one construct signature.
         function getBaseConstructorTypeOfClass(type: InterfaceType): ObjectType {
             if (!type.resolvedBaseConstructorType) {
-                let baseTypeNode = getBaseTypeNodeOfClass(type);
+                const baseTypeNode = getBaseTypeNodeOfClass(type);
                 if (!baseTypeNode) {
                     return type.resolvedBaseConstructorType = undefinedType;
                 }
                 if (!pushTypeResolution(type, TypeSystemPropertyName.ResolvedBaseConstructorType)) {
                     return unknownType;
                 }
-                let baseConstructorType = checkExpression(baseTypeNode.expression);
+                const baseConstructorType = checkExpression(baseTypeNode.expression);
                 if (baseConstructorType.flags & TypeFlags.ObjectType) {
                     // Resolving the members of a class requires us to resolve the base class of that class.
                     // We force resolution here such that we catch circularities now.
@@ -2845,40 +2936,48 @@ namespace ts {
             return type.resolvedBaseConstructorType;
         }
 
+        function hasClassBaseType(type: InterfaceType): boolean {
+            return !!forEach(getBaseTypes(type), t => !!(t.symbol.flags & SymbolFlags.Class));
+        }
+
         function getBaseTypes(type: InterfaceType): ObjectType[] {
+            const isClass = type.symbol.flags & SymbolFlags.Class;
+            const isInterface = type.symbol.flags & SymbolFlags.Interface;
             if (!type.resolvedBaseTypes) {
-                if (type.symbol.flags & SymbolFlags.Class) {
+                if (!isClass && !isInterface) {
+                    Debug.fail("type must be class or interface");
+                }
+                if (isClass) {
                     resolveBaseTypesOfClass(type);
                 }
-                else if (type.symbol.flags & SymbolFlags.Interface) {
+                if (isInterface) {
                     resolveBaseTypesOfInterface(type);
                 }
-                else {
-                    Debug.fail("type must be class or interface");
-                }
             }
             return type.resolvedBaseTypes;
         }
 
         function resolveBaseTypesOfClass(type: InterfaceType): void {
-            type.resolvedBaseTypes = emptyArray;
-            let baseContructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseContructorType.flags & TypeFlags.ObjectType)) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
+            const baseConstructorType = getBaseConstructorTypeOfClass(type);
+            if (!(baseConstructorType.flags & TypeFlags.ObjectType)) {
                 return;
             }
-            let baseTypeNode = getBaseTypeNodeOfClass(type);
+            const baseTypeNode = getBaseTypeNodeOfClass(type);
             let baseType: Type;
-            if (baseContructorType.symbol && baseContructorType.symbol.flags & SymbolFlags.Class) {
-                // When base constructor type is a class we know that the constructors all have the same type parameters as the
+            const originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined;
+            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & SymbolFlags.Class &&
+                areAllOuterTypeParametersApplied(originalBaseType)) {
+                // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the
                 // class and all return the instance type of the class. There is no need for further checks and we can apply the
                 // type arguments in the same manner as a type reference to get the same error reporting experience.
-                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol);
+                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol);
             }
             else {
                 // The class derives from a "class-like" constructor function, check that we have at least one construct signature
                 // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere
                 // we check that all instantiated signatures return the same type.
-                let constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments);
+                const constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments);
                 if (!constructors.length) {
                     error(baseTypeNode.expression, Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
                     return;
@@ -2897,19 +2996,41 @@ namespace ts {
                     typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
                 return;
             }
-            type.resolvedBaseTypes = [baseType];
+            if (type.resolvedBaseTypes === emptyArray) {
+                type.resolvedBaseTypes = [baseType];
+            }
+            else {
+                type.resolvedBaseTypes.push(baseType);
+            }
+        }
+
+        function areAllOuterTypeParametersApplied(type: Type): boolean {
+            // An unapplied type parameter has its symbol still the same as the matching argument symbol.
+            // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked.
+            const outerTypeParameters = (<InterfaceType>type).outerTypeParameters;
+            if (outerTypeParameters) {
+                const last = outerTypeParameters.length - 1;
+                const typeArguments = (<TypeReference>type).typeArguments;
+                return outerTypeParameters[last].symbol !== typeArguments[last].symbol;
+            }
+            return true;
         }
 
         function resolveBaseTypesOfInterface(type: InterfaceType): void {
-            type.resolvedBaseTypes = [];
-            for (let declaration of type.symbol.declarations) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
+            for (const declaration of type.symbol.declarations) {
                 if (declaration.kind === SyntaxKind.InterfaceDeclaration && getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
-                    for (let node of getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
-                        let baseType = getTypeFromTypeNode(node);
+                    for (const node of getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
+                        const baseType = getTypeFromTypeNode(node);
                         if (baseType !== unknownType) {
                             if (getTargetType(baseType).flags & (TypeFlags.Class | TypeFlags.Interface)) {
                                 if (type !== baseType && !hasBaseType(<InterfaceType>baseType, type)) {
-                                    type.resolvedBaseTypes.push(baseType);
+                                    if (type.resolvedBaseTypes === emptyArray) {
+                                        type.resolvedBaseTypes = [baseType];
+                                    }
+                                    else {
+                                        type.resolvedBaseTypes.push(baseType);
+                                    }
                                 }
                                 else {
                                     error(declaration, Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
@@ -2928,16 +3049,16 @@ namespace ts {
         // true if the interface itself contains no references to "this" in its body, if all base types are interfaces,
         // and if none of the base interfaces have a "this" type.
         function isIndependentInterface(symbol: Symbol): boolean {
-            for (let declaration of symbol.declarations) {
+            for (const declaration of symbol.declarations) {
                 if (declaration.kind === SyntaxKind.InterfaceDeclaration) {
                     if (declaration.flags & NodeFlags.ContainsThis) {
                         return false;
                     }
-                    let baseTypeNodes = getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration);
+                    const baseTypeNodes = getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration);
                     if (baseTypeNodes) {
-                        for (let node of baseTypeNodes) {
+                        for (const node of baseTypeNodes) {
                             if (isSupportedExpressionWithTypeArguments(node)) {
-                                let baseSymbol = resolveEntityName(node.expression, SymbolFlags.Type, /*ignoreErrors*/ true);
+                                const baseSymbol = resolveEntityName(node.expression, SymbolFlags.Type, /*ignoreErrors*/ true);
                                 if (!baseSymbol || !(baseSymbol.flags & SymbolFlags.Interface) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
                                     return false;
                                 }
@@ -2950,12 +3071,12 @@ namespace ts {
         }
 
         function getDeclaredTypeOfClassOrInterface(symbol: Symbol): InterfaceType {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                let kind = symbol.flags & SymbolFlags.Class ? TypeFlags.Class : TypeFlags.Interface;
-                let type = links.declaredType = <InterfaceType>createObjectType(kind, symbol);
-                let outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
-                let localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
+                const kind = symbol.flags & SymbolFlags.Class ? TypeFlags.Class : TypeFlags.Interface;
+                const type = links.declaredType = <InterfaceType>createObjectType(kind, symbol);
+                const outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
+                const localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                 // A class or interface is generic if it has type parameters or a "this" type. We always give classes a "this" type
                 // because it is not feasible to analyze all members to determine if the "this" type escapes the class (in particular,
                 // property types inferred from initializers and method return types inferred from return statements are very hard
@@ -2972,21 +3093,21 @@ namespace ts {
                     (<GenericType>type).typeArguments = type.typeParameters;
                     type.thisType = <TypeParameter>createType(TypeFlags.TypeParameter | TypeFlags.ThisType);
                     type.thisType.symbol = symbol;
-                    type.thisType.constraint = getTypeWithThisArgument(type);
+                    type.thisType.constraint = type;
                 }
             }
             return <InterfaceType>links.declaredType;
         }
 
         function getDeclaredTypeOfTypeAlias(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 // Note that we use the links object as the target here because the symbol object is used as the unique
                 // identity for resolution of the 'type' property in SymbolLinks.
                 if (!pushTypeResolution(symbol, TypeSystemPropertyName.DeclaredType)) {
                     return unknownType;
                 }
-                let declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
+                const declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
                 let type = getTypeFromTypeNode(declaration.type);
                 if (popTypeResolution()) {
                     links.typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -3007,9 +3128,9 @@ namespace ts {
         }
 
         function getDeclaredTypeOfEnum(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                let type = createType(TypeFlags.Enum);
+                const type = createType(TypeFlags.Enum);
                 type.symbol = symbol;
                 links.declaredType = type;
             }
@@ -3017,9 +3138,9 @@ namespace ts {
         }
 
         function getDeclaredTypeOfTypeParameter(symbol: Symbol): TypeParameter {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                let type = <TypeParameter>createType(TypeFlags.TypeParameter);
+                const type = <TypeParameter>createType(TypeFlags.TypeParameter);
                 type.symbol = symbol;
                 if (!(<TypeParameterDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter)).constraint) {
                     type.constraint = noConstraintType;
@@ -3030,7 +3151,7 @@ namespace ts {
         }
 
         function getDeclaredTypeOfAlias(symbol: Symbol): Type {
-            let links = getSymbolLinks(symbol);
+            const links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol));
             }
@@ -3060,7 +3181,7 @@ namespace ts {
         // A type reference is considered independent if each type argument is considered independent.
         function isIndependentTypeReference(node: TypeReferenceNode): boolean {
             if (node.typeArguments) {
-                for (let typeNode of node.typeArguments) {
+                for (const typeNode of node.typeArguments) {
                     if (!isIndependentType(typeNode)) {
                         return false;
                     }
@@ -3102,7 +3223,7 @@ namespace ts {
             if (node.kind !== SyntaxKind.Constructor && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
-            for (let parameter of node.parameters) {
+            for (const parameter of node.parameters) {
                 if (!isIndependentVariableLikeDeclaration(parameter)) {
                     return false;
                 }
@@ -3117,7 +3238,7 @@ namespace ts {
         // assumed not to be free of "this" references.
         function isIndependentMember(symbol: Symbol): boolean {
             if (symbol.declarations && symbol.declarations.length === 1) {
-                let declaration = symbol.declarations[0];
+                const declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
                         case SyntaxKind.PropertyDeclaration:
@@ -3134,8 +3255,8 @@ namespace ts {
         }
 
         function createSymbolTable(symbols: Symbol[]): SymbolTable {
-            let result: SymbolTable = {};
-            for (let symbol of symbols) {
+            const result: SymbolTable = {};
+            for (const symbol of symbols) {
                 result[symbol.name] = symbol;
             }
             return result;
@@ -3144,15 +3265,15 @@ namespace ts {
         // The mappingThisOnly flag indicates that the only type parameter being mapped is "this". When the flag is true,
         // we check symbols to see if we can quickly conclude they are free of "this" references, thus needing no instantiation.
         function createInstantiatedSymbolTable(symbols: Symbol[], mapper: TypeMapper, mappingThisOnly: boolean): SymbolTable {
-            let result: SymbolTable = {};
-            for (let symbol of symbols) {
+            const result: SymbolTable = {};
+            for (const symbol of symbols) {
                 result[symbol.name] = mappingThisOnly && isIndependentMember(symbol) ? symbol : instantiateSymbol(symbol, mapper);
             }
             return result;
         }
 
         function addInheritedMembers(symbols: SymbolTable, baseSymbols: Symbol[]) {
-            for (let s of baseSymbols) {
+            for (const s of baseSymbols) {
                 if (!hasProperty(symbols, s.name)) {
                     symbols[s.name] = s;
                 }
@@ -3161,7 +3282,7 @@ namespace ts {
 
         function addInheritedSignatures(signatures: Signature[], baseSignatures: Signature[]) {
             if (baseSignatures) {
-                for (let signature of baseSignatures) {
+                for (const signature of baseSignatures) {
                     signatures.push(signature);
                 }
             }
@@ -3169,7 +3290,7 @@ namespace ts {
 
         function resolveDeclaredMembers(type: InterfaceType): InterfaceTypeWithDeclaredMembers {
             if (!(<InterfaceTypeWithDeclaredMembers>type).declaredProperties) {
-                let symbol = type.symbol;
+                const symbol = type.symbol;
                 (<InterfaceTypeWithDeclaredMembers>type).declaredProperties = getNamedMembers(symbol.members);
                 (<InterfaceTypeWithDeclaredMembers>type).declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]);
                 (<InterfaceTypeWithDeclaredMembers>type).declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]);
@@ -3202,14 +3323,14 @@ namespace ts {
                 stringIndexType = instantiateType(source.declaredStringIndexType, mapper);
                 numberIndexType = instantiateType(source.declaredNumberIndexType, mapper);
             }
-            let baseTypes = getBaseTypes(source);
+            const baseTypes = getBaseTypes(source);
             if (baseTypes.length) {
                 if (members === source.symbol.members) {
                     members = createSymbolTable(source.declaredProperties);
                 }
-                let thisArgument = lastOrUndefined(typeArguments);
-                for (let baseType of baseTypes) {
-                    let instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
+                const thisArgument = lastOrUndefined(typeArguments);
+                for (const baseType of baseTypes) {
+                    const instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Call));
                     constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Construct));
@@ -3225,16 +3346,16 @@ namespace ts {
         }
 
         function resolveTypeReferenceMembers(type: TypeReference): void {
-            let source = resolveDeclaredMembers(type.target);
-            let typeParameters = concatenate(source.typeParameters, [source.thisType]);
-            let typeArguments = type.typeArguments && type.typeArguments.length === typeParameters.length ?
+            const source = resolveDeclaredMembers(type.target);
+            const typeParameters = concatenate(source.typeParameters, [source.thisType]);
+            const typeArguments = type.typeArguments && type.typeArguments.length === typeParameters.length ?
                 type.typeArguments : concatenate(type.typeArguments, [type]);
             resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
         }
 
         function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[],
             resolvedReturnType: Type, typePredicate: TypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature {
-            let sig = new Signature(checker);
+            const sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
@@ -3252,19 +3373,19 @@ namespace ts {
         }
 
         function getDefaultConstructSignatures(classType: InterfaceType): Signature[] {
-            if (!getBaseTypes(classType).length) {
-                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)];
+            if (!hasClassBaseType(classType)) {
+                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
             }
-            let baseConstructorType = getBaseConstructorTypeOfClass(classType);
-            let baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct);
-            let baseTypeNode = getBaseTypeNodeOfClass(classType);
-            let typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNode);
-            let typeArgCount = typeArguments ? typeArguments.length : 0;
-            let result: Signature[] = [];
-            for (let baseSig of baseSignatures) {
-                let typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
+            const baseConstructorType = getBaseConstructorTypeOfClass(classType);
+            const baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct);
+            const baseTypeNode = getBaseTypeNodeOfClass(classType);
+            const typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNode);
+            const typeArgCount = typeArguments ? typeArguments.length : 0;
+            const result: Signature[] = [];
+            for (const baseSig of baseSignatures) {
+                const typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    let sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    const sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -3274,9 +3395,9 @@ namespace ts {
         }
 
         function createTupleTypeMemberSymbols(memberTypes: Type[]): SymbolTable {
-            let members: SymbolTable = {};
+            const members: SymbolTable = {};
             for (let i = 0; i < memberTypes.length; i++) {
-                let symbol = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i);
+                const symbol = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i);
                 symbol.type = memberTypes[i];
                 members[i] = symbol;
             }
@@ -3284,16 +3405,16 @@ namespace ts {
         }
 
         function resolveTupleTypeMembers(type: TupleType) {
-            let arrayElementType = getUnionType(type.elementTypes, /*noSubtypeReduction*/ true);
+            const arrayElementType = getUnionType(type.elementTypes, /*noSubtypeReduction*/ true);
             // Make the tuple type itself the 'this' type by including an extra type argument
-            let arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
-            let members = createTupleTypeMemberSymbols(type.elementTypes);
+            const arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
+            const members = createTupleTypeMemberSymbols(type.elementTypes);
             addInheritedMembers(members, arrayType.properties);
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
         }
 
         function findMatchingSignature(signatureList: Signature[], signature: Signature, partialMatch: boolean, ignoreReturnTypes: boolean): Signature {
-            for (let s of signatureList) {
+            for (const s of signatureList) {
                 if (compareSignatures(s, signature, partialMatch, ignoreReturnTypes, compareTypes)) {
                     return s;
                 }
@@ -3317,7 +3438,7 @@ namespace ts {
             let result: Signature[] = undefined;
             for (let i = 0; i < signatureLists.length; i++) {
                 // Allow matching non-generic signatures to have excess parameters and different return types
-                let match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreReturnTypes*/ true);
+                const match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreReturnTypes*/ true);
                 if (!match) {
                     return undefined;
                 }
@@ -3333,13 +3454,13 @@ namespace ts {
         // parameters and may differ in return types. When signatures differ in return types, the resulting return
         // type is the union of the constituent return types.
         function getUnionSignatures(types: Type[], kind: SignatureKind): Signature[] {
-            let signatureLists = map(types, t => getSignaturesOfType(t, kind));
+            const signatureLists = map(types, t => getSignaturesOfType(t, kind));
             let result: Signature[] = undefined;
             for (let i = 0; i < signatureLists.length; i++) {
-                for (let signature of signatureLists[i]) {
+                for (const signature of signatureLists[i]) {
                     // Only process signatures with parameter lists that aren't already in the result list
                     if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true)) {
-                        let unionSignatures = findMatchingSignatures(signatureLists, signature, i);
+                        const unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             let s = signature;
                             // Union the result types when more than one signature matches
@@ -3358,9 +3479,9 @@ namespace ts {
         }
 
         function getUnionIndexType(types: Type[], kind: IndexKind): Type {
-            let indexTypes: Type[] = [];
-            for (let type of types) {
-                let indexType = getIndexTypeOfType(type, kind);
+            const indexTypes: Type[] = [];
+            for (const type of types) {
+                const indexType = getIndexTypeOfType(type, kind);
                 if (!indexType) {
                     return undefined;
                 }
@@ -3372,10 +3493,10 @@ namespace ts {
         function resolveUnionTypeMembers(type: UnionType) {
             // The members and properties collections are empty for union types. To get all properties of a union
             // type use getPropertiesOfType (only the language service uses this).
-            let callSignatures = getUnionSignatures(type.types, SignatureKind.Call);
-            let constructSignatures = getUnionSignatures(type.types, SignatureKind.Construct);
-            let stringIndexType = getUnionIndexType(type.types, IndexKind.String);
-            let numberIndexType = getUnionIndexType(type.types, IndexKind.Number);
+            const callSignatures = getUnionSignatures(type.types, SignatureKind.Call);
+            const constructSignatures = getUnionSignatures(type.types, SignatureKind.Construct);
+            const stringIndexType = getUnionIndexType(type.types, IndexKind.String);
+            const numberIndexType = getUnionIndexType(type.types, IndexKind.Number);
             setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
         }
 
@@ -3390,7 +3511,7 @@ namespace ts {
             let constructSignatures: Signature[] = emptyArray;
             let stringIndexType: Type = undefined;
             let numberIndexType: Type = undefined;
-            for (let t of type.types) {
+            for (const t of type.types) {
                 callSignatures = concatenate(callSignatures, getSignaturesOfType(t, SignatureKind.Call));
                 constructSignatures = concatenate(constructSignatures, getSignaturesOfType(t, SignatureKind.Construct));
                 stringIndexType = intersectTypes(stringIndexType, getIndexTypeOfType(t, IndexKind.String));
@@ -3400,7 +3521,7 @@ namespace ts {
         }
 
         function resolveAnonymousTypeMembers(type: AnonymousType) {
-            let symbol = type.symbol;
+            const symbol = type.symbol;
             let members: SymbolTable;
             let callSignatures: Signature[];
             let constructSignatures: Signature[];
@@ -3433,12 +3554,12 @@ namespace ts {
                     callSignatures = getSignaturesOfSymbol(symbol);
                 }
                 if (symbol.flags & SymbolFlags.Class) {
-                    let classType = getDeclaredTypeOfClassOrInterface(symbol);
+                    const classType = getDeclaredTypeOfClassOrInterface(symbol);
                     constructSignatures = getSignaturesOfSymbol(symbol.members["__constructor"]);
                     if (!constructSignatures.length) {
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
-                    let baseConstructorType = getBaseConstructorTypeOfClass(classType);
+                    const baseConstructorType = getBaseConstructorTypeOfClass(classType);
                     if (baseConstructorType.flags & TypeFlags.ObjectType) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
@@ -3486,9 +3607,9 @@ namespace ts {
         // return the symbol for that property.Otherwise return undefined.
         function getPropertyOfObjectType(type: Type, name: string): Symbol {
             if (type.flags & TypeFlags.ObjectType) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 if (hasProperty(resolved.members, name)) {
-                    let symbol = resolved.members[name];
+                    const symbol = resolved.members[name];
                     if (symbolIsValue(symbol)) {
                         return symbol;
                     }
@@ -3497,8 +3618,8 @@ namespace ts {
         }
 
         function getPropertiesOfUnionOrIntersectionType(type: UnionOrIntersectionType): Symbol[] {
-            for (let current of type.types) {
-                for (let prop of getPropertiesOfType(current)) {
+            for (const current of type.types) {
+                for (const prop of getPropertiesOfType(current)) {
                     getPropertyOfUnionOrIntersectionType(type, prop.name);
                 }
                 // The properties of a union type are those that are present in all constituent types, so
@@ -3515,6 +3636,21 @@ namespace ts {
             return type.flags & TypeFlags.UnionOrIntersection ? getPropertiesOfUnionOrIntersectionType(<UnionType>type) : getPropertiesOfObjectType(type);
         }
 
+        /**
+         * The apparent type of a type parameter is the base constraint instantiated with the type parameter
+         * as the type argument for the 'this' type.
+         */
+        function getApparentTypeOfTypeParameter(type: TypeParameter) {
+            if (!type.resolvedApparentType) {
+                let constraintType = getConstraintOfTypeParameter(type);
+                while (constraintType && constraintType.flags & TypeFlags.TypeParameter) {
+                    constraintType = getConstraintOfTypeParameter(<TypeParameter>constraintType);
+                }
+                type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type);
+            }
+            return type.resolvedApparentType;
+        }
+
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
@@ -3522,12 +3658,7 @@ namespace ts {
          */
         function getApparentType(type: Type): Type {
             if (type.flags & TypeFlags.TypeParameter) {
-                do {
-                    type = getConstraintOfTypeParameter(<TypeParameter>type);
-                } while (type && type.flags & TypeFlags.TypeParameter);
-                if (!type) {
-                    type = emptyObjectType;
-                }
+                type = getApparentTypeOfTypeParameter(<TypeParameter>type);
             }
             if (type.flags & TypeFlags.StringLike) {
                 type = globalStringType;
@@ -3545,12 +3676,12 @@ namespace ts {
         }
 
         function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
-            let types = containingType.types;
+            const types = containingType.types;
             let props: Symbol[];
-            for (let current of types) {
-                let type = getApparentType(current);
+            for (const current of types) {
+                const type = getApparentType(current);
                 if (type !== unknownType) {
-                    let prop = getPropertyOfType(type, name);
+                    const prop = getPropertyOfType(type, name);
                     if (prop && !(getDeclarationFlagsFromSymbol(prop) & (NodeFlags.Private | NodeFlags.Protected))) {
                         if (!props) {
                             props = [prop];
@@ -3571,15 +3702,15 @@ namespace ts {
             if (props.length === 1) {
                 return props[0];
             }
-            let propTypes: Type[] = [];
-            let declarations: Declaration[] = [];
-            for (let prop of props) {
+            const propTypes: Type[] = [];
+            const declarations: Declaration[] = [];
+            for (const prop of props) {
                 if (prop.declarations) {
                     addRange(declarations, prop.declarations);
                 }
                 propTypes.push(getTypeOfSymbol(prop));
             }
-            let result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty, name);
+            const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty, name);
             result.containingType = containingType;
             result.declarations = declarations;
             result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
@@ -3587,11 +3718,11 @@ namespace ts {
         }
 
         function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: string): Symbol {
-            let properties = type.resolvedProperties || (type.resolvedProperties = {});
+            const properties = type.resolvedProperties || (type.resolvedProperties = {});
             if (hasProperty(properties, name)) {
                 return properties[name];
             }
-            let property = createUnionOrIntersectionProperty(type, name);
+            const property = createUnionOrIntersectionProperty(type, name);
             if (property) {
                 properties[name] = property;
             }
@@ -3604,15 +3735,15 @@ namespace ts {
         function getPropertyOfType(type: Type, name: string): Symbol {
             type = getApparentType(type);
             if (type.flags & TypeFlags.ObjectType) {
-                let resolved = resolveStructuredTypeMembers(type);
+                const resolved = resolveStructuredTypeMembers(type);
                 if (hasProperty(resolved.members, name)) {
-                    let symbol = resolved.members[name];
+                    const symbol = resolved.members[name];
                     if (symbolIsValue(symbol)) {
                         return symbol;
                     }
                 }
                 if (resolved === anyFunctionType || resolved.callSignatures.length || resolved.constructSignatures.length) {
-                    let symbol = getPropertyOfObjectType(globalFunctionType, name);
+                    const symbol = getPropertyOfObjectType(globalFunctionType, name);
                     if (symbol) {
                         return symbol;
                     }
@@ -3627,7 +3758,7 @@ namespace ts {
 
         function getSignaturesOfStructuredType(type: Type, kind: SignatureKind): Signature[] {
             if (type.flags & TypeFlags.StructuredType) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 return kind === SignatureKind.Call ? resolved.callSignatures : resolved.constructSignatures;
             }
             return emptyArray;
@@ -3642,18 +3773,18 @@ namespace ts {
         }
 
         function typeHasConstructSignatures(type: Type): boolean {
-            let apparentType = getApparentType(type);
+            const apparentType = getApparentType(type);
             if (apparentType.flags & (TypeFlags.ObjectType | TypeFlags.Union)) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 return resolved.constructSignatures.length > 0;
             }
             return false;
         }
 
         function typeHasCallOrConstructSignatures(type: Type): boolean {
-            let apparentType = getApparentType(type);
+            const apparentType = getApparentType(type);
             if (apparentType.flags & TypeFlags.StructuredType) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 return resolved.callSignatures.length > 0 || resolved.constructSignatures.length > 0;
             }
             return false;
@@ -3661,7 +3792,7 @@ namespace ts {
 
         function getIndexTypeOfStructuredType(type: Type, kind: IndexKind): Type {
             if (type.flags & TypeFlags.StructuredType) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 return kind === IndexKind.String ? resolved.stringIndexType : resolved.numberIndexType;
             }
         }
@@ -3675,9 +3806,9 @@ namespace ts {
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
         // type checking functions).
         function getTypeParametersFromDeclaration(typeParameterDeclarations: TypeParameterDeclaration[]): TypeParameter[] {
-            let result: TypeParameter[] = [];
+            const result: TypeParameter[] = [];
             forEach(typeParameterDeclarations, node => {
-                let tp = getDeclaredTypeOfTypeParameter(node.symbol);
+                const tp = getDeclaredTypeOfTypeParameter(node.symbol);
                 if (!contains(result, tp)) {
                     result.push(tp);
                 }
@@ -3686,8 +3817,8 @@ namespace ts {
         }
 
         function symbolsToArray(symbols: SymbolTable): Symbol[] {
-            let result: Symbol[] = [];
-            for (let id in symbols) {
+            const result: Symbol[] = [];
+            for (const id in symbols) {
                 if (!isReservedMemberName(id)) {
                     result.push(symbols[id]);
                 }
@@ -3701,9 +3832,9 @@ namespace ts {
             }
 
             if (node.initializer) {
-                let signatureDeclaration = <SignatureDeclaration>node.parent;
-                let signature = getSignatureFromDeclaration(signatureDeclaration);
-                let parameterIndex = signatureDeclaration.parameters.indexOf(node);
+                const signatureDeclaration = <SignatureDeclaration>node.parent;
+                const signature = getSignatureFromDeclaration(signatureDeclaration);
+                const parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
                 Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
@@ -3712,19 +3843,25 @@ namespace ts {
         }
 
         function getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature {
-            let links = getNodeLinks(declaration);
+            const links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                let classType = declaration.kind === SyntaxKind.Constructor ?
+                const classType = declaration.kind === SyntaxKind.Constructor ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol((<ClassDeclaration>declaration.parent).symbol))
                     : undefined;
-                let typeParameters = classType ? classType.localTypeParameters :
+                const typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
-                let parameters: Symbol[] = [];
+                const parameters: Symbol[] = [];
                 let hasStringLiterals = false;
                 let minArgumentCount = -1;
                 for (let i = 0, n = declaration.parameters.length; i < n; i++) {
-                    let param = declaration.parameters[i];
-                    parameters.push(param.symbol);
+                    const param = declaration.parameters[i];
+                    let paramSymbol = param.symbol;
+                    // Include parameter symbol instead of property symbol in the signature
+                    if (paramSymbol && !!(paramSymbol.flags & SymbolFlags.Property) && !isBindingPattern(param.name)) {
+                        const resolvedSymbol = resolveName(param, paramSymbol.name, SymbolFlags.Value, undefined, undefined);
+                        paramSymbol = resolvedSymbol;
+                    }
+                    parameters.push(paramSymbol);
                     if (param.type && param.type.kind === SyntaxKind.StringLiteral) {
                         hasStringLiterals = true;
                     }
@@ -3752,7 +3889,7 @@ namespace ts {
                 else if (declaration.type) {
                     returnType = getTypeFromTypeNode(declaration.type);
                     if (declaration.type.kind === SyntaxKind.TypePredicate) {
-                        let typePredicateNode = <TypePredicateNode>declaration.type;
+                        const typePredicateNode = <TypePredicateNode>declaration.type;
                         typePredicate = {
                             parameterName: typePredicateNode.parameterName ? typePredicateNode.parameterName.text : undefined,
                             parameterIndex: typePredicateNode.parameterName ? getTypePredicateParameterIndex(declaration.parameters, typePredicateNode.parameterName) : undefined,
@@ -3764,7 +3901,7 @@ namespace ts {
                     // TypeScript 1.0 spec (April 2014):
                     // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
                     if (declaration.kind === SyntaxKind.GetAccessor && !hasDynamicName(declaration)) {
-                        let setter = <AccessorDeclaration>getDeclarationOfKind(declaration.symbol, SyntaxKind.SetAccessor);
+                        const setter = <AccessorDeclaration>getDeclarationOfKind(declaration.symbol, SyntaxKind.SetAccessor);
                         returnType = getAnnotatedAccessorType(setter);
                     }
 
@@ -3781,9 +3918,9 @@ namespace ts {
 
         function getSignaturesOfSymbol(symbol: Symbol): Signature[] {
             if (!symbol) return emptyArray;
-            let result: Signature[] = [];
+            const result: Signature[] = [];
             for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-                let node = symbol.declarations[i];
+                const node = symbol.declarations[i];
                 switch (node.kind) {
                     case SyntaxKind.FunctionType:
                     case SyntaxKind.ConstructorType:
@@ -3802,7 +3939,7 @@ namespace ts {
                         // an implementation node if it has a body and the previous node is of the same kind and immediately
                         // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
                         if (i > 0 && (<FunctionLikeDeclaration>node).body) {
-                            let previous = symbol.declarations[i - 1];
+                            const previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
                                 break;
                             }
@@ -3813,6 +3950,18 @@ namespace ts {
             return result;
         }
 
+        function resolveExternalModuleTypeByLiteral(name: StringLiteral) {
+            const moduleSym = resolveExternalModuleName(name, name);
+            if (moduleSym) {
+                const resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                if (resolvedModuleSymbol) {
+                    return getTypeOfSymbol(resolvedModuleSymbol);
+                }
+            }
+
+            return anyType;
+        }
+
         function getReturnTypeOfSignature(signature: Signature): Type {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, TypeSystemPropertyName.ResolvedReturnType)) {
@@ -3831,7 +3980,7 @@ namespace ts {
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        let declaration = <Declaration>signature.declaration;
+                        const declaration = <Declaration>signature.declaration;
                         if (declaration.name) {
                             error(declaration.name, Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, declarationNameToString(declaration.name));
                         }
@@ -3847,7 +3996,7 @@ namespace ts {
 
         function getRestTypeOfSignature(signature: Signature): Type {
             if (signature.hasRestParameter) {
-                let type = getTypeOfSymbol(lastOrUndefined(signature.parameters));
+                const type = getTypeOfSymbol(lastOrUndefined(signature.parameters));
                 if (type.flags & TypeFlags.Reference && (<TypeReference>type).target === globalArrayType) {
                     return (<TypeReference>type).typeArguments[0];
                 }
@@ -3856,7 +4005,7 @@ namespace ts {
         }
 
         function getSignatureInstantiation(signature: Signature, typeArguments: Type[]): Signature {
-            return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), true);
+            return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), /*eraseTypeParameters*/ true);
         }
 
         function getErasedSignature(signature: Signature): Signature {
@@ -3866,7 +4015,7 @@ namespace ts {
                     signature.erasedSignatureCache = instantiateSignature(getErasedSignature(signature.target), signature.mapper);
                 }
                 else {
-                    signature.erasedSignatureCache = instantiateSignature(signature, createTypeEraser(signature.typeParameters), true);
+                    signature.erasedSignatureCache = instantiateSignature(signature, createTypeEraser(signature.typeParameters), /*eraseTypeParameters*/ true);
                 }
             }
             return signature.erasedSignatureCache;
@@ -3878,8 +4027,8 @@ namespace ts {
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                let isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature;
-                let type = <ResolvedType>createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature);
+                const isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature;
+                const type = <ResolvedType>createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -3895,13 +4044,13 @@ namespace ts {
         }
 
         function getIndexDeclarationOfSymbol(symbol: Symbol, kind: IndexKind): SignatureDeclaration {
-            let syntaxKind = kind === IndexKind.Number ? SyntaxKind.NumberKeyword : SyntaxKind.StringKeyword;
-            let indexSymbol = getIndexSymbol(symbol);
+            const syntaxKind = kind === IndexKind.Number ? SyntaxKind.NumberKeyword : SyntaxKind.StringKeyword;
+            const indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
-                for (let decl of indexSymbol.declarations) {
-                    let node = <SignatureDeclaration>decl;
+                for (const decl of indexSymbol.declarations) {
+                    const node = <SignatureDeclaration>decl;
                     if (node.parameters.length === 1) {
-                        let parameter = node.parameters[0];
+                        const parameter = node.parameters[0];
                         if (parameter && parameter.type && parameter.type.kind === syntaxKind) {
                             return node;
                         }
@@ -3913,7 +4062,7 @@ namespace ts {
         }
 
         function getIndexTypeOfSymbol(symbol: Symbol, kind: IndexKind): Type {
-            let declaration = getIndexDeclarationOfSymbol(symbol, kind);
+            const declaration = getIndexDeclarationOfSymbol(symbol, kind);
             return declaration
                 ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
                 : undefined;
@@ -3922,7 +4071,7 @@ namespace ts {
         function getConstraintOfTypeParameter(type: TypeParameter): Type {
             if (!type.constraint) {
                 if (type.target) {
-                    let targetConstraint = getConstraintOfTypeParameter(type.target);
+                    const targetConstraint = getConstraintOfTypeParameter(type.target);
                     type.constraint = targetConstraint ? instantiateType(targetConstraint, type.mapper) : noConstraintType;
                 }
                 else {
@@ -3963,17 +4112,17 @@ namespace ts {
         // that care about the presence of such types at arbitrary depth in a containing type.
         function getPropagatingFlagsOfTypes(types: Type[]): TypeFlags {
             let result: TypeFlags = 0;
-            for (let type of types) {
+            for (const type of types) {
                 result |= type.flags;
             }
             return result & TypeFlags.PropagatingFlags;
         }
 
         function createTypeReference(target: GenericType, typeArguments: Type[]): TypeReference {
-            let id = getTypeListId(typeArguments);
+            const id = getTypeListId(typeArguments);
             let type = target.instantiations[id];
             if (!type) {
-                let flags = TypeFlags.Reference | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
+                const flags = TypeFlags.Reference | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
                 type = target.instantiations[id] = <TypeReference>createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -3982,7 +4131,7 @@ namespace ts {
         }
 
         function isTypeParameterReferenceIllegalInConstraint(typeReferenceNode: TypeReferenceNode | ExpressionWithTypeArguments, typeParameterSymbol: Symbol): boolean {
-            let links = getNodeLinks(typeReferenceNode);
+            const links = getNodeLinks(typeReferenceNode);
             if (links.isIllegalTypeReferenceInConstraint !== undefined) {
                 return links.isIllegalTypeReferenceInConstraint;
             }
@@ -4002,9 +4151,9 @@ namespace ts {
             let typeParameterSymbol: Symbol;
             function check(n: Node): void {
                 if (n.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>n).typeName.kind === SyntaxKind.Identifier) {
-                    let links = getNodeLinks(n);
+                    const links = getNodeLinks(n);
                     if (links.isIllegalTypeReferenceInConstraint === undefined) {
-                        let symbol = resolveName(typeParameter, (<Identifier>(<TypeReferenceNode>n).typeName).text, SymbolFlags.Type, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+                        const symbol = resolveName(typeParameter, (<Identifier>(<TypeReferenceNode>n).typeName).text, SymbolFlags.Type, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                         if (symbol && (symbol.flags & SymbolFlags.TypeParameter)) {
                             // TypeScript 1.0 spec (April 2014): 3.4.1
                             // Type parameters declared in a particular type parameter list
@@ -4032,8 +4181,8 @@ namespace ts {
 
         // Get type from reference to class or interface
         function getTypeFromClassOrInterfaceReference(node: TypeReferenceNode | ExpressionWithTypeArguments, symbol: Symbol): Type {
-            let type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
-            let typeParameters = type.localTypeParameters;
+            const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
+            const typeParameters = type.localTypeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType), typeParameters.length);
@@ -4055,16 +4204,16 @@ namespace ts {
         // references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
         // declared type. Instantiations are cached using the type identities of the type arguments as the key.
         function getTypeFromTypeAliasReference(node: TypeReferenceNode | ExpressionWithTypeArguments, symbol: Symbol): Type {
-            let type = getDeclaredTypeOfSymbol(symbol);
-            let links = getSymbolLinks(symbol);
-            let typeParameters = links.typeParameters;
+            const type = getDeclaredTypeOfSymbol(symbol);
+            const links = getSymbolLinks(symbol);
+            const typeParameters = links.typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                let typeArguments = map(node.typeArguments, getTypeFromTypeNode);
-                let id = getTypeListId(typeArguments);
+                const typeArguments = map(node.typeArguments, getTypeFromTypeNode);
+                const id = getTypeListId(typeArguments);
                 return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
             }
             if (node.typeArguments) {
@@ -4091,17 +4240,17 @@ namespace ts {
         }
 
         function getTypeFromTypeReference(node: TypeReferenceNode | ExpressionWithTypeArguments): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 // We only support expressions that are simple qualified names. For other expressions this produces undefined.
-                let typeNameOrExpression = node.kind === SyntaxKind.TypeReference ? (<TypeReferenceNode>node).typeName :
+                const typeNameOrExpression = node.kind === SyntaxKind.TypeReference ? (<TypeReferenceNode>node).typeName :
                     isSupportedExpressionWithTypeArguments(<ExpressionWithTypeArguments>node) ? (<ExpressionWithTypeArguments>node).expression :
-                    undefined;
-                let symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, SymbolFlags.Type) || unknownSymbol;
-                let type = symbol === unknownSymbol ? unknownType :
+                        undefined;
+                const symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, SymbolFlags.Type) || unknownSymbol;
+                const type = symbol === unknownSymbol ? unknownType :
                     symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface) ? getTypeFromClassOrInterfaceReference(node, symbol) :
-                    symbol.flags & SymbolFlags.TypeAlias ? getTypeFromTypeAliasReference(node, symbol) :
-                    getTypeFromNonGenericTypeReference(node, symbol);
+                        symbol.flags & SymbolFlags.TypeAlias ? getTypeFromTypeAliasReference(node, symbol) :
+                            getTypeFromNonGenericTypeReference(node, symbol);
                 // Cache both the resolved symbol and the resolved type. The resolved symbol is needed in when we check the
                 // type reference in checkTypeReferenceOrExpressionWithTypeArguments.
                 links.resolvedSymbol = symbol;
@@ -4111,7 +4260,7 @@ namespace ts {
         }
 
         function getTypeFromTypeQueryNode(node: TypeQueryNode): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 // TypeScript 1.0 spec (April 2014): 3.6.3
                 // The expression is processed as an identifier expression (section 4.3)
@@ -4125,8 +4274,8 @@ namespace ts {
         function getTypeOfGlobalSymbol(symbol: Symbol, arity: number): ObjectType {
 
             function getTypeDeclaration(symbol: Symbol): Declaration {
-                let declarations = symbol.declarations;
-                for (let declaration of declarations) {
+                const declarations = symbol.declarations;
+                for (const declaration of declarations) {
                     switch (declaration.kind) {
                         case SyntaxKind.ClassDeclaration:
                         case SyntaxKind.InterfaceDeclaration:
@@ -4139,7 +4288,7 @@ namespace ts {
             if (!symbol) {
                 return arity ? emptyGenericType : emptyObjectType;
             }
-            let type = getDeclaredTypeOfSymbol(symbol);
+            const type = getDeclaredTypeOfSymbol(symbol);
             if (!(type.flags & TypeFlags.ObjectType)) {
                 error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return arity ? emptyGenericType : emptyObjectType;
@@ -4176,8 +4325,8 @@ namespace ts {
          * getExportedTypeFromNamespace('JSX', 'Element') returns the JSX.Element type
          */
         function getExportedTypeFromNamespace(namespace: string, name: string): Type {
-            let namespaceSymbol = getGlobalSymbol(namespace, SymbolFlags.Namespace, /*diagnosticMessage*/ undefined);
-            let typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, SymbolFlags.Type);
+            const namespaceSymbol = getGlobalSymbol(namespace, SymbolFlags.Namespace, /*diagnosticMessage*/ undefined);
+            const typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, SymbolFlags.Type);
             return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
         }
 
@@ -4189,7 +4338,7 @@ namespace ts {
           * Creates a TypeReference for a generic `TypedPropertyDescriptor<T>`.
           */
         function createTypedPropertyDescriptorType(propertyType: Type): Type {
-            let globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType();
+            const globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType();
             return globalTypedPropertyDescriptorType !== emptyGenericType
                 ? createTypeReference(<GenericType>globalTypedPropertyDescriptorType, [propertyType])
                 : emptyObjectType;
@@ -4215,7 +4364,7 @@ namespace ts {
         }
 
         function getTypeFromArrayTypeNode(node: ArrayTypeNode): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
             }
@@ -4223,18 +4372,18 @@ namespace ts {
         }
 
         function createTupleType(elementTypes: Type[]) {
-            let id = getTypeListId(elementTypes);
+            const id = getTypeListId(elementTypes);
             return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes));
         }
 
         function createNewTupleType(elementTypes: Type[]) {
-            let type = <TupleType>createObjectType(TypeFlags.Tuple | getPropagatingFlagsOfTypes(elementTypes));
+            const type = <TupleType>createObjectType(TypeFlags.Tuple | getPropagatingFlagsOfTypes(elementTypes));
             type.elementTypes = elementTypes;
             return type;
         }
 
         function getTypeFromTupleTypeNode(node: TupleTypeNode): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNode));
             }
@@ -4253,7 +4402,7 @@ namespace ts {
         // Add the given types to the given type set. Order is preserved, duplicates are removed,
         // and nested types of the given kind are flattened into the set.
         function addTypesToSet(typeSet: Type[], types: Type[], typeSetKind: TypeFlags) {
-            for (let type of types) {
+            for (const type of types) {
                 addTypeToSet(typeSet, type, typeSetKind);
             }
         }
@@ -4278,7 +4427,7 @@ namespace ts {
         }
 
         function containsTypeAny(types: Type[]): boolean {
-            for (let type of types) {
+            for (const type of types) {
                 if (isTypeAny(type)) {
                     return true;
                 }
@@ -4305,9 +4454,9 @@ namespace ts {
         // a named type that circularly references itself.
         function getUnionType(types: Type[], noSubtypeReduction?: boolean): Type {
             if (types.length === 0) {
-                return emptyObjectType;
+                return emptyUnionType;
             }
-            let typeSet: Type[] = [];
+            const typeSet: Type[] = [];
             addTypesToSet(typeSet, types, TypeFlags.Union);
             if (containsTypeAny(typeSet)) {
                 return anyType;
@@ -4322,7 +4471,7 @@ namespace ts {
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            let id = getTypeListId(typeSet);
+            const id = getTypeListId(typeSet);
             let type = unionTypes[id];
             if (!type) {
                 type = unionTypes[id] = <UnionType>createObjectType(TypeFlags.Union | getPropagatingFlagsOfTypes(typeSet));
@@ -4332,7 +4481,7 @@ namespace ts {
         }
 
         function getTypeFromUnionTypeNode(node: UnionTypeNode): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNode), /*noSubtypeReduction*/ true);
             }
@@ -4348,7 +4497,7 @@ namespace ts {
             if (types.length === 0) {
                 return emptyObjectType;
             }
-            let typeSet: Type[] = [];
+            const typeSet: Type[] = [];
             addTypesToSet(typeSet, types, TypeFlags.Intersection);
             if (containsTypeAny(typeSet)) {
                 return anyType;
@@ -4356,7 +4505,7 @@ namespace ts {
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            let id = getTypeListId(typeSet);
+            const id = getTypeListId(typeSet);
             let type = intersectionTypes[id];
             if (!type) {
                 type = intersectionTypes[id] = <IntersectionType>createObjectType(TypeFlags.Intersection | getPropagatingFlagsOfTypes(typeSet));
@@ -4366,7 +4515,7 @@ namespace ts {
         }
 
         function getTypeFromIntersectionTypeNode(node: IntersectionTypeNode): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = getIntersectionType(map(node.types, getTypeFromTypeNode));
             }
@@ -4374,7 +4523,7 @@ namespace ts {
         }
 
         function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 // Deferred resolution of members is handled by resolveObjectTypeMembers
                 links.resolvedType = createObjectType(TypeFlags.Anonymous, node.symbol);
@@ -4383,17 +4532,18 @@ namespace ts {
         }
 
         function getStringLiteralType(node: StringLiteral): StringLiteralType {
-            if (hasProperty(stringLiteralTypes, node.text)) {
-                return stringLiteralTypes[node.text];
+            const text = node.text;
+            if (hasProperty(stringLiteralTypes, text)) {
+                return stringLiteralTypes[text];
             }
 
-            let type = stringLiteralTypes[node.text] = <StringLiteralType>createType(TypeFlags.StringLiteral);
-            type.text = getTextOfNode(node);
+            const type = stringLiteralTypes[text] = <StringLiteralType>createType(TypeFlags.StringLiteral);
+            type.text = text;
             return type;
         }
 
         function getTypeFromStringLiteral(node: StringLiteral): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = getStringLiteralType(node);
             }
@@ -4401,10 +4551,11 @@ namespace ts {
         }
 
         function getThisType(node: TypeNode): Type {
-            let container = getThisContainer(node, /*includeArrowFunctions*/ false);
-            let parent = container && container.parent;
+            const container = getThisContainer(node, /*includeArrowFunctions*/ false);
+            const parent = container && container.parent;
             if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) {
-                if (!(container.flags & NodeFlags.Static)) {
+                if (!(container.flags & NodeFlags.Static) &&
+                    (container.kind !== SyntaxKind.Constructor || isNodeDescendentOf(node, (<ConstructorDeclaration>container).body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -4413,7 +4564,7 @@ namespace ts {
         }
 
         function getTypeFromThisTypeNode(node: TypeNode): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = getThisType(node);
             }
@@ -4464,7 +4615,7 @@ namespace ts {
                 // Callers should first ensure this by calling isTypeNode
                 case SyntaxKind.Identifier:
                 case SyntaxKind.QualifiedName:
-                    let symbol = getSymbolAtLocation(node);
+                    const symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
                 default:
                     return unknownType;
@@ -4473,8 +4624,8 @@ namespace ts {
 
         function instantiateList<T>(items: T[], mapper: TypeMapper, instantiator: (item: T, mapper: TypeMapper) => T): T[] {
             if (items && items.length) {
-                let result: T[] = [];
-                for (let v of items) {
+                const result: T[] = [];
+                for (const v of items) {
                     result.push(instantiator(v, mapper));
                 }
                 return result;
@@ -4519,7 +4670,7 @@ namespace ts {
                 case 2: return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return t => {
-                for (let source of sources) {
+                for (const source of sources) {
                     if (t === source) {
                         return anyType;
                     }
@@ -4529,7 +4680,7 @@ namespace ts {
         }
 
         function createInferenceMapper(context: InferenceContext): TypeMapper {
-            let mapper: TypeMapper = t => {
+            const mapper: TypeMapper = t => {
                 for (let i = 0; i < context.typeParameters.length; i++) {
                     if (t === context.typeParameters[i]) {
                         context.inferences[i].isFixed = true;
@@ -4552,7 +4703,7 @@ namespace ts {
         }
 
         function instantiateTypeParameter(typeParameter: TypeParameter, mapper: TypeMapper): TypeParameter {
-            let result = <TypeParameter>createType(TypeFlags.TypeParameter);
+            const result = <TypeParameter>createType(TypeFlags.TypeParameter);
             result.symbol = typeParameter.symbol;
             if (typeParameter.constraint) {
                 result.constraint = instantiateType(typeParameter.constraint, mapper);
@@ -4578,7 +4729,7 @@ namespace ts {
                     type: instantiateType(signature.typePredicate.type, mapper)
                 };
             }
-            let result = createSignature(signature.declaration, freshTypeParameters,
+            const result = createSignature(signature.declaration, freshTypeParameters,
                 instantiateList(signature.parameters, mapper, instantiateSymbol),
                 instantiateType(signature.resolvedReturnType, mapper),
                 freshTypePredicate,
@@ -4590,7 +4741,7 @@ namespace ts {
 
         function instantiateSymbol(symbol: Symbol, mapper: TypeMapper): Symbol {
             if (symbol.flags & SymbolFlags.Instantiated) {
-                let links = getSymbolLinks(symbol);
+                const links = getSymbolLinks(symbol);
                 // If symbol being instantiated is itself a instantiation, fetch the original target and combine the
                 // type mappers. This ensures that original type identities are properly preserved and that aliases
                 // always reference a non-aliases.
@@ -4600,7 +4751,7 @@ namespace ts {
 
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            let result = <TransientSymbol>createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name);
+            const result = <TransientSymbol>createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name);
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -4614,7 +4765,7 @@ namespace ts {
 
         function instantiateAnonymousType(type: AnonymousType, mapper: TypeMapper): ObjectType {
             if (mapper.instantiations) {
-                let cachedType = mapper.instantiations[type.id];
+                const cachedType = mapper.instantiations[type.id];
                 if (cachedType) {
                     return cachedType;
                 }
@@ -4623,7 +4774,7 @@ namespace ts {
                 mapper.instantiations = [];
             }
             // Mark the anonymous type as instantiated such that our infinite instantiation detection logic can recognize it
-            let result = <AnonymousType>createObjectType(TypeFlags.Anonymous | TypeFlags.Instantiated, type.symbol);
+            const result = <AnonymousType>createObjectType(TypeFlags.Anonymous | TypeFlags.Instantiated, type.symbol);
             result.target = type;
             result.mapper = mapper;
             mapper.instantiations[type.id] = result;
@@ -4691,9 +4842,9 @@ namespace ts {
 
         function getTypeWithoutSignatures(type: Type): Type {
             if (type.flags & TypeFlags.ObjectType) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 if (resolved.constructSignatures.length) {
-                    let result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
+                    const result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
@@ -4731,8 +4882,8 @@ namespace ts {
         }
 
         function isSignatureAssignableTo(source: Signature, target: Signature): boolean {
-            let sourceType = getOrCreateTypeFromSignature(source);
-            let targetType = getOrCreateTypeFromSignature(target);
+            const sourceType = getOrCreateTypeFromSignature(source);
+            const targetType = getOrCreateTypeFromSignature(target);
             return checkTypeRelatedTo(sourceType, targetType, assignableRelation, /*errorNode*/ undefined);
         }
 
@@ -4765,7 +4916,7 @@ namespace ts {
 
             Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
 
-            let result = isRelatedTo(source, target, errorNode !== undefined, headMessage);
+            const result = isRelatedTo(source, target, errorNode !== undefined, headMessage);
             if (overflow) {
                 error(errorNode, Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
             }
@@ -4839,7 +4990,7 @@ namespace ts {
                     }
                 }
 
-                let saveErrorInfo = errorInfo;
+                const saveErrorInfo = errorInfo;
 
                 // Note that the "each" checks must precede the "some" checks to produce the correct results
                 if (source.flags & TypeFlags.Union) {
@@ -4875,7 +5026,7 @@ namespace ts {
                         constraint = emptyObjectType;
                     }
                     // Report constraint errors only if the constraint is not the empty object type
-                    let reportConstraintErrors = reportErrors && constraint !== emptyObjectType;
+                    const reportConstraintErrors = reportErrors && constraint !== emptyObjectType;
                     if (result = isRelatedTo(constraint, target, reportConstraintErrors)) {
                         errorInfo = saveErrorInfo;
                         return result;
@@ -4890,13 +5041,13 @@ namespace ts {
                     }
                     // Even if relationship doesn't hold for unions, intersections, or generic type references,
                     // it may hold in a structural comparison.
-                    let apparentType = getApparentType(source);
+                    const apparentType = getApparentType(source);
                     // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
                     // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
                     // relates to X. Thus, we include intersection types on the source side here.
                     if (apparentType.flags & (TypeFlags.ObjectType | TypeFlags.Intersection) && target.flags & TypeFlags.ObjectType) {
                         // Report structural errors only if we haven't reported any errors yet
-                        let reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
+                        const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
                         if (result = objectTypeRelatedTo(apparentType, source, target, reportStructuralErrors)) {
                             errorInfo = saveErrorInfo;
                             return result;
@@ -4946,41 +5097,41 @@ namespace ts {
                         resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
                         return true;
                     }
-                    return false;
                 }
-                if (type.flags & TypeFlags.UnionOrIntersection) {
-                    for (let t of (<UnionOrIntersectionType>type).types) {
+                else if (type.flags & TypeFlags.UnionOrIntersection) {
+                    for (const t of (<UnionOrIntersectionType>type).types) {
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
                     }
-                    return false;
                 }
-                return true;
+                return false;
             }
 
             function hasExcessProperties(source: FreshObjectLiteralType, target: Type, reportErrors: boolean): boolean {
-                for (let prop of getPropertiesOfObjectType(source)) {
-                    if (!isKnownProperty(target, prop.name)) {
-                        if (reportErrors) {
-                            // We know *exactly* where things went wrong when comparing the types.
-                            // Use this property as the error node as this will be more helpful in
-                            // reasoning about what went wrong.
-                            errorNode = prop.valueDeclaration;
-                            reportError(Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
-                                        symbolToString(prop),
-                                        typeToString(target));
+                if (!(target.flags & TypeFlags.ObjectLiteralPatternWithComputedProperties) && someConstituentTypeHasKind(target, TypeFlags.ObjectType)) {
+                    for (const prop of getPropertiesOfObjectType(source)) {
+                        if (!isKnownProperty(target, prop.name)) {
+                            if (reportErrors) {
+                                // We know *exactly* where things went wrong when comparing the types.
+                                // Use this property as the error node as this will be more helpful in
+                                // reasoning about what went wrong.
+                                errorNode = prop.valueDeclaration;
+                                reportError(Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
+                                    symbolToString(prop), typeToString(target));
+                            }
+                            return true;
                         }
-                        return true;
                     }
                 }
+                return false;
             }
 
             function eachTypeRelatedToSomeType(source: UnionOrIntersectionType, target: UnionOrIntersectionType): Ternary {
                 let result = Ternary.True;
-                let sourceTypes = source.types;
-                for (let sourceType of sourceTypes) {
-                    let related = typeRelatedToSomeType(sourceType, target, false);
+                const sourceTypes = source.types;
+                for (const sourceType of sourceTypes) {
+                    const related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -4990,9 +5141,9 @@ namespace ts {
             }
 
             function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
-                let targetTypes = target.types;
+                const targetTypes = target.types;
                 for (let i = 0, len = targetTypes.length; i < len; i++) {
-                    let related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
+                    const related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
                     }
@@ -5002,9 +5153,9 @@ namespace ts {
 
             function typeRelatedToEachType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
-                let targetTypes = target.types;
-                for (let targetType of targetTypes) {
-                    let related = isRelatedTo(source, targetType, reportErrors);
+                const targetTypes = target.types;
+                for (const targetType of targetTypes) {
+                    const related = isRelatedTo(source, targetType, reportErrors);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5014,9 +5165,9 @@ namespace ts {
             }
 
             function someTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
-                let sourceTypes = source.types;
+                const sourceTypes = source.types;
                 for (let i = 0, len = sourceTypes.length; i < len; i++) {
-                    let related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
+                    const related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
                     if (related) {
                         return related;
                     }
@@ -5026,9 +5177,9 @@ namespace ts {
 
             function eachTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
-                let sourceTypes = source.types;
-                for (let sourceType of sourceTypes) {
-                    let related = isRelatedTo(sourceType, target, reportErrors);
+                const sourceTypes = source.types;
+                for (const sourceType of sourceTypes) {
+                    const related = isRelatedTo(sourceType, target, reportErrors);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5038,14 +5189,14 @@ namespace ts {
             }
 
             function typeArgumentsRelatedTo(source: TypeReference, target: TypeReference, reportErrors: boolean): Ternary {
-                let sources = source.typeArguments || emptyArray;
-                let targets = target.typeArguments || emptyArray;
+                const sources = source.typeArguments || emptyArray;
+                const targets = target.typeArguments || emptyArray;
                 if (sources.length !== targets.length && relation === identityRelation) {
                     return Ternary.False;
                 }
                 let result = Ternary.True;
                 for (let i = 0; i < targets.length; i++) {
-                    let related = isRelatedTo(sources[i], targets[i], reportErrors);
+                    const related = isRelatedTo(sources[i], targets[i], reportErrors);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5055,9 +5206,6 @@ namespace ts {
             }
 
             function typeParameterIdenticalTo(source: TypeParameter, target: TypeParameter): Ternary {
-                if (source.symbol.name !== target.symbol.name) {
-                    return Ternary.False;
-                }
                 // covers case when both type parameters does not have constraint (both equal to noConstraintType)
                 if (source.constraint === target.constraint) {
                     return Ternary.True;
@@ -5077,8 +5225,8 @@ namespace ts {
                 if (overflow) {
                     return Ternary.False;
                 }
-                let id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id;
-                let related = relation[id];
+                const id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id;
+                const related = relation[id];
                 if (related !== undefined) {
                     // If we computed this relation already and it was failed and reported, or if we're not being asked to elaborate
                     // errors, we can use the cached value. Otherwise, recompute the relation
@@ -5109,7 +5257,7 @@ namespace ts {
                 maybeStack[depth] = {};
                 maybeStack[depth][id] = RelationComparisonResult.Succeeded;
                 depth++;
-                let saveExpandingFlags = expandingFlags;
+                const saveExpandingFlags = expandingFlags;
                 if (!(expandingFlags & 1) && isDeeplyNestedGeneric(apparentSource, sourceStack, depth)) expandingFlags |= 1;
                 if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth)) expandingFlags |= 2;
                 let result: Ternary;
@@ -5134,9 +5282,9 @@ namespace ts {
                 expandingFlags = saveExpandingFlags;
                 depth--;
                 if (result) {
-                    let maybeCache = maybeStack[depth];
+                    const maybeCache = maybeStack[depth];
                     // If result is definitely true, copy assumptions to global cache, else copy to next level up
-                    let destinationCache = (result === Ternary.True || depth === 0) ? relation : maybeStack[depth - 1];
+                    const destinationCache = (result === Ternary.True || depth === 0) ? relation : maybeStack[depth - 1];
                     copyMap(maybeCache, destinationCache);
                 }
                 else {
@@ -5152,10 +5300,10 @@ namespace ts {
                     return propertiesIdenticalTo(source, target);
                 }
                 let result = Ternary.True;
-                let properties = getPropertiesOfObjectType(target);
-                let requireOptionalProperties = relation === subtypeRelation && !(source.flags & TypeFlags.ObjectLiteral);
-                for (let targetProp of properties) {
-                    let sourceProp = getPropertyOfType(source, targetProp.name);
+                const properties = getPropertiesOfObjectType(target);
+                const requireOptionalProperties = relation === subtypeRelation && !(source.flags & TypeFlags.ObjectLiteral);
+                for (const targetProp of properties) {
+                    const sourceProp = getPropertyOfType(source, targetProp.name);
 
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -5167,8 +5315,8 @@ namespace ts {
                             }
                         }
                         else if (!(targetProp.flags & SymbolFlags.Prototype)) {
-                            let sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
-                            let targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
+                            const sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
+                            const targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
                             if (sourcePropFlags & NodeFlags.Private || targetPropFlags & NodeFlags.Private) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
@@ -5185,9 +5333,9 @@ namespace ts {
                                 }
                             }
                             else if (targetPropFlags & NodeFlags.Protected) {
-                                let sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
-                                let sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
-                                let targetClass = <InterfaceType>getDeclaredTypeOfSymbol(targetProp.parent);
+                                const sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
+                                const sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
+                                const targetClass = <InterfaceType>getDeclaredTypeOfSymbol(targetProp.parent);
                                 if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
                                     if (reportErrors) {
                                         reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2,
@@ -5203,7 +5351,7 @@ namespace ts {
                                 }
                                 return Ternary.False;
                             }
-                            let related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            const related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
                             if (!related) {
                                 if (reportErrors) {
                                     reportError(Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
@@ -5235,18 +5383,18 @@ namespace ts {
                 if (!(source.flags & TypeFlags.ObjectType && target.flags & TypeFlags.ObjectType)) {
                     return Ternary.False;
                 }
-                let sourceProperties = getPropertiesOfObjectType(source);
-                let targetProperties = getPropertiesOfObjectType(target);
+                const sourceProperties = getPropertiesOfObjectType(source);
+                const targetProperties = getPropertiesOfObjectType(target);
                 if (sourceProperties.length !== targetProperties.length) {
                     return Ternary.False;
                 }
                 let result = Ternary.True;
-                for (let sourceProp of sourceProperties) {
-                    let targetProp = getPropertyOfObjectType(target, sourceProp.name);
+                for (const sourceProp of sourceProperties) {
+                    const targetProp = getPropertyOfObjectType(target, sourceProp.name);
                     if (!targetProp) {
                         return Ternary.False;
                     }
-                    let related = compareProperties(sourceProp, targetProp, isRelatedTo);
+                    const related = compareProperties(sourceProp, targetProp, isRelatedTo);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5262,10 +5410,10 @@ namespace ts {
                 if (target === anyFunctionType || source === anyFunctionType) {
                     return Ternary.True;
                 }
-                let sourceSignatures = getSignaturesOfType(source, kind);
-                let targetSignatures = getSignaturesOfType(target, kind);
+                const sourceSignatures = getSignaturesOfType(source, kind);
+                const targetSignatures = getSignaturesOfType(target, kind);
                 let result = Ternary.True;
-                let saveErrorInfo = errorInfo;
+                const saveErrorInfo = errorInfo;
 
 
 
@@ -5279,8 +5427,8 @@ namespace ts {
                     // sourceSig and targetSig are (possibly) undefined.
                     //
                     // Note that in an extends-clause, targetSignatures is stripped, so the check never proceeds.
-                    let sourceSig = sourceSignatures[0];
-                    let targetSig = targetSignatures[0];
+                    const sourceSig = sourceSignatures[0];
+                    const targetSig = targetSignatures[0];
 
                     result &= abstractSignatureRelatedTo(source, sourceSig, target, targetSig);
                     if (result !== Ternary.True) {
@@ -5288,13 +5436,13 @@ namespace ts {
                     }
                 }
 
-                outer: for (let t of targetSignatures) {
+                outer: for (const t of targetSignatures) {
                     if (!t.hasStringLiterals || target.flags & TypeFlags.FromSignature) {
                         let localErrors = reportErrors;
-                        let checkedAbstractAssignability = false;
-                        for (let s of sourceSignatures) {
+                        const checkedAbstractAssignability = false;
+                        for (const s of sourceSignatures) {
                             if (!s.hasStringLiterals || source.flags & TypeFlags.FromSignature) {
-                                let related = signatureRelatedTo(s, t, localErrors);
+                                const related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
                                     result &= related;
                                     errorInfo = saveErrorInfo;
@@ -5312,8 +5460,8 @@ namespace ts {
                 function abstractSignatureRelatedTo(source: Type, sourceSig: Signature, target: Type, targetSig: Signature) {
                     if (sourceSig && targetSig) {
 
-                        let sourceDecl = source.symbol && getClassLikeDeclarationOfSymbol(source.symbol);
-                        let targetDecl = target.symbol && getClassLikeDeclarationOfSymbol(target.symbol);
+                        const sourceDecl = source.symbol && getClassLikeDeclarationOfSymbol(source.symbol);
+                        const targetDecl = target.symbol && getClassLikeDeclarationOfSymbol(target.symbol);
 
                         if (!sourceDecl) {
                             // If the source object isn't itself a class declaration, it can be freely assigned, regardless
@@ -5321,16 +5469,16 @@ namespace ts {
                             return Ternary.True;
                         }
 
-                        let sourceErasedSignature = getErasedSignature(sourceSig);
-                        let targetErasedSignature = getErasedSignature(targetSig);
+                        const sourceErasedSignature = getErasedSignature(sourceSig);
+                        const targetErasedSignature = getErasedSignature(targetSig);
 
-                        let sourceReturnType = sourceErasedSignature && getReturnTypeOfSignature(sourceErasedSignature);
-                        let targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
+                        const sourceReturnType = sourceErasedSignature && getReturnTypeOfSignature(sourceErasedSignature);
+                        const targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
 
-                        let sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol);
-                        let targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol);
-                        let sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & NodeFlags.Abstract;
-                        let targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & NodeFlags.Abstract;
+                        const sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol);
+                        const targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol);
+                        const sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & NodeFlags.Abstract;
+                        const targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & NodeFlags.Abstract;
 
                         if (sourceIsAbstract && !(targetIsAbstract && targetDecl)) {
                             // if target isn't a class-declaration type, then it can be new'd, so we forbid the assignment.
@@ -5376,12 +5524,12 @@ namespace ts {
                 target = getErasedSignature(target);
                 let result = Ternary.True;
                 for (let i = 0; i < checkCount; i++) {
-                    let s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                    let t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                    let saveErrorInfo = errorInfo;
+                    const s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
+                    const t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
+                    const saveErrorInfo = errorInfo;
                     let related = isRelatedTo(s, t, reportErrors);
                     if (!related) {
-                        related = isRelatedTo(t, s, false);
+                        related = isRelatedTo(t, s, /*reportErrors*/ false);
                         if (!related) {
                             if (reportErrors) {
                                 reportError(Diagnostics.Types_of_parameters_0_and_1_are_incompatible,
@@ -5396,16 +5544,16 @@ namespace ts {
                 }
 
                 if (source.typePredicate && target.typePredicate) {
-                    let hasDifferentParameterIndex = source.typePredicate.parameterIndex !== target.typePredicate.parameterIndex;
+                    const hasDifferentParameterIndex = source.typePredicate.parameterIndex !== target.typePredicate.parameterIndex;
                     let hasDifferentTypes: boolean;
                     if (hasDifferentParameterIndex ||
                         (hasDifferentTypes = !isTypeIdenticalTo(source.typePredicate.type, target.typePredicate.type))) {
 
                         if (reportErrors) {
-                            let sourceParamText = source.typePredicate.parameterName;
-                            let targetParamText = target.typePredicate.parameterName;
-                            let sourceTypeText = typeToString(source.typePredicate.type);
-                            let targetTypeText = typeToString(target.typePredicate.type);
+                            const sourceParamText = source.typePredicate.parameterName;
+                            const targetParamText = target.typePredicate.parameterName;
+                            const sourceTypeText = typeToString(source.typePredicate.type);
+                            const targetTypeText = typeToString(target.typePredicate.type);
 
                             if (hasDifferentParameterIndex) {
                                 reportError(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1,
@@ -5432,22 +5580,22 @@ namespace ts {
                     return Ternary.False;
                 }
 
-                let targetReturnType = getReturnTypeOfSignature(target);
+                const targetReturnType = getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) return result;
-                let sourceReturnType = getReturnTypeOfSignature(source);
+                const sourceReturnType = getReturnTypeOfSignature(source);
 
                 return result & isRelatedTo(sourceReturnType, targetReturnType, reportErrors);
             }
 
             function signaturesIdenticalTo(source: Type, target: Type, kind: SignatureKind): Ternary {
-                let sourceSignatures = getSignaturesOfType(source, kind);
-                let targetSignatures = getSignaturesOfType(target, kind);
+                const sourceSignatures = getSignaturesOfType(source, kind);
+                const targetSignatures = getSignaturesOfType(target, kind);
                 if (sourceSignatures.length !== targetSignatures.length) {
                     return Ternary.False;
                 }
                 let result = Ternary.True;
                 for (let i = 0, len = sourceSignatures.length; i < len; ++i) {
-                    let related = compareSignatures(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
+                    const related = compareSignatures(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5460,21 +5608,21 @@ namespace ts {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(IndexKind.String, source, target);
                 }
-                let targetType = getIndexTypeOfType(target, IndexKind.String);
+                const targetType = getIndexTypeOfType(target, IndexKind.String);
                 if (targetType) {
                     if ((targetType.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) {
-                        // non-primitive assignment to any is always allowed, eg 
+                        // non-primitive assignment to any is always allowed, eg
                         //   `var x: { [index: string]: any } = { property: 12 };`
                         return Ternary.True;
                     }
-                    let sourceType = getIndexTypeOfType(source, IndexKind.String);
+                    const sourceType = getIndexTypeOfType(source, IndexKind.String);
                     if (!sourceType) {
                         if (reportErrors) {
                             reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
                         }
                         return Ternary.False;
                     }
-                    let related = isRelatedTo(sourceType, targetType, reportErrors);
+                    const related = isRelatedTo(sourceType, targetType, reportErrors);
                     if (!related) {
                         if (reportErrors) {
                             reportError(Diagnostics.Index_signatures_are_incompatible);
@@ -5490,15 +5638,15 @@ namespace ts {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(IndexKind.Number, source, target);
                 }
-                let targetType = getIndexTypeOfType(target, IndexKind.Number);
+                const targetType = getIndexTypeOfType(target, IndexKind.Number);
                 if (targetType) {
                     if ((targetType.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) {
-                        // non-primitive assignment to any is always allowed, eg 
+                        // non-primitive assignment to any is always allowed, eg
                         //   `var x: { [index: number]: any } = { property: 12 };`
                         return Ternary.True;
                     }
-                    let sourceStringType = getIndexTypeOfType(source, IndexKind.String);
-                    let sourceNumberType = getIndexTypeOfType(source, IndexKind.Number);
+                    const sourceStringType = getIndexTypeOfType(source, IndexKind.String);
+                    const sourceNumberType = getIndexTypeOfType(source, IndexKind.Number);
                     if (!(sourceStringType || sourceNumberType)) {
                         if (reportErrors) {
                             reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
@@ -5508,7 +5656,7 @@ namespace ts {
                     let related: Ternary;
                     if (sourceStringType && sourceNumberType) {
                         // If we know for sure we're testing both string and numeric index types then only report errors from the second one
-                        related = isRelatedTo(sourceStringType, targetType, false) || isRelatedTo(sourceNumberType, targetType, reportErrors);
+                        related = isRelatedTo(sourceStringType, targetType, /*reportErrors*/ false) || isRelatedTo(sourceNumberType, targetType, reportErrors);
                     }
                     else {
                         related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors);
@@ -5525,8 +5673,8 @@ namespace ts {
             }
 
             function indexTypesIdenticalTo(indexKind: IndexKind, source: Type, target: Type): Ternary {
-                let targetType = getIndexTypeOfType(target, indexKind);
-                let sourceType = getIndexTypeOfType(source, indexKind);
+                const targetType = getIndexTypeOfType(target, indexKind);
+                const sourceType = getIndexTypeOfType(source, indexKind);
                 if (!sourceType && !targetType) {
                     return Ternary.True;
                 }
@@ -5545,10 +5693,10 @@ namespace ts {
         function isDeeplyNestedGeneric(type: Type, stack: Type[], depth: number): boolean {
             // We track type references (created by createTypeReference) and instantiated types (created by instantiateType)
             if (type.flags & (TypeFlags.Reference | TypeFlags.Instantiated) && depth >= 5) {
-                let symbol = type.symbol;
+                const symbol = type.symbol;
                 let count = 0;
                 for (let i = 0; i < depth; i++) {
-                    let t = stack[i];
+                    const t = stack[i];
                     if (t.flags & (TypeFlags.Reference | TypeFlags.Instantiated) && t.symbol === symbol) {
                         count++;
                         if (count >= 5) return true;
@@ -5569,8 +5717,8 @@ namespace ts {
             if (sourceProp === targetProp) {
                 return Ternary.True;
             }
-            let sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (NodeFlags.Private | NodeFlags.Protected);
-            let targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (NodeFlags.Private | NodeFlags.Protected);
+            const sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (NodeFlags.Private | NodeFlags.Protected);
+            const targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (NodeFlags.Private | NodeFlags.Protected);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return Ternary.False;
             }
@@ -5587,18 +5735,31 @@ namespace ts {
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
 
+        function isMatchingSignature(source: Signature, target: Signature, partialMatch: boolean) {
+            // A source signature matches a target signature if the two signatures have the same number of required,
+            // optional, and rest parameters.
+            if (source.parameters.length === target.parameters.length &&
+                source.minArgumentCount === target.minArgumentCount &&
+                source.hasRestParameter === target.hasRestParameter) {
+                return true;
+            }
+            // A source signature partially matches a target signature if the target signature has no fewer required
+            // parameters and no more overall parameters than the source signature (where a signature with a rest
+            // parameter is always considered to have more overall parameters than one without).
+            if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (
+                source.hasRestParameter && !target.hasRestParameter ||
+                source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) {
+                return true;
+            }
+            return false;
+        }
+
         function compareSignatures(source: Signature, target: Signature, partialMatch: boolean, ignoreReturnTypes: boolean, compareTypes: (s: Type, t: Type) => Ternary): Ternary {
             if (source === target) {
                 return Ternary.True;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
-                if (!partialMatch ||
-                    source.parameters.length < target.parameters.length && !source.hasRestParameter ||
-                    source.minArgumentCount > target.minArgumentCount) {
-                    return Ternary.False;
-                }
+            if (!(isMatchingSignature(source, target, partialMatch))) {
+                return Ternary.False;
             }
             let result = Ternary.True;
             if (source.typeParameters && target.typeParameters) {
@@ -5606,7 +5767,7 @@ namespace ts {
                     return Ternary.False;
                 }
                 for (let i = 0, len = source.typeParameters.length; i < len; ++i) {
-                    let related = compareTypes(source.typeParameters[i], target.typeParameters[i]);
+                    const related = compareTypes(source.typeParameters[i], target.typeParameters[i]);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5620,12 +5781,11 @@ namespace ts {
             // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
             source = getErasedSignature(source);
             target = getErasedSignature(target);
-            let sourceLen = source.parameters.length;
-            let targetLen = target.parameters.length;
+            const targetLen = target.parameters.length;
             for (let i = 0; i < targetLen; i++) {
-                let s = source.hasRestParameter && i === sourceLen - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                let t = target.hasRestParameter && i === targetLen - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
-                let related = compareTypes(s, t);
+                const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
+                const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                const related = compareTypes(s, t);
                 if (!related) {
                     return Ternary.False;
                 }
@@ -5637,8 +5797,12 @@ namespace ts {
             return result;
         }
 
+        function isRestParameterIndex(signature: Signature, parameterIndex: number) {
+            return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
+        }
+
         function isSupertypeOfEach(candidate: Type, types: Type[]): boolean {
-            for (let type of types) {
+            for (const type of types) {
                 if (candidate !== type && !isTypeSubtypeOf(type, candidate)) return false;
             }
             return true;
@@ -5702,6 +5866,10 @@ namespace ts {
             return !!getPropertyOfType(type, "0");
         }
 
+        function isStringLiteralType(type: Type) {
+            return type.flags & TypeFlags.StringLiteral;
+        }
+
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -5730,13 +5898,13 @@ namespace ts {
         }
 
         function getWidenedTypeOfObjectLiteral(type: Type): Type {
-            let properties = getPropertiesOfObjectType(type);
-            let members: SymbolTable = {};
+            const properties = getPropertiesOfObjectType(type);
+            const members: SymbolTable = {};
             forEach(properties, p => {
-                let propType = getTypeOfSymbol(p);
-                let widenedType = getWidenedType(propType);
+                const propType = getTypeOfSymbol(p);
+                const widenedType = getWidenedType(propType);
                 if (propType !== widenedType) {
-                    let symbol = <TransientSymbol>createSymbol(p.flags | SymbolFlags.Transient, p.name);
+                    const symbol = <TransientSymbol>createSymbol(p.flags | SymbolFlags.Transient, p.name);
                     symbol.declarations = p.declarations;
                     symbol.parent = p.parent;
                     symbol.type = widenedType;
@@ -5788,7 +5956,7 @@ namespace ts {
         function reportWideningErrorsInType(type: Type): boolean {
             let errorReported = false;
             if (type.flags & TypeFlags.Union) {
-                for (let t of (<UnionType>type).types) {
+                for (const t of (<UnionType>type).types) {
                     if (reportWideningErrorsInType(t)) {
                         errorReported = true;
                     }
@@ -5798,15 +5966,15 @@ namespace ts {
                 return reportWideningErrorsInType((<TypeReference>type).typeArguments[0]);
             }
             if (isTupleType(type)) {
-                for (let t of type.elementTypes) {
+                for (const t of type.elementTypes) {
                     if (reportWideningErrorsInType(t)) {
                         errorReported = true;
                     }
                 }
             }
             if (type.flags & TypeFlags.ObjectLiteral) {
-                for (let p of getPropertiesOfObjectType(type)) {
-                    let t = getTypeOfSymbol(p);
+                for (const p of getPropertiesOfObjectType(type)) {
+                    const t = getTypeOfSymbol(p);
                     if (t.flags & TypeFlags.ContainsUndefinedOrNull) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
@@ -5819,7 +5987,7 @@ namespace ts {
         }
 
         function reportImplicitAnyError(declaration: Declaration, type: Type) {
-            let typeAsString = typeToString(getWidenedType(type));
+            const typeAsString = typeToString(getWidenedType(type));
             let diagnostic: DiagnosticMessage;
             switch (declaration.kind) {
                 case SyntaxKind.PropertyDeclaration:
@@ -5880,15 +6048,15 @@ namespace ts {
                 count = sourceMax < targetMax ? sourceMax : targetMax;
             }
             for (let i = 0; i < count; i++) {
-                let s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                let t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
+                const s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
+                const t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
                 callback(s, t);
             }
         }
 
         function createInferenceContext(typeParameters: TypeParameter[], inferUnionTypes: boolean): InferenceContext {
-            let inferences: TypeInferences[] = [];
-            for (let unused of typeParameters) {
+            const inferences: TypeInferences[] = [];
+            for (const unused of typeParameters) {
                 inferences.push({
                     primary: undefined, secondary: undefined, isFixed: false
                 });
@@ -5929,10 +6097,10 @@ namespace ts {
                         return;
                     }
 
-                    let typeParameters = context.typeParameters;
+                    const typeParameters = context.typeParameters;
                     for (let i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
-                            let inferences = context.inferences[i];
+                            const inferences = context.inferences[i];
                             if (!inferences.isFixed) {
                                 // Any inferences that are made to a type parameter in a union type are inferior
                                 // to inferences made to a flat (non-union) type. This is because if we infer to
@@ -5940,7 +6108,7 @@ namespace ts {
                                 // the correct constituent on the target side could be string[]). Therefore, we put
                                 // such inferior inferences into a secondary bucket, and only use them if the primary
                                 // bucket is empty.
-                                let candidates = inferiority ?
+                                const candidates = inferiority ?
                                     inferences.secondary || (inferences.secondary = []) :
                                     inferences.primary || (inferences.primary = []);
                                 if (!contains(candidates, source)) {
@@ -5953,27 +6121,27 @@ namespace ts {
                 }
                 else if (source.flags & TypeFlags.Reference && target.flags & TypeFlags.Reference && (<TypeReference>source).target === (<TypeReference>target).target) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    let sourceTypes = (<TypeReference>source).typeArguments || emptyArray;
-                    let targetTypes = (<TypeReference>target).typeArguments || emptyArray;
-                    let count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                    const sourceTypes = (<TypeReference>source).typeArguments || emptyArray;
+                    const targetTypes = (<TypeReference>target).typeArguments || emptyArray;
+                    const count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
                     for (let i = 0; i < count; i++) {
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
                 else if (source.flags & TypeFlags.Tuple && target.flags & TypeFlags.Tuple && (<TupleType>source).elementTypes.length === (<TupleType>target).elementTypes.length) {
                     // If source and target are tuples of the same size, infer from element types
-                    let sourceTypes = (<TupleType>source).elementTypes;
-                    let targetTypes = (<TupleType>target).elementTypes;
+                    const sourceTypes = (<TupleType>source).elementTypes;
+                    const targetTypes = (<TupleType>target).elementTypes;
                     for (let i = 0; i < sourceTypes.length; i++) {
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
                 else if (target.flags & TypeFlags.UnionOrIntersection) {
-                    let targetTypes = (<UnionOrIntersectionType>target).types;
+                    const targetTypes = (<UnionOrIntersectionType>target).types;
                     let typeParameterCount = 0;
                     let typeParameter: TypeParameter;
                     // First infer to each type in union or intersection that isn't a type parameter
-                    for (let t of targetTypes) {
+                    for (const t of targetTypes) {
                         if (t.flags & TypeFlags.TypeParameter && contains(context.typeParameters, t)) {
                             typeParameter = <TypeParameter>t;
                             typeParameterCount++;
@@ -5994,8 +6162,8 @@ namespace ts {
                 }
                 else if (source.flags & TypeFlags.UnionOrIntersection) {
                     // Source is a union or intersection type, infer from each consituent type
-                    let sourceTypes = (<UnionOrIntersectionType>source).types;
-                    for (let sourceType of sourceTypes) {
+                    const sourceTypes = (<UnionOrIntersectionType>source).types;
+                    for (const sourceType of sourceTypes) {
                         inferFromTypes(sourceType, target);
                     }
                 }
@@ -6030,9 +6198,9 @@ namespace ts {
             }
 
             function inferFromProperties(source: Type, target: Type) {
-                let properties = getPropertiesOfObjectType(target);
-                for (let targetProp of properties) {
-                    let sourceProp = getPropertyOfObjectType(source, targetProp.name);
+                const properties = getPropertiesOfObjectType(target);
+                for (const targetProp of properties) {
+                    const sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
                     }
@@ -6040,11 +6208,11 @@ namespace ts {
             }
 
             function inferFromSignatures(source: Type, target: Type, kind: SignatureKind) {
-                let sourceSignatures = getSignaturesOfType(source, kind);
-                let targetSignatures = getSignaturesOfType(target, kind);
-                let sourceLen = sourceSignatures.length;
-                let targetLen = targetSignatures.length;
-                let len = sourceLen < targetLen ? sourceLen : targetLen;
+                const sourceSignatures = getSignaturesOfType(source, kind);
+                const targetSignatures = getSignaturesOfType(target, kind);
+                const sourceLen = sourceSignatures.length;
+                const targetLen = targetSignatures.length;
+                const len = sourceLen < targetLen ? sourceLen : targetLen;
                 for (let i = 0; i < len; i++) {
                     inferFromSignature(getErasedSignature(sourceSignatures[sourceLen - len + i]), getErasedSignature(targetSignatures[targetLen - len + i]));
                 }
@@ -6066,9 +6234,9 @@ namespace ts {
             }
 
             function inferFromIndexTypes(source: Type, target: Type, sourceKind: IndexKind, targetKind: IndexKind) {
-                let targetIndexType = getIndexTypeOfType(target, targetKind);
+                const targetIndexType = getIndexTypeOfType(target, targetKind);
                 if (targetIndexType) {
-                    let sourceIndexType = getIndexTypeOfType(source, sourceKind);
+                    const sourceIndexType = getIndexTypeOfType(source, sourceKind);
                     if (sourceIndexType) {
                         inferFromTypes(sourceIndexType, targetIndexType);
                     }
@@ -6077,7 +6245,7 @@ namespace ts {
         }
 
         function getInferenceCandidates(context: InferenceContext, index: number): Type[] {
-            let inferences = context.inferences[index];
+            const inferences = context.inferences[index];
             return inferences.primary || inferences.secondary || emptyArray;
         }
 
@@ -6085,10 +6253,10 @@ namespace ts {
             let inferredType = context.inferredTypes[index];
             let inferenceSucceeded: boolean;
             if (!inferredType) {
-                let inferences = getInferenceCandidates(context, index);
+                const inferences = getInferenceCandidates(context, index);
                 if (inferences.length) {
                     // Infer widened union or supertype, or the unknown type for no common supertype
-                    let unionOrSuperType = context.inferUnionTypes ? getUnionType(inferences) : getCommonSupertype(inferences);
+                    const unionOrSuperType = context.inferUnionTypes ? getUnionType(inferences) : getCommonSupertype(inferences);
                     inferredType = unionOrSuperType ? getWidenedType(unionOrSuperType) : unknownType;
                     inferenceSucceeded = !!unionOrSuperType;
                 }
@@ -6103,7 +6271,7 @@ namespace ts {
 
                 // Only do the constraint check if inference succeeded (to prevent cascading errors)
                 if (inferenceSucceeded) {
-                    let constraint = getConstraintOfTypeParameter(context.typeParameters[index]);
+                    const constraint = getConstraintOfTypeParameter(context.typeParameters[index]);
                     inferredType = constraint && !isTypeAssignableTo(inferredType, constraint) ? constraint : inferredType;
                 }
                 else if (context.failedTypeParameterIndex === undefined || context.failedTypeParameterIndex > index) {
@@ -6132,7 +6300,7 @@ namespace ts {
         // EXPRESSION TYPE CHECKING
 
         function getResolvedSymbol(node: Identifier): Symbol {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = (!nodeIsMissing(node) && resolveName(node, node.text, SymbolFlags.Value | SymbolFlags.ExportValue, Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
             }
@@ -6158,36 +6326,15 @@ namespace ts {
             Debug.fail("should not get here");
         }
 
-        // For a union type, remove all constituent types that are of the given type kind (when isOfTypeKind is true)
-        // or not of the given type kind (when isOfTypeKind is false)
-        function removeTypesFromUnionType(type: Type, typeKind: TypeFlags, isOfTypeKind: boolean, allowEmptyUnionResult: boolean): Type {
-            if (type.flags & TypeFlags.Union) {
-                let types = (<UnionType>type).types;
-                if (forEach(types, t => !!(t.flags & typeKind) === isOfTypeKind)) {
-                    // Above we checked if we have anything to remove, now use the opposite test to do the removal
-                    let narrowedType = getUnionType(filter(types, t => !(t.flags & typeKind) === isOfTypeKind));
-                    if (allowEmptyUnionResult || narrowedType !== emptyObjectType) {
-                        return narrowedType;
-                    }
-                }
-            }
-            else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) {
-                // Use getUnionType(emptyArray) instead of emptyObjectType in case the way empty union types
-                // are represented ever changes.
-                return getUnionType(emptyArray);
-            }
-            return type;
-        }
-
         function hasInitializer(node: VariableLikeDeclaration): boolean {
             return !!(node.initializer || isBindingPattern(node.parent) && hasInitializer(<VariableLikeDeclaration>node.parent.parent));
         }
 
         // Check if a given variable is assigned within a given syntax node
         function isVariableAssignedWithin(symbol: Symbol, node: Node): boolean {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (links.assignmentChecks) {
-                let cachedResult = links.assignmentChecks[symbol.id];
+                const cachedResult = links.assignmentChecks[symbol.id];
                 if (cachedResult !== undefined) {
                     return cachedResult;
                 }
@@ -6280,53 +6427,70 @@ namespace ts {
             // Only narrow when symbol is variable of type any or an object, union, or type parameter type
             if (node && symbol.flags & SymbolFlags.Variable) {
                 if (isTypeAny(type) || type.flags & (TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) {
+                    const declaration = getDeclarationOfKind(symbol, SyntaxKind.VariableDeclaration);
+                    const top = declaration && getDeclarationContainer(declaration);
+                    const originalType = type;
+                    const nodeStack: {node: Node, child: Node}[] = [];
                     loop: while (node.parent) {
-                        let child = node;
+                        const child = node;
                         node = node.parent;
-                        let narrowedType = type;
+                        switch (node.kind) {
+                            case SyntaxKind.IfStatement:
+                            case SyntaxKind.ConditionalExpression:
+                            case SyntaxKind.BinaryExpression:
+                                nodeStack.push({node, child});
+                                break;
+                            case SyntaxKind.SourceFile:
+                            case SyntaxKind.ModuleDeclaration:
+                                // Stop at the first containing file or module declaration
+                                break loop;
+                        }
+                        if (node === top) {
+                            break;
+                        }
+                    }
+
+                    let nodes: {node: Node, child: Node};
+                    while (nodes = nodeStack.pop()) {
+                        const {node, child} = nodes;
                         switch (node.kind) {
                             case SyntaxKind.IfStatement:
                                 // In a branch of an if statement, narrow based on controlling expression
                                 if (child !== (<IfStatement>node).expression) {
-                                    narrowedType = narrowType(type, (<IfStatement>node).expression, /*assumeTrue*/ child === (<IfStatement>node).thenStatement);
+                                    type = narrowType(type, (<IfStatement>node).expression, /*assumeTrue*/ child === (<IfStatement>node).thenStatement);
                                 }
                                 break;
                             case SyntaxKind.ConditionalExpression:
                                 // In a branch of a conditional expression, narrow based on controlling condition
                                 if (child !== (<ConditionalExpression>node).condition) {
-                                    narrowedType = narrowType(type, (<ConditionalExpression>node).condition, /*assumeTrue*/ child === (<ConditionalExpression>node).whenTrue);
+                                    type = narrowType(type, (<ConditionalExpression>node).condition, /*assumeTrue*/ child === (<ConditionalExpression>node).whenTrue);
                                 }
                                 break;
                             case SyntaxKind.BinaryExpression:
                                 // In the right operand of an && or ||, narrow based on left operand
                                 if (child === (<BinaryExpression>node).right) {
                                     if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.AmpersandAmpersandToken) {
-                                        narrowedType = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ true);
+                                        type = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ true);
                                     }
                                     else if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken) {
-                                        narrowedType = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ false);
+                                        type = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ false);
                                     }
                                 }
                                 break;
-                            case SyntaxKind.SourceFile:
-                            case SyntaxKind.ModuleDeclaration:
-                            case SyntaxKind.FunctionDeclaration:
-                            case SyntaxKind.MethodDeclaration:
-                            case SyntaxKind.MethodSignature:
-                            case SyntaxKind.GetAccessor:
-                            case SyntaxKind.SetAccessor:
-                            case SyntaxKind.Constructor:
-                                // Stop at the first containing function or module declaration
-                                break loop;
+                            default:
+                                Debug.fail("Unreachable!");
                         }
-                        // Use narrowed type if construct contains no assignments to variable
-                        if (narrowedType !== type) {
-                            if (isVariableAssignedWithin(symbol, node)) {
-                                break;
-                            }
-                            type = narrowedType;
+
+                        // Use original type if construct contains assignments to variable
+                        if (type !== originalType && isVariableAssignedWithin(symbol, node)) {
+                            type = originalType;
                         }
                     }
+
+                    // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
+                    if (type === emptyUnionType) {
+                        type = originalType;
+                    }
                 }
             }
 
@@ -6337,36 +6501,40 @@ namespace ts {
                 if (expr.left.kind !== SyntaxKind.TypeOfExpression || expr.right.kind !== SyntaxKind.StringLiteral) {
                     return type;
                 }
-                let left = <TypeOfExpression>expr.left;
-                let right = <LiteralExpression>expr.right;
+                const left = <TypeOfExpression>expr.left;
+                const right = <LiteralExpression>expr.right;
                 if (left.expression.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>left.expression) !== symbol) {
                     return type;
                 }
-                let typeInfo = primitiveTypeInfo[right.text];
                 if (expr.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken) {
                     assumeTrue = !assumeTrue;
                 }
-                if (assumeTrue) {
-                    // Assumed result is true. If check was not for a primitive type, remove all primitive types
-                    if (!typeInfo) {
-                        return removeTypesFromUnionType(type, /*typeKind*/ TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.Boolean | TypeFlags.ESSymbol,
-                            /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ false);
-                    }
-                    // Check was for a primitive type, return that primitive type if it is a subtype
-                    if (isTypeSubtypeOf(typeInfo.type, type)) {
-                        return typeInfo.type;
-                    }
-                    // Otherwise, remove all types that aren't of the primitive type kind. This can happen when the type is
-                    // union of enum types and other types.
-                    return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false, /*allowEmptyUnionResult*/ false);
+                const typeInfo = primitiveTypeInfo[right.text];
+                // Don't narrow `undefined`
+                if (typeInfo && typeInfo.type === undefinedType) {
+                    return type;
+                }
+                // If the type to be narrowed is any and we're checking a primitive with assumeTrue=true, return the primitive
+                if (!!(type.flags & TypeFlags.Any) && typeInfo && assumeTrue) {
+                    return typeInfo.type;
+                }
+                let flags: TypeFlags;
+                if (typeInfo) {
+                    flags = typeInfo.flags;
                 }
                 else {
-                    // Assumed result is false. If check was for a primitive type, remove that primitive type
-                    if (typeInfo) {
-                        return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ false);
-                    }
-                    // Otherwise we don't have enough information to do anything.
-                    return type;
+                    assumeTrue = !assumeTrue;
+                    flags = TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.ESSymbol | TypeFlags.Boolean;
+                }
+                // At this point we can bail if it's not a union
+                if (!(type.flags & TypeFlags.Union)) {
+                    // If the active non-union type would be removed from a union by this type guard, return an empty union
+                    return filterUnion(type) ? type : emptyUnionType;
+                }
+                return getUnionType(filter((type as UnionType).types, filterUnion), /*noSubtypeReduction*/ true);
+
+                function filterUnion(type: Type) {
+                    return assumeTrue === !!(type.flags & flags);
                 }
             }
 
@@ -6380,7 +6548,7 @@ namespace ts {
                     // and the second operand was false. We narrow with those assumptions and union the two resulting types.
                     return getUnionType([
                         narrowType(type, expr.left, /*assumeTrue*/ false),
-                        narrowType(narrowType(type, expr.left, /*assumeTrue*/ true), expr.right, /*assumeTrue*/ false)
+                        narrowType(type, expr.right, /*assumeTrue*/ false)
                     ]);
                 }
             }
@@ -6391,7 +6559,7 @@ namespace ts {
                     // and the second operand was true. We narrow with those assumptions and union the two resulting types.
                     return getUnionType([
                         narrowType(type, expr.left, /*assumeTrue*/ true),
-                        narrowType(narrowType(type, expr.left, /*assumeTrue*/ false), expr.right, /*assumeTrue*/ true)
+                        narrowType(type, expr.right, /*assumeTrue*/ true)
                     ]);
                 }
                 else {
@@ -6402,20 +6570,21 @@ namespace ts {
 
             function narrowTypeByInstanceof(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
                 // Check that type is not any, assumed result is true, and we have variable symbol on the left
-                if (isTypeAny(type) || !assumeTrue || expr.left.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>expr.left) !== symbol) {
+                if (isTypeAny(type) || expr.left.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>expr.left) !== symbol) {
                     return type;
                 }
+
                 // Check that right operand is a function type with a prototype property
-                let rightType = checkExpression(expr.right);
+                const rightType = checkExpression(expr.right);
                 if (!isTypeSubtypeOf(rightType, globalFunctionType)) {
                     return type;
                 }
 
                 let targetType: Type;
-                let prototypeProperty = getPropertyOfType(rightType, "prototype");
+                const prototypeProperty = getPropertyOfType(rightType, "prototype");
                 if (prototypeProperty) {
                     // Target type is type of the prototype property
-                    let prototypePropertyType = getTypeOfSymbol(prototypeProperty);
+                    const prototypePropertyType = getTypeOfSymbol(prototypeProperty);
                     if (!isTypeAny(prototypePropertyType)) {
                         targetType = prototypePropertyType;
                     }
@@ -6436,6 +6605,13 @@ namespace ts {
                 }
 
                 if (targetType) {
+                    if (!assumeTrue) {
+                        if (type.flags & TypeFlags.Union) {
+                            return getUnionType(filter((<UnionType>type).types, t => !isTypeSubtypeOf(t, targetType)));
+                        }
+                        return type;
+                    }
+
                     return getNarrowedType(type, targetType);
                 }
 
@@ -6446,7 +6622,7 @@ namespace ts {
                 // If the current type is a union type, remove all constituents that aren't assignable to target. If that produces
                 // 0 candidates, fall back to the assignability check
                 if (originalType.flags & TypeFlags.Union) {
-                    let assignableConstituents = filter((<UnionType>originalType).types, t => isTypeAssignableTo(t, narrowedTypeCandidate));
+                    const assignableConstituents = filter((<UnionType>originalType).types, t => isTypeAssignableTo(t, narrowedTypeCandidate));
                     if (assignableConstituents.length) {
                         return getUnionType(assignableConstituents);
                     }
@@ -6464,7 +6640,7 @@ namespace ts {
                 if (type.flags & TypeFlags.Any) {
                     return type;
                 }
-                let signature = getResolvedSignature(expr);
+                const signature = getResolvedSignature(expr);
 
                 if (signature.typePredicate &&
                     expr.arguments[signature.typePredicate.parameterIndex] &&
@@ -6490,7 +6666,7 @@ namespace ts {
                     case SyntaxKind.ParenthesizedExpression:
                         return narrowType(type, (<ParenthesizedExpression>expr).expression, assumeTrue);
                     case SyntaxKind.BinaryExpression:
-                        let operator = (<BinaryExpression>expr).operatorToken.kind;
+                        const operator = (<BinaryExpression>expr).operatorToken.kind;
                         if (operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken) {
                             return narrowTypeByEquality(type, <BinaryExpression>expr, assumeTrue);
                         }
@@ -6515,7 +6691,7 @@ namespace ts {
         }
 
         function checkIdentifier(node: Identifier): Type {
-            let symbol = getResolvedSymbol(node);
+            const symbol = getResolvedSymbol(node);
 
             // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
             // Although in down-level emit of arrow function, we emit it using function expression which means that
@@ -6524,7 +6700,7 @@ namespace ts {
             // To avoid that we will give an error to users if they use arguments objects in arrow function so that they
             // can explicitly bound arguments objects
             if (symbol === argumentsSymbol) {
-                let container = getContainingFunction(node);
+                const container = getContainingFunction(node);
                 if (container.kind === SyntaxKind.ArrowFunction) {
                     if (languageVersion < ScriptTarget.ES6) {
                         error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
@@ -6562,35 +6738,43 @@ namespace ts {
 
         function checkBlockScopedBindingCapturedInLoop(node: Identifier, symbol: Symbol): void {
             if (languageVersion >= ScriptTarget.ES6 ||
-                (symbol.flags & SymbolFlags.BlockScopedVariable) === 0 ||
+                (symbol.flags & (SymbolFlags.BlockScopedVariable | SymbolFlags.Class)) === 0 ||
                 symbol.valueDeclaration.parent.kind === SyntaxKind.CatchClause) {
                 return;
             }
 
-            // - check if binding is used in some function
-            // (stop the walk when reaching container of binding declaration)
-            // - if first check succeeded - check if variable is declared inside the loop
+            // 1. walk from the use site up to the declaration and check
+            // if there is anything function like between declaration and use-site (is binding/class is captured in function).
+            // 2. walk from the declaration up to the boundary of lexical environment and check
+            // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
 
-            // nesting structure:
-            // (variable declaration or binding element) -> variable declaration list -> container
-            let container: Node = symbol.valueDeclaration;
-            while (container.kind !== SyntaxKind.VariableDeclarationList) {
-                container = container.parent;
+            let container: Node;
+            if (symbol.flags & SymbolFlags.Class) {
+                // get parent of class declaration
+                container = getClassLikeDeclarationOfSymbol(symbol).parent;
             }
-            // get the parent of variable declaration list
-            container = container.parent;
-            if (container.kind === SyntaxKind.VariableStatement) {
-                // if parent is variable statement - get its parent
+            else {
+                // nesting structure:
+                // (variable declaration or binding element) -> variable declaration list -> container
+                container = symbol.valueDeclaration;
+                while (container.kind !== SyntaxKind.VariableDeclarationList) {
+                    container = container.parent;
+                }
+                // get the parent of variable declaration list
                 container = container.parent;
+                if (container.kind === SyntaxKind.VariableStatement) {
+                    // if parent is variable statement - get its parent
+                    container = container.parent;
+                }
             }
 
-            let inFunction = isInsideFunction(node.parent, container);
+            const inFunction = isInsideFunction(node.parent, container);
 
             let current = container;
             while (current && !nodeStartsNewLexicalEnvironment(current)) {
                 if (isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
                     if (inFunction) {
-                        grammarErrorOnFirstToken(current, Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, declarationNameToString(node));
+                        getNodeLinks(current).flags |= NodeCheckFlags.LoopWithBlockScopedBindingCapturedInFunction;
                     }
                     // mark value declaration so during emit they can have a special handling
                     getNodeLinks(<VariableDeclaration>symbol.valueDeclaration).flags |= NodeCheckFlags.BlockScopedBindingInLoop;
@@ -6603,7 +6787,7 @@ namespace ts {
         function captureLexicalThis(node: Node, container: Node): void {
             getNodeLinks(node).flags |= NodeCheckFlags.LexicalThis;
             if (container.kind === SyntaxKind.PropertyDeclaration || container.kind === SyntaxKind.Constructor) {
-                let classNode = container.parent;
+                const classNode = container.parent;
                 getNodeLinks(classNode).flags |= NodeCheckFlags.CaptureThis;
             }
             else {
@@ -6657,7 +6841,7 @@ namespace ts {
             }
 
             if (isClassLike(container.parent)) {
-                let symbol = getSymbolOfNode(container.parent);
+                const symbol = getSymbolOfNode(container.parent);
                 return container.flags & NodeFlags.Static ? getTypeOfSymbol(symbol) : (<InterfaceType>getDeclaredTypeOfSymbol(symbol)).thisType;
             }
             return anyType;
@@ -6673,10 +6857,10 @@ namespace ts {
         }
 
         function checkSuperExpression(node: Node): Type {
-            let isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
-            let classDeclaration = getContainingClass(node);
-            let classType = classDeclaration && <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(classDeclaration));
-            let baseClassType = classType && getBaseTypes(classType)[0];
+            const isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
+            const classDeclaration = getContainingClass(node);
+            const classType = classDeclaration && <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(classDeclaration));
+            const baseClassType = classType && getBaseTypes(classType)[0];
 
             let container = getSuperContainer(node, /*includeFunctions*/ true);
             let needToCaptureLexicalThis = false;
@@ -6689,7 +6873,7 @@ namespace ts {
                 }
             }
 
-            let canUseSuperExpression = isLegalUsageOfSuperExpression(container);
+            const canUseSuperExpression = isLegalUsageOfSuperExpression(container);
             let nodeCheckFlag: NodeCheckFlags = 0;
 
             // always set NodeCheckFlags for 'super' expression node
@@ -6784,22 +6968,23 @@ namespace ts {
 
         // Return contextual type of parameter or undefined if no contextual type is available
         function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type {
-            let func = parameter.parent;
+            const func = parameter.parent;
             if (isFunctionExpressionOrArrowFunction(func) || isObjectLiteralMethod(func)) {
                 if (isContextSensitive(func)) {
-                    let contextualSignature = getContextualSignature(func);
+                    const contextualSignature = getContextualSignature(func);
                     if (contextualSignature) {
 
-                        let funcHasRestParameters = hasRestParameter(func);
-                        let len = func.parameters.length - (funcHasRestParameters ? 1 : 0);
-                        let indexOfParameter = indexOf(func.parameters, parameter);
+                        const funcHasRestParameters = hasRestParameter(func);
+                        const len = func.parameters.length - (funcHasRestParameters ? 1 : 0);
+                        const indexOfParameter = indexOf(func.parameters, parameter);
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
 
                         // If last parameter is contextually rest parameter get its type
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (funcHasRestParameters &&
+                            indexOfParameter === (func.parameters.length - 1) &&
+                            isRestParameterIndex(contextualSignature, func.parameters.length - 1)) {
                             return getTypeOfSymbol(lastOrUndefined(contextualSignature.parameters));
                         }
                     }
@@ -6814,13 +6999,13 @@ namespace ts {
         // of the parameter. Otherwise, in a variable or parameter declaration with a binding pattern name, the contextual
         // type of an initializer expression is the type implied by the binding pattern.
         function getContextualTypeForInitializerExpression(node: Expression): Type {
-            let declaration = <VariableLikeDeclaration>node.parent;
+            const declaration = <VariableLikeDeclaration>node.parent;
             if (node === declaration.initializer) {
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
                 if (declaration.kind === SyntaxKind.Parameter) {
-                    let type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
+                    const type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
                     if (type) {
                         return type;
                     }
@@ -6833,7 +7018,7 @@ namespace ts {
         }
 
         function getContextualTypeForReturnExpression(node: Expression): Type {
-            let func = getContainingFunction(node);
+            const func = getContainingFunction(node);
             if (func && !func.asteriskToken) {
                 return getContextualReturnType(func);
             }
@@ -6842,9 +7027,9 @@ namespace ts {
         }
 
         function getContextualTypeForYieldOperand(node: YieldExpression): Type {
-            let func = getContainingFunction(node);
+            const func = getContainingFunction(node);
             if (func) {
-                let contextualReturnType = getContextualReturnType(func);
+                const contextualReturnType = getContextualReturnType(func);
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
@@ -6878,7 +7063,7 @@ namespace ts {
 
             // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
             // and that call signature is non-generic, return statements are contextually typed by the return type of the signature
-            let signature = getContextualSignatureForFunctionLikeDeclaration(<FunctionExpression>functionDecl);
+            const signature = getContextualSignatureForFunctionLikeDeclaration(<FunctionExpression>functionDecl);
             if (signature) {
                 return getReturnTypeOfSignature(signature);
             }
@@ -6888,10 +7073,10 @@ namespace ts {
 
         // In a typed function call, an argument or substitution expression is contextually typed by the type of the corresponding parameter.
         function getContextualTypeForArgument(callTarget: CallLikeExpression, arg: Expression): Type {
-            let args = getEffectiveCallArguments(callTarget);
-            let argIndex = indexOf(args, arg);
+            const args = getEffectiveCallArguments(callTarget);
+            const argIndex = indexOf(args, arg);
             if (argIndex >= 0) {
-                let signature = getResolvedSignature(callTarget);
+                const signature = getResolvedSignature(callTarget);
                 return getTypeAtPosition(signature, argIndex);
             }
             return undefined;
@@ -6906,8 +7091,8 @@ namespace ts {
         }
 
         function getContextualTypeForBinaryOperand(node: Expression): Type {
-            let binaryExpression = <BinaryExpression>node.parent;
-            let operator = binaryExpression.operatorToken.kind;
+            const binaryExpression = <BinaryExpression>node.parent;
+            const operator = binaryExpression.operatorToken.kind;
             if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) {
                 // In an assignment expression, the right operand is contextually typed by the type of the left operand.
                 if (node === binaryExpression.right) {
@@ -6933,11 +7118,11 @@ namespace ts {
             if (!(type.flags & TypeFlags.Union)) {
                 return mapper(type);
             }
-            let types = (<UnionType>type).types;
+            const types = (<UnionType>type).types;
             let mappedType: Type;
             let mappedTypes: Type[];
-            for (let current of types) {
-                let t = mapper(current);
+            for (const current of types) {
+                const t = mapper(current);
                 if (t) {
                     if (!mappedType) {
                         mappedType = t;
@@ -6955,7 +7140,7 @@ namespace ts {
 
         function getTypeOfPropertyOfContextualType(type: Type, name: string) {
             return applyToContextualType(type, t => {
-                let prop = t.flags & TypeFlags.StructuredType ? getPropertyOfType(t, name) : undefined;
+                const prop = t.flags & TypeFlags.StructuredType ? getPropertyOfType(t, name) : undefined;
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -6964,6 +7149,10 @@ namespace ts {
             return applyToContextualType(type, t => getIndexTypeOfStructuredType(t, kind));
         }
 
+        function contextualTypeIsStringLiteralType(type: Type): boolean {
+            return !!(type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, isStringLiteralType) : isStringLiteralType(type));
+        }
+
         // Return true if the given contextual type is a tuple-like type
         function contextualTypeIsTupleLikeType(type: Type): boolean {
             return !!(type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, isTupleLikeType) : isTupleLikeType(type));
@@ -6988,15 +7177,15 @@ namespace ts {
         }
 
         function getContextualTypeForObjectLiteralElement(element: ObjectLiteralElement) {
-            let objectLiteral = <ObjectLiteralExpression>element.parent;
-            let type = getContextualType(objectLiteral);
+            const objectLiteral = <ObjectLiteralExpression>element.parent;
+            const type = getApparentTypeOfContextualType(objectLiteral);
             if (type) {
                 if (!hasDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    let symbolName = getSymbolOfNode(element).name;
-                    let propertyType = getTypeOfPropertyOfContextualType(type, symbolName);
+                    const symbolName = getSymbolOfNode(element).name;
+                    const propertyType = getTypeOfPropertyOfContextualType(type, symbolName);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -7014,10 +7203,10 @@ namespace ts {
         // it is the type of the numeric index signature in T. Otherwise, in ES6 and higher, the contextual type is the iterated
         // type of T.
         function getContextualTypeForElementExpression(node: Expression): Type {
-            let arrayLiteral = <ArrayLiteralExpression>node.parent;
-            let type = getContextualType(arrayLiteral);
+            const arrayLiteral = <ArrayLiteralExpression>node.parent;
+            const type = getApparentTypeOfContextualType(arrayLiteral);
             if (type) {
-                let index = indexOf(arrayLiteral.elements, node);
+                const index = indexOf(arrayLiteral.elements, node);
                 return getTypeOfPropertyOfContextualType(type, "" + index)
                     || getIndexTypeOfContextualType(type, IndexKind.Number)
                     || (languageVersion >= ScriptTarget.ES6 ? getElementTypeOfIterable(type, /*errorNode*/ undefined) : undefined);
@@ -7027,15 +7216,15 @@ namespace ts {
 
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
         function getContextualTypeForConditionalOperand(node: Expression): Type {
-            let conditional = <ConditionalExpression>node.parent;
+            const conditional = <ConditionalExpression>node.parent;
             return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
         }
 
-        function getContextualTypeForJsxExpression(expr: JsxExpression|JsxSpreadAttribute): Type {
+        function getContextualTypeForJsxExpression(expr: JsxExpression | JsxSpreadAttribute): Type {
             // Contextual type only applies to JSX expressions that are in attribute assignments (not in 'Children' positions)
             if (expr.parent.kind === SyntaxKind.JsxAttribute) {
-                let attrib = <JsxAttribute>expr.parent;
-                let attrsType = getJsxElementAttributesType(<JsxOpeningLikeElement>attrib.parent);
+                const attrib = <JsxAttribute>expr.parent;
+                const attrsType = getJsxElementAttributesType(<JsxOpeningLikeElement>attrib.parent);
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
@@ -7053,12 +7242,29 @@ namespace ts {
 
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getContextualType(node: Expression): Type {
-            let type = getContextualTypeWorker(node);
+        function getApparentTypeOfContextualType(node: Expression): Type {
+            const type = getContextualType(node);
             return type && getApparentType(type);
         }
 
-        function getContextualTypeWorker(node: Expression): Type {
+        /**
+         * Woah! Do you really want to use this function?
+         *
+         * Unless you're trying to get the *non-apparent* type for a
+         * value-literal type or you're authoring relevant portions of this algorithm,
+         * you probably meant to use 'getApparentTypeOfContextualType'.
+         * Otherwise this may not be very useful.
+         *
+         * In cases where you *are* working on this function, you should understand
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'.
+         *
+         *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
+         *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
+         *
+         * @param node the expression whose contextual type will be returned.
+         * @returns the contextual type of an expression.
+         */
+        function getContextualType(node: Expression): Type {
             if (isInsideWithStatementBody(node)) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -7066,7 +7272,7 @@ namespace ts {
             if (node.contextualType) {
                 return node.contextualType;
             }
-            let parent = node.parent;
+            const parent = node.parent;
             switch (parent.kind) {
                 case SyntaxKind.VariableDeclaration:
                 case SyntaxKind.Parameter:
@@ -7108,9 +7314,9 @@ namespace ts {
         // If the given type is an object or union type, if that type has a single signature, and if
         // that signature is non-generic, return the signature. Otherwise return undefined.
         function getNonGenericSignature(type: Type): Signature {
-            let signatures = getSignaturesOfStructuredType(type, SignatureKind.Call);
+            const signatures = getSignaturesOfStructuredType(type, SignatureKind.Call);
             if (signatures.length === 1) {
-                let signature = signatures[0];
+                const signature = signatures[0];
                 if (!signature.typeParameters) {
                     return signature;
                 }
@@ -7135,9 +7341,9 @@ namespace ts {
         // union type of return types from these signatures
         function getContextualSignature(node: FunctionExpression | MethodDeclaration): Signature {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
-            let type = isObjectLiteralMethod(node)
+            const type = isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+                : getApparentTypeOfContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -7145,9 +7351,9 @@ namespace ts {
                 return getNonGenericSignature(type);
             }
             let signatureList: Signature[];
-            let types = (<UnionType>type).types;
-            for (let current of types) {
-                let signature = getNonGenericSignature(current);
+            const types = (<UnionType>type).types;
+            for (const current of types) {
+                const signature = getNonGenericSignature(current);
                 if (signature) {
                     if (!signatureList) {
                         // This signature will contribute to contextual union signature
@@ -7198,7 +7404,7 @@ namespace ts {
         // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
         // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
         function isAssignmentTarget(node: Node): boolean {
-            let parent = node.parent;
+            const parent = node.parent;
             if (parent.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>parent).operatorToken.kind === SyntaxKind.EqualsToken && (<BinaryExpression>parent).left === node) {
                 return true;
             }
@@ -7218,7 +7424,7 @@ namespace ts {
             // with this type. It is neither affected by it, nor does it propagate it to its operand.
             // So the fact that contextualMapper is passed is not important, because the operand of a spread
             // element is not contextually typed.
-            let arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
+            const arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
         }
 
@@ -7228,11 +7434,11 @@ namespace ts {
         }
 
         function checkArrayLiteral(node: ArrayLiteralExpression, contextualMapper?: TypeMapper): Type {
-            let elements = node.elements;
+            const elements = node.elements;
             let hasSpreadElement = false;
-            let elementTypes: Type[] = [];
-            let inDestructuringPattern = isAssignmentTarget(node);
-            for (let e of elements) {
+            const elementTypes: Type[] = [];
+            const inDestructuringPattern = isAssignmentTarget(node);
+            for (const e of elements) {
                 if (inDestructuringPattern && e.kind === SyntaxKind.SpreadElementExpression) {
                     // Given the following situation:
                     //    var c: {};
@@ -7246,15 +7452,15 @@ namespace ts {
                     // get the contextual element type from it. So we do something similar to
                     // getContextualTypeForElementExpression, which will crucially not error
                     // if there is no index type / iterated type.
-                    let restArrayType = checkExpression((<SpreadElementExpression>e).expression, contextualMapper);
-                    let restElementType = getIndexTypeOfType(restArrayType, IndexKind.Number) ||
+                    const restArrayType = checkExpression((<SpreadElementExpression>e).expression, contextualMapper);
+                    const restElementType = getIndexTypeOfType(restArrayType, IndexKind.Number) ||
                         (languageVersion >= ScriptTarget.ES6 ? getElementTypeOfIterable(restArrayType, /*errorNode*/ undefined) : undefined);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
                 }
                 else {
-                    let type = checkExpression(e, contextualMapper);
+                    const type = checkExpression(e, contextualMapper);
                     elementTypes.push(type);
                 }
                 hasSpreadElement = hasSpreadElement || e.kind === SyntaxKind.SpreadElementExpression;
@@ -7263,19 +7469,19 @@ namespace ts {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
                 if (inDestructuringPattern && elementTypes.length) {
-                    let type = createNewTupleType(elementTypes);
+                    const type = createNewTupleType(elementTypes);
                     type.pattern = node;
                     return type;
                 }
-                let contextualType = getContextualType(node);
+                const contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
-                    let pattern = contextualType.pattern;
+                    const pattern = contextualType.pattern;
                     // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
                     // tuple type with the corresponding binding or assignment element types to make the lengths equal.
                     if (pattern && (pattern.kind === SyntaxKind.ArrayBindingPattern || pattern.kind === SyntaxKind.ArrayLiteralExpression)) {
-                        let patternElements = (<BindingPattern | ArrayLiteralExpression>pattern).elements;
+                        const patternElements = (<BindingPattern | ArrayLiteralExpression>pattern).elements;
                         for (let i = elementTypes.length; i < patternElements.length; i++) {
-                            let patternElement = patternElements[i];
+                            const patternElement = patternElements[i];
                             if (hasDefaultValue(patternElement)) {
                                 elementTypes.push((<TupleType>contextualType).elementTypes[i]);
                             }
@@ -7335,7 +7541,7 @@ namespace ts {
         }
 
         function checkComputedPropertyName(node: ComputedPropertyName): Type {
-            let links = getNodeLinks(node.expression);
+            const links = getNodeLinks(node.expression);
             if (!links.resolvedType) {
                 links.resolvedType = checkExpression(node.expression);
 
@@ -7353,18 +7559,19 @@ namespace ts {
         }
 
         function checkObjectLiteral(node: ObjectLiteralExpression, contextualMapper?: TypeMapper): Type {
-            let inDestructuringPattern = isAssignmentTarget(node);
+            const inDestructuringPattern = isAssignmentTarget(node);
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
 
-            let propertiesTable: SymbolTable = {};
-            let propertiesArray: Symbol[] = [];
-            let contextualType = getContextualType(node);
-            let contextualTypeHasPattern = contextualType && contextualType.pattern &&
+            const propertiesTable: SymbolTable = {};
+            const propertiesArray: Symbol[] = [];
+            const contextualType = getApparentTypeOfContextualType(node);
+            const contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
             let typeFlags: TypeFlags = 0;
 
-            for (let memberDecl of node.properties) {
+            let patternWithComputedProperties = false;
+            for (const memberDecl of node.properties) {
                 let member = memberDecl.symbol;
                 if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
                     memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ||
@@ -7381,7 +7588,7 @@ namespace ts {
                         type = checkExpression((<ShorthandPropertyAssignment>memberDecl).name, contextualMapper);
                     }
                     typeFlags |= type.flags;
-                    let prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
+                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
@@ -7391,11 +7598,14 @@ namespace ts {
                         if (isOptional) {
                             prop.flags |= SymbolFlags.Optional;
                         }
+                        if (hasDynamicName(memberDecl)) {
+                            patternWithComputedProperties = true;
+                        }
                     }
-                    else if (contextualTypeHasPattern) {
+                    else if (contextualTypeHasPattern && !(contextualType.flags & TypeFlags.ObjectLiteralPatternWithComputedProperties)) {
                         // If object literal is contextually typed by the implied type of a binding pattern, and if the
                         // binding pattern specifies a default value for the property, make the property optional.
-                        let impliedProp = getPropertyOfType(contextualType, member.name);
+                        const impliedProp = getPropertyOfType(contextualType, member.name);
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & SymbolFlags.Optional;
                         }
@@ -7433,7 +7643,7 @@ namespace ts {
             // If object literal is contextually typed by the implied type of a binding pattern, augment the result
             // type with those properties for which the binding pattern specifies a default value.
             if (contextualTypeHasPattern) {
-                for (let prop of getPropertiesOfType(contextualType)) {
+                for (const prop of getPropertiesOfType(contextualType)) {
                     if (!hasProperty(propertiesTable, prop.name)) {
                         if (!(prop.flags & SymbolFlags.Optional)) {
                             error(prop.valueDeclaration || (<TransientSymbol>prop).bindingElement,
@@ -7445,11 +7655,11 @@ namespace ts {
                 }
             }
 
-            let stringIndexType = getIndexType(IndexKind.String);
-            let numberIndexType = getIndexType(IndexKind.Number);
-            let result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
-            let freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral;
-            result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags);
+            const stringIndexType = getIndexType(IndexKind.String);
+            const numberIndexType = getIndexType(IndexKind.Number);
+            const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral;
+            result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags) | (patternWithComputedProperties ? TypeFlags.ObjectLiteralPatternWithComputedProperties : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
@@ -7457,21 +7667,21 @@ namespace ts {
 
             function getIndexType(kind: IndexKind) {
                 if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    let propTypes: Type[] = [];
+                    const propTypes: Type[] = [];
                     for (let i = 0; i < propertiesArray.length; i++) {
-                        let propertyDecl = node.properties[i];
+                        const propertyDecl = node.properties[i];
                         if (kind === IndexKind.String || isNumericName(propertyDecl.name)) {
                             // Do not call getSymbolOfNode(propertyDecl), as that will get the
                             // original symbol for the node. We actually want to get the symbol
                             // created by checkObjectLiteral, since that will be appropriately
                             // contextually typed and resolved.
-                            let type = getTypeOfSymbol(propertiesArray[i]);
+                            const type = getTypeOfSymbol(propertiesArray[i]);
                             if (!contains(propTypes, type)) {
                                 propTypes.push(type);
                             }
                         }
                     }
-                    let result = propTypes.length ? getUnionType(propTypes) : undefinedType;
+                    const result = propTypes.length ? getUnionType(propTypes) : undefinedType;
                     typeFlags |= result.flags;
                     return result;
                 }
@@ -7511,7 +7721,7 @@ namespace ts {
             }
 
             // Check children
-            for (let child of node.children) {
+            for (const child of node.children) {
                 switch (child.kind) {
                     case SyntaxKind.JsxExpression:
                         checkJsxExpression(<JsxExpression>child);
@@ -7522,9 +7732,6 @@ namespace ts {
                     case SyntaxKind.JsxSelfClosingElement:
                         checkJsxSelfClosingElement(<JsxSelfClosingElement>child);
                         break;
-                    default:
-                        // No checks for JSX Text
-                        Debug.assert(child.kind === SyntaxKind.JsxText);
                 }
             }
 
@@ -7542,7 +7749,7 @@ namespace ts {
         /**
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
-        function isJsxIntrinsicIdentifier(tagName: Identifier|QualifiedName) {
+        function isJsxIntrinsicIdentifier(tagName: Identifier | QualifiedName) {
             if (tagName.kind === SyntaxKind.QualifiedName) {
                 return false;
             }
@@ -7560,11 +7767,11 @@ namespace ts {
                 error(node.parent, Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, getJsxElementPropertiesName());
             }
             else if (elementAttributesType && !isTypeAny(elementAttributesType)) {
-                let correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
+                const correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
                 correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
                 if (isUnhyphenatedJsxName(node.name.text)) {
                     // Maybe there's a string indexer?
-                    let indexerType = getIndexTypeOfType(elementAttributesType, IndexKind.String);
+                    const indexerType = getIndexTypeOfType(elementAttributesType, IndexKind.String);
                     if (indexerType) {
                         correspondingPropType = indexerType;
                     }
@@ -7596,15 +7803,15 @@ namespace ts {
         }
 
         function checkJsxSpreadAttribute(node: JsxSpreadAttribute, elementAttributesType: Type, nameTable: Map<boolean>) {
-            let type = checkExpression(node.expression);
-            let props = getPropertiesOfType(type);
-            for (let prop of props) {
+            const type = checkExpression(node.expression);
+            const props = getPropertiesOfType(type);
+            for (const prop of props) {
                 // Is there a corresponding property in the element attributes type? Skip checking of properties
                 // that have already been assigned to, as these are not actually pushed into the resulting type
                 if (!nameTable[prop.name]) {
-                    let targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
+                    const targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
                     if (targetPropSym) {
-                        let msg = chainDiagnosticMessages(undefined, Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property, prop.name);
+                        const msg = chainDiagnosticMessages(undefined, Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property, prop.name);
                         checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(targetPropSym), node, undefined, msg);
                     }
 
@@ -7628,9 +7835,9 @@ namespace ts {
         /// If this is a class-based tag (otherwise returns undefined), returns the symbol of the class
         /// type or factory function.
         /// Otherwise, returns unknownSymbol.
-        function getJsxElementTagSymbol(node: JsxOpeningLikeElement|JsxClosingElement): Symbol {
-            let flags: JsxFlags = JsxFlags.UnknownElement;
-            let links = getNodeLinks(node);
+        function getJsxElementTagSymbol(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
+            const flags: JsxFlags = JsxFlags.UnknownElement;
+            const links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 if (isJsxIntrinsicIdentifier(node.tagName)) {
                     links.resolvedSymbol = lookupIntrinsicTag(node);
@@ -7641,18 +7848,18 @@ namespace ts {
             }
             return links.resolvedSymbol;
 
-            function lookupIntrinsicTag(node: JsxOpeningLikeElement|JsxClosingElement): Symbol {
-                let intrinsicElementsType = getJsxIntrinsicElementsType();
+            function lookupIntrinsicTag(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
+                const intrinsicElementsType = getJsxIntrinsicElementsType();
                 if (intrinsicElementsType !== unknownType) {
                     // Property case
-                    let intrinsicProp = getPropertyOfType(intrinsicElementsType, (<Identifier>node.tagName).text);
+                    const intrinsicProp = getPropertyOfType(intrinsicElementsType, (<Identifier>node.tagName).text);
                     if (intrinsicProp) {
                         links.jsxFlags |= JsxFlags.IntrinsicNamedElement;
                         return intrinsicProp;
                     }
 
                     // Intrinsic string indexer case
-                    let indexSignatureType = getIndexTypeOfType(intrinsicElementsType, IndexKind.String);
+                    const indexSignatureType = getIndexTypeOfType(intrinsicElementsType, IndexKind.String);
                     if (indexSignatureType) {
                         links.jsxFlags |= JsxFlags.IntrinsicIndexedElement;
                         return intrinsicElementsType.symbol;
@@ -7669,8 +7876,8 @@ namespace ts {
                 }
             }
 
-            function lookupClassTag(node: JsxOpeningLikeElement|JsxClosingElement): Symbol {
-                let valueSymbol: Symbol = resolveJsxTagName(node);
+            function lookupClassTag(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
+                const valueSymbol: Symbol = resolveJsxTagName(node);
 
                 // Look up the value in the current scope
                 if (valueSymbol && valueSymbol !== unknownSymbol) {
@@ -7683,10 +7890,10 @@ namespace ts {
                 return valueSymbol || unknownSymbol;
             }
 
-            function resolveJsxTagName(node: JsxOpeningLikeElement|JsxClosingElement): Symbol {
+            function resolveJsxTagName(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
                 if (node.tagName.kind === SyntaxKind.Identifier) {
-                    let tag = <Identifier>node.tagName;
-                    let sym = getResolvedSymbol(tag);
+                    const tag = <Identifier>node.tagName;
+                    const sym = getResolvedSymbol(tag);
                     return sym.exportSymbol || sym;
                 }
                 else {
@@ -7705,13 +7912,13 @@ namespace ts {
             // line shouldn't be hit.
             Debug.assert(!!(getNodeLinks(node).jsxFlags & JsxFlags.ClassElement), "Should not call getJsxElementInstanceType on non-class Element");
 
-            let classSymbol = getJsxElementTagSymbol(node);
+            const classSymbol = getJsxElementTagSymbol(node);
             if (classSymbol === unknownSymbol) {
                 // Couldn't find the class instance type. Error has already been issued
                 return anyType;
             }
 
-            let valueType = getTypeOfSymbol(classSymbol);
+            const valueType = getTypeOfSymbol(classSymbol);
             if (isTypeAny(valueType)) {
                 // Short-circuit if the class tag is using an element type 'any'
                 return anyType;
@@ -7730,10 +7937,10 @@ namespace ts {
                 }
             }
 
-            let returnType = getUnionType(signatures.map(getReturnTypeOfSignature));
+            const returnType = getUnionType(signatures.map(getReturnTypeOfSignature));
 
             // Issue an error if this return type isn't assignable to JSX.ElementClass
-            let elemClassType = getJsxGlobalElementClassType();
+            const elemClassType = getJsxGlobalElementClassType();
             if (elemClassType) {
                 checkTypeRelatedTo(returnType, elemClassType, assignableRelation, node, Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
             }
@@ -7748,13 +7955,13 @@ namespace ts {
         ///     non-instrinsic elements' attributes type is the element instance type)
         function getJsxElementPropertiesName() {
             // JSX
-            let jsxNamespace = getGlobalSymbol(JsxNames.JSX, SymbolFlags.Namespace, /*diagnosticMessage*/undefined);
+            const jsxNamespace = getGlobalSymbol(JsxNames.JSX, SymbolFlags.Namespace, /*diagnosticMessage*/undefined);
             // JSX.ElementAttributesProperty [symbol]
-            let attribsPropTypeSym = jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.ElementAttributesPropertyNameContainer, SymbolFlags.Type);
+            const attribsPropTypeSym = jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.ElementAttributesPropertyNameContainer, SymbolFlags.Type);
             // JSX.ElementAttributesProperty [type]
-            let attribPropType = attribsPropTypeSym && getDeclaredTypeOfSymbol(attribsPropTypeSym);
+            const attribPropType = attribsPropTypeSym && getDeclaredTypeOfSymbol(attribsPropTypeSym);
             // The properites of JSX.ElementAttributesProperty
-            let attribProperties = attribPropType && getPropertiesOfType(attribPropType);
+            const attribProperties = attribPropType && getPropertiesOfType(attribPropType);
 
             if (attribProperties) {
                 // Element Attributes has zero properties, so the element attributes type will be the class instance type
@@ -7783,18 +7990,18 @@ namespace ts {
          * us which attributes are valid on a given element.
          */
         function getJsxElementAttributesType(node: JsxOpeningLikeElement): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedJsxType) {
-                let sym = getJsxElementTagSymbol(node);
+                const sym = getJsxElementTagSymbol(node);
 
                 if (links.jsxFlags & JsxFlags.ClassElement) {
-                    let elemInstanceType = getJsxElementInstanceType(node);
+                    const elemInstanceType = getJsxElementInstanceType(node);
 
                     if (isTypeAny(elemInstanceType)) {
                         return links.resolvedJsxType = elemInstanceType;
                     }
 
-                    let propsName = getJsxElementPropertiesName();
+                    const propsName = getJsxElementPropertiesName();
                     if (propsName === undefined) {
                         // There is no type ElementAttributesProperty, return 'any'
                         return links.resolvedJsxType = anyType;
@@ -7804,7 +8011,7 @@ namespace ts {
                         return links.resolvedJsxType = elemInstanceType;
                     }
                     else {
-                        let attributesType = getTypeOfPropertyOfType(elemInstanceType, propsName);
+                        const attributesType = getTypeOfPropertyOfType(elemInstanceType, propsName);
 
                         if (!attributesType) {
                             // There is no property named 'props' on this instance type
@@ -7843,12 +8050,11 @@ namespace ts {
          * that have no matching element attributes type property.
          */
         function getJsxAttributePropertySymbol(attrib: JsxAttribute): Symbol {
-            let attributesType = getJsxElementAttributesType(<JsxOpeningElement>attrib.parent);
-            let prop = getPropertyOfType(attributesType, attrib.name.text);
+            const attributesType = getJsxElementAttributesType(<JsxOpeningElement>attrib.parent);
+            const prop = getPropertyOfType(attributesType, attrib.name.text);
             return prop || unknownSymbol;
         }
 
-        let jsxElementClassType: Type = undefined;
         function getJsxGlobalElementClassType(): Type {
             if (!jsxElementClassType) {
                 jsxElementClassType = getExportedTypeFromNamespace(JsxNames.JSX, JsxNames.ElementClass);
@@ -7858,7 +8064,7 @@ namespace ts {
 
         /// Returns all the properties of the Jsx.IntrinsicElements interface
         function getJsxIntrinsicTagNames(): Symbol[] {
-            let intrinsics = getJsxIntrinsicElementsType();
+            const intrinsics = getJsxIntrinsicElementsType();
             return intrinsics ? getPropertiesOfType(intrinsics) : emptyArray;
         }
 
@@ -7883,15 +8089,15 @@ namespace ts {
             // be marked as 'used' so we don't incorrectly elide its import. And if there
             // is no 'React' symbol in scope, we should issue an error.
             if (compilerOptions.jsx === JsxEmit.React) {
-                let reactSym = resolveName(node.tagName, "React", SymbolFlags.Value, Diagnostics.Cannot_find_name_0, "React");
+                const reactSym = resolveName(node.tagName, "React", SymbolFlags.Value, Diagnostics.Cannot_find_name_0, "React");
                 if (reactSym) {
                     getSymbolLinks(reactSym).referenced = true;
                 }
             }
 
-            let targetAttributesType = getJsxElementAttributesType(node);
+            const targetAttributesType = getJsxElementAttributesType(node);
 
-            let nameTable: Map<boolean> = {};
+            const nameTable: Map<boolean> = {};
             // Process this array in right-to-left order so we know which
             // attributes (mostly from spreads) are being overwritten and
             // thus should have their types ignored
@@ -7902,7 +8108,7 @@ namespace ts {
                 }
                 else {
                     Debug.assert(node.attributes[i].kind === SyntaxKind.JsxSpreadAttribute);
-                    let spreadType = checkJsxSpreadAttribute(<JsxSpreadAttribute>(node.attributes[i]), targetAttributesType, nameTable);
+                    const spreadType = checkJsxSpreadAttribute(<JsxSpreadAttribute>(node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
                     }
@@ -7912,7 +8118,7 @@ namespace ts {
             // Check that all required properties have been provided. If an 'any'
             // was spreaded in, though, assume that it provided all required properties
             if (targetAttributesType && !sawSpreadedAny) {
-                let targetProperties = getPropertiesOfType(targetAttributesType);
+                const targetProperties = getPropertiesOfType(targetAttributesType);
                 for (let i = 0; i < targetProperties.length; i++) {
                     if (!(targetProperties[i].flags & SymbolFlags.Optional) &&
                         nameTable[targetProperties[i].name] === undefined) {
@@ -7951,11 +8157,11 @@ namespace ts {
          * @param prop The symbol for the right hand side of the property access.
          */
         function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
-            let flags = getDeclarationFlagsFromSymbol(prop);
-            let declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(prop.parent);
+            const flags = getDeclarationFlagsFromSymbol(prop);
+            const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(prop.parent);
 
             if (left.kind === SyntaxKind.SuperKeyword) {
-                let errorNode = node.kind === SyntaxKind.PropertyAccessExpression ?
+                const errorNode = node.kind === SyntaxKind.PropertyAccessExpression ?
                     (<PropertyAccessExpression>node).name :
                     (<QualifiedName>node).right;
 
@@ -7992,9 +8198,9 @@ namespace ts {
 
             // Property is known to be private or protected at this point
             // Get the declaring and enclosing class instance types
-            let enclosingClassDeclaration = getContainingClass(node);
+            const enclosingClassDeclaration = getContainingClass(node);
 
-            let enclosingClass = enclosingClassDeclaration ? <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
+            const enclosingClass = enclosingClassDeclaration ? <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
 
             // Private property is accessible if declaring and enclosing class are the same
             if (flags & NodeFlags.Private) {
@@ -8043,17 +8249,17 @@ namespace ts {
         }
 
         function checkPropertyAccessExpressionOrQualifiedName(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, right: Identifier) {
-            let type = checkExpression(left);
+            const type = checkExpression(left);
             if (isTypeAny(type)) {
                 return type;
             }
 
-            let apparentType = getApparentType(getWidenedType(type));
+            const apparentType = getApparentType(getWidenedType(type));
             if (apparentType === unknownType) {
                 // handle cases when type is Type parameter with invalid constraint
                 return unknownType;
             }
-            let prop = getPropertyOfType(apparentType, right.text);
+            const prop = getPropertyOfType(apparentType, right.text);
             if (!prop) {
                 if (right.text) {
                     error(right, Diagnostics.Property_0_does_not_exist_on_type_1, declarationNameToString(right), typeToString(type.flags & TypeFlags.ThisType ? apparentType : type));
@@ -8070,13 +8276,13 @@ namespace ts {
         }
 
         function isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean {
-            let left = node.kind === SyntaxKind.PropertyAccessExpression
+            const left = node.kind === SyntaxKind.PropertyAccessExpression
                 ? (<PropertyAccessExpression>node).expression
                 : (<QualifiedName>node).left;
 
-            let type = checkExpression(left);
+            const type = checkExpression(left);
             if (type !== unknownType && !isTypeAny(type)) {
-                let prop = getPropertyOfType(getWidenedType(type), propertyName);
+                const prop = getPropertyOfType(getWidenedType(type), propertyName);
                 if (prop && prop.parent && prop.parent.flags & SymbolFlags.Class) {
                     return checkClassPropertyAccess(node, left, type, prop);
                 }
@@ -8087,28 +8293,28 @@ namespace ts {
         function checkIndexedAccess(node: ElementAccessExpression): Type {
             // Grammar checking
             if (!node.argumentExpression) {
-                let sourceFile = getSourceFile(node);
+                const sourceFile = getSourceFile(node);
                 if (node.parent.kind === SyntaxKind.NewExpression && (<NewExpression>node.parent).expression === node) {
-                    let start = skipTrivia(sourceFile.text, node.expression.end);
-                    let end = node.end;
+                    const start = skipTrivia(sourceFile.text, node.expression.end);
+                    const end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
                 }
                 else {
-                    let start = node.end - "]".length;
-                    let end = node.end;
+                    const start = node.end - "]".length;
+                    const end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Expression_expected);
                 }
             }
 
             // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            let objectType = getApparentType(checkExpression(node.expression));
-            let indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            const objectType = getApparentType(checkExpression(node.expression));
+            const indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
 
             if (objectType === unknownType) {
                 return unknownType;
             }
 
-            let isConstEnum = isConstEnumObjectType(objectType);
+            const isConstEnum = isConstEnumObjectType(objectType);
             if (isConstEnum &&
                 (!node.argumentExpression || node.argumentExpression.kind !== SyntaxKind.StringLiteral)) {
                 error(node.argumentExpression, Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
@@ -8126,9 +8332,9 @@ namespace ts {
 
             // See if we can index as a property.
             if (node.argumentExpression) {
-                let name = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
+                const name = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
                 if (name !== undefined) {
-                    let prop = getPropertyOfType(objectType, name);
+                    const prop = getPropertyOfType(objectType, name);
                     if (prop) {
                         getNodeLinks(node).resolvedSymbol = prop;
                         return getTypeOfSymbol(prop);
@@ -8145,14 +8351,14 @@ namespace ts {
 
                 // Try to use a number indexer.
                 if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, TypeFlags.NumberLike)) {
-                    let numberIndexType = getIndexTypeOfType(objectType, IndexKind.Number);
+                    const numberIndexType = getIndexTypeOfType(objectType, IndexKind.Number);
                     if (numberIndexType) {
                         return numberIndexType;
                     }
                 }
 
                 // Try to use string indexing.
-                let stringIndexType = getIndexTypeOfType(objectType, IndexKind.String);
+                const stringIndexType = getIndexTypeOfType(objectType, IndexKind.String);
                 if (stringIndexType) {
                     return stringIndexType;
                 }
@@ -8183,13 +8389,13 @@ namespace ts {
                 return (<LiteralExpression>indexArgumentExpression).text;
             }
             if (indexArgumentExpression.kind === SyntaxKind.ElementAccessExpression || indexArgumentExpression.kind === SyntaxKind.PropertyAccessExpression) {
-                let value = getConstantValue(<ElementAccessExpression | PropertyAccessExpression>indexArgumentExpression);
+                const value = getConstantValue(<ElementAccessExpression | PropertyAccessExpression>indexArgumentExpression);
                 if (value !== undefined) {
                     return value.toString();
                 }
             }
             if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, /*reportError*/ false)) {
-                let rightHandSideName = (<Identifier>(<PropertyAccessExpression>indexArgumentExpression).name).text;
+                const rightHandSideName = (<Identifier>(<PropertyAccessExpression>indexArgumentExpression).name).text;
                 return getPropertyNameForKnownSymbolName(rightHandSideName);
             }
 
@@ -8223,13 +8429,13 @@ namespace ts {
 
             // The name is Symbol.<someName>, so make sure Symbol actually resolves to the
             // global Symbol object
-            let leftHandSide = <Identifier>(<PropertyAccessExpression>expression).expression;
-            let leftHandSideSymbol = getResolvedSymbol(leftHandSide);
+            const leftHandSide = <Identifier>(<PropertyAccessExpression>expression).expression;
+            const leftHandSideSymbol = getResolvedSymbol(leftHandSide);
             if (!leftHandSideSymbol) {
                 return false;
             }
 
-            let globalESSymbol = getGlobalESSymbolConstructorSymbol();
+            const globalESSymbol = getGlobalESSymbolConstructorSymbol();
             if (!globalESSymbol) {
                 // Already errored when we tried to look up the symbol
                 return false;
@@ -8268,7 +8474,7 @@ namespace ts {
         // so order how inherited signatures are processed is still preserved.
         // interface A { (x: string): void }
         // interface B extends A { (x: 'foo'): string }
-        // let b: B;
+        // const b: B;
         // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void]
         function reorderCandidates(signatures: Signature[], result: Signature[]): void {
             let lastParent: Node;
@@ -8278,9 +8484,9 @@ namespace ts {
             let specializedIndex = -1;
             let spliceIndex: number;
             Debug.assert(!result.length);
-            for (let signature of signatures) {
-                let symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                let parent = signature.declaration && signature.declaration.parent;
+            for (const signature of signatures) {
+                const symbol = signature.declaration && getSymbolOfNode(signature.declaration);
+                const parent = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
                     if (lastParent && parent === lastParent) {
                         index++;
@@ -8318,7 +8524,7 @@ namespace ts {
 
         function getSpreadArgumentIndex(args: Expression[]): number {
             for (let i = 0; i < args.length; i++) {
-                let arg = args[i];
+                const arg = args[i];
                 if (arg && arg.kind === SyntaxKind.SpreadElementExpression) {
                     return i;
                 }
@@ -8334,7 +8540,7 @@ namespace ts {
             let spreadArgIndex = -1;
 
             if (node.kind === SyntaxKind.TaggedTemplateExpression) {
-                let tagExpression = <TaggedTemplateExpression>node;
+                const tagExpression = <TaggedTemplateExpression>node;
 
                 // Even if the call is incomplete, we'll have a missing expression as our last argument,
                 // so we can say the count is just the arg list length
@@ -8344,8 +8550,8 @@ namespace ts {
                 if (tagExpression.template.kind === SyntaxKind.TemplateExpression) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
-                    let templateExpression = <TemplateExpression>tagExpression.template;
-                    let lastSpan = lastOrUndefined(templateExpression.templateSpans);
+                    const templateExpression = <TemplateExpression>tagExpression.template;
+                    const lastSpan = lastOrUndefined(templateExpression.templateSpans);
                     Debug.assert(lastSpan !== undefined); // we should always have at least one span.
                     callIsIncomplete = nodeIsMissing(lastSpan.literal) || !!lastSpan.literal.isUnterminated;
                 }
@@ -8353,7 +8559,7 @@ namespace ts {
                     // If the template didn't end in a backtick, or its beginning occurred right prior to EOF,
                     // then this might actually turn out to be a TemplateHead in the future;
                     // so we consider the call to be incomplete.
-                    let templateLiteral = <LiteralExpression>tagExpression.template;
+                    const templateLiteral = <LiteralExpression>tagExpression.template;
                     Debug.assert(templateLiteral.kind === SyntaxKind.NoSubstitutionTemplateLiteral);
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
@@ -8364,7 +8570,7 @@ namespace ts {
                 adjustedArgCount = getEffectiveArgumentCount(node, /*args*/ undefined, signature);
             }
             else {
-                let callExpression = <CallExpression>node;
+                const callExpression = <CallExpression>node;
                 if (!callExpression.arguments) {
                     // This only happens when we have something of the form: 'new C'
                     Debug.assert(callExpression.kind === SyntaxKind.NewExpression);
@@ -8384,7 +8590,7 @@ namespace ts {
 
             // If the user supplied type arguments, but the number of type arguments does not match
             // the declared number of type parameters, the call has an incorrect arity.
-            let hasRightNumberOfTypeArgs = !typeArguments ||
+            const hasRightNumberOfTypeArgs = !typeArguments ||
                 (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
             if (!hasRightNumberOfTypeArgs) {
                 return false;
@@ -8393,7 +8599,7 @@ namespace ts {
             // If spread arguments are present, check that they correspond to a rest parameter. If so, no
             // further checking is necessary.
             if (spreadArgIndex >= 0) {
-                return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
+                return isRestParameterIndex(signature, spreadArgIndex);
             }
 
             // Too many arguments implies incorrect arity.
@@ -8402,14 +8608,14 @@ namespace ts {
             }
 
             // If the call is incomplete, we should skip the lower bound check.
-            let hasEnoughArguments = adjustedArgCount >= signature.minArgumentCount;
+            const hasEnoughArguments = adjustedArgCount >= signature.minArgumentCount;
             return callIsIncomplete || hasEnoughArguments;
         }
 
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type: Type): Signature {
             if (type.flags & TypeFlags.ObjectType) {
-                let resolved = resolveStructuredTypeMembers(<ObjectType>type);
+                const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
                     return resolved.callSignatures[0];
@@ -8420,7 +8626,7 @@ namespace ts {
 
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
         function instantiateSignatureInContextOf(signature: Signature, contextualSignature: Signature, contextualMapper: TypeMapper): Signature {
-            let context = createInferenceContext(signature.typeParameters, /*inferUnionTypes*/ true);
+            const context = createInferenceContext(signature.typeParameters, /*inferUnionTypes*/ true);
             forEachMatchingParameterType(contextualSignature, signature, (source, target) => {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context, instantiateType(source, contextualMapper), target);
@@ -8429,8 +8635,8 @@ namespace ts {
         }
 
         function inferTypeArguments(node: CallLikeExpression, signature: Signature, args: Expression[], excludeArgument: boolean[], context: InferenceContext): void {
-            let typeParameters = signature.typeParameters;
-            let inferenceMapper = createInferenceMapper(context);
+            const typeParameters = signature.typeParameters;
+            const inferenceMapper = createInferenceMapper(context);
 
             // Clear out all the inference results from the last time inferTypeArguments was called on this context
             for (let i = 0; i < typeParameters.length; i++) {
@@ -8456,12 +8662,12 @@ namespace ts {
 
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
             // wildcards for all context sensitive function expressions.
-            let argCount = getEffectiveArgumentCount(node, args, signature);
+            const argCount = getEffectiveArgumentCount(node, args, signature);
             for (let i = 0; i < argCount; i++) {
-                let arg = getEffectiveArgument(node, args, i);
+                const arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
                 if (arg === undefined || arg.kind !== SyntaxKind.OmittedExpression) {
-                    let paramType = getTypeAtPosition(signature, i);
+                    const paramType = getTypeAtPosition(signature, i);
                     let argType = getEffectiveArgumentType(node, i, arg);
 
                     // If the effective argument type is 'undefined', there is no synthetic type
@@ -8469,7 +8675,7 @@ namespace ts {
                     if (argType === undefined) {
                         // For context sensitive arguments we pass the identityMapper, which is a signal to treat all
                         // context sensitive function expressions as wildcards
-                        let mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : inferenceMapper;
+                        const mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : inferenceMapper;
                         argType = checkExpressionWithContextualType(arg, paramType, mapper);
                     }
 
@@ -8486,8 +8692,8 @@ namespace ts {
                 for (let i = 0; i < argCount; i++) {
                     // No need to check for omitted args and template expressions, their exlusion value is always undefined
                     if (excludeArgument[i] === false) {
-                        let arg = args[i];
-                        let paramType = getTypeAtPosition(signature, i);
+                        const arg = args[i];
+                        const paramType = getTypeAtPosition(signature, i);
                         inferTypes(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
                     }
                 }
@@ -8497,15 +8703,15 @@ namespace ts {
         }
 
         function checkTypeArguments(signature: Signature, typeArguments: TypeNode[], typeArgumentResultTypes: Type[], reportErrors: boolean, headMessage?: DiagnosticMessage): boolean {
-            let typeParameters = signature.typeParameters;
+            const typeParameters = signature.typeParameters;
             let typeArgumentsAreAssignable = true;
             for (let i = 0; i < typeParameters.length; i++) {
-                let typeArgNode = typeArguments[i];
-                let typeArgument = getTypeFromTypeNode(typeArgNode);
+                const typeArgNode = typeArguments[i];
+                const typeArgument = getTypeFromTypeNode(typeArgNode);
                 // Do not push on this array! It has a preallocated length
                 typeArgumentResultTypes[i] = typeArgument;
                 if (typeArgumentsAreAssignable /* so far */) {
-                    let constraint = getConstraintOfTypeParameter(typeParameters[i]);
+                    const constraint = getConstraintOfTypeParameter(typeParameters[i]);
                     if (constraint) {
                         let errorInfo: DiagnosticMessageChain;
                         let typeArgumentHeadMessage = Diagnostics.Type_0_does_not_satisfy_the_constraint_1;
@@ -8528,13 +8734,13 @@ namespace ts {
         }
 
         function checkApplicableSignature(node: CallLikeExpression, args: Expression[], signature: Signature, relation: Map<RelationComparisonResult>, excludeArgument: boolean[], reportErrors: boolean) {
-            let argCount = getEffectiveArgumentCount(node, args, signature);
+            const argCount = getEffectiveArgumentCount(node, args, signature);
             for (let i = 0; i < argCount; i++) {
-                let arg = getEffectiveArgument(node, args, i);
+                const arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
                 if (arg === undefined || arg.kind !== SyntaxKind.OmittedExpression) {
                     // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
-                    let paramType = getTypeAtPosition(signature, i);
+                    const paramType = getTypeAtPosition(signature, i);
                     let argType = getEffectiveArgumentType(node, i, arg);
 
                     // If the effective argument type is 'undefined', there is no synthetic type
@@ -8546,8 +8752,8 @@ namespace ts {
                     }
 
                     // Use argument expression as error location when reporting errors
-                    let errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    let headMessage = Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
+                    const errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
+                    const headMessage = Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
                     if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
                         return false;
                     }
@@ -8569,7 +8775,7 @@ namespace ts {
         function getEffectiveCallArguments(node: CallLikeExpression): Expression[] {
             let args: Expression[];
             if (node.kind === SyntaxKind.TaggedTemplateExpression) {
-                let template = (<TaggedTemplateExpression>node).template;
+                const template = (<TaggedTemplateExpression>node).template;
                 args = [undefined];
                 if (template.kind === SyntaxKind.TemplateExpression) {
                     forEach((<TemplateExpression>template).templateSpans, span => {
@@ -8661,7 +8867,7 @@ namespace ts {
             if (node.kind === SyntaxKind.ClassDeclaration) {
                 // For a class decorator, the `target` is the type of the class (e.g. the
                 // "static" or "constructor" side of the class)
-                let classSymbol = getSymbolOfNode(node);
+                const classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
 
@@ -8670,7 +8876,7 @@ namespace ts {
                 // parameter's containing method.
                 node = node.parent;
                 if (node.kind === SyntaxKind.Constructor) {
-                    let classSymbol = getSymbolOfNode(node);
+                    const classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
@@ -8731,7 +8937,7 @@ namespace ts {
                 // string literal type if the member name is an identifier, number, or string;
                 // otherwise, if the member name is a computed property name it will
                 // be either string or symbol.
-                let element = <ClassElement>node;
+                const element = <ClassElement>node;
                 switch (element.name.kind) {
                     case SyntaxKind.Identifier:
                     case SyntaxKind.NumericLiteral:
@@ -8739,7 +8945,7 @@ namespace ts {
                         return getStringLiteralType(<StringLiteral>element.name);
 
                     case SyntaxKind.ComputedPropertyName:
-                        let nameType = checkComputedPropertyName(<ComputedPropertyName>element.name);
+                        const nameType = checkComputedPropertyName(<ComputedPropertyName>element.name);
                         if (allConstituentTypesHaveKind(nameType, TypeFlags.ESSymbol)) {
                             return nameType;
                         }
@@ -8787,7 +8993,7 @@ namespace ts {
                 node.kind === SyntaxKind.SetAccessor) {
                 // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
                 // for the type of the member.
-                let propertyType = getTypeOfNode(node);
+                const propertyType = getTypeOfNode(node);
                 return createTypedPropertyDescriptorType(propertyType);
             }
 
@@ -8863,8 +9069,8 @@ namespace ts {
         }
 
         function resolveCall(node: CallLikeExpression, signatures: Signature[], candidatesOutArray: Signature[], headMessage?: DiagnosticMessage): Signature {
-            let isTaggedTemplate = node.kind === SyntaxKind.TaggedTemplateExpression;
-            let isDecorator = node.kind === SyntaxKind.Decorator;
+            const isTaggedTemplate = node.kind === SyntaxKind.TaggedTemplateExpression;
+            const isDecorator = node.kind === SyntaxKind.Decorator;
 
             let typeArguments: TypeNode[];
 
@@ -8877,7 +9083,7 @@ namespace ts {
                 }
             }
 
-            let candidates = candidatesOutArray || [];
+            const candidates = candidatesOutArray || [];
             // reorderCandidates fills up the candidates array directly
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
@@ -8885,7 +9091,7 @@ namespace ts {
                 return resolveErrorCall(node);
             }
 
-            let args = getEffectiveCallArguments(node);
+            const args = getEffectiveCallArguments(node);
 
             // The following applies to any value of 'excludeArgument[i]':
             //    - true:      the argument at 'i' is susceptible to a one-time permanent contextual typing.
@@ -8983,8 +9189,8 @@ namespace ts {
                 }
                 else {
                     Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
-                    let failedTypeParameter = candidateForTypeArgumentError.typeParameters[resultOfFailedInference.failedTypeParameterIndex];
-                    let inferenceCandidates = getInferenceCandidates(resultOfFailedInference, resultOfFailedInference.failedTypeParameterIndex);
+                    const failedTypeParameter = candidateForTypeArgumentError.typeParameters[resultOfFailedInference.failedTypeParameterIndex];
+                    const inferenceCandidates = getInferenceCandidates(resultOfFailedInference, resultOfFailedInference.failedTypeParameterIndex);
 
                     let diagnosticChainHead = chainDiagnosticMessages(/*details*/ undefined, // details will be provided by call to reportNoCommonSupertypeError
                         Diagnostics.The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly,
@@ -9030,14 +9236,14 @@ namespace ts {
             }
 
             function chooseOverload(candidates: Signature[], relation: Map<RelationComparisonResult>) {
-                for (let originalCandidate of candidates) {
+                for (const originalCandidate of candidates) {
                     if (!hasCorrectArity(node, args, originalCandidate)) {
                         continue;
                     }
 
                     let candidate: Signature;
                     let typeArgumentsAreValid: boolean;
-                    let inferenceContext = originalCandidate.typeParameters
+                    const inferenceContext = originalCandidate.typeParameters
                         ? createInferenceContext(originalCandidate.typeParameters, /*inferUnionTypes*/ false)
                         : undefined;
 
@@ -9062,7 +9268,7 @@ namespace ts {
                         if (!checkApplicableSignature(node, args, candidate, relation, excludeArgument, /*reportErrors*/ false)) {
                             break;
                         }
-                        let index = excludeArgument ? indexOf(excludeArgument, true) : -1;
+                        const index = excludeArgument ? indexOf(excludeArgument, true) : -1;
                         if (index < 0) {
                             return candidate;
                         }
@@ -9075,7 +9281,7 @@ namespace ts {
                     // report an error based on the arguments. If there was an issue with type
                     // arguments, then we can only report an error based on the type arguments.
                     if (originalCandidate.typeParameters) {
-                        let instantiatedCandidate = candidate;
+                        const instantiatedCandidate = candidate;
                         if (typeArgumentsAreValid) {
                             candidateForArgumentError = instantiatedCandidate;
                         }
@@ -9099,19 +9305,19 @@ namespace ts {
 
         function resolveCallExpression(node: CallExpression, candidatesOutArray: Signature[]): Signature {
             if (node.expression.kind === SyntaxKind.SuperKeyword) {
-                let superType = checkSuperExpression(node.expression);
+                const superType = checkSuperExpression(node.expression);
                 if (superType !== unknownType) {
                     // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
                     // with the type arguments specified in the extends clause.
-                    let baseTypeNode = getClassExtendsHeritageClauseElement(getContainingClass(node));
-                    let baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                    const baseTypeNode = getClassExtendsHeritageClauseElement(getContainingClass(node));
+                    const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
                     return resolveCall(node, baseConstructors, candidatesOutArray);
                 }
                 return resolveUntypedCall(node);
             }
 
-            let funcType = checkExpression(node.expression);
-            let apparentType = getApparentType(funcType);
+            const funcType = checkExpression(node.expression);
+            const apparentType = getApparentType(funcType);
 
             if (apparentType === unknownType) {
                 // Another error has already been reported
@@ -9122,9 +9328,9 @@ namespace ts {
             // but we are not including call signatures that may have been added to the Object or
             // Function interface, since they have none by default. This is a bit of a leap of faith
             // that the user will not add any.
-            let callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+            const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
 
-            let constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
+            const constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
             // TS 1.0 spec: 4.12
             // If FuncExpr is of type Any, or of an object type that has no call or construct signatures
             // but is a subtype of the Function interface, the call is an untyped function call. In an
@@ -9157,7 +9363,7 @@ namespace ts {
 
         function resolveNewExpression(node: NewExpression, candidatesOutArray: Signature[]): Signature {
             if (node.arguments && languageVersion < ScriptTarget.ES5) {
-                let spreadIndex = getSpreadArgumentIndex(node.arguments);
+                const spreadIndex = getSpreadArgumentIndex(node.arguments);
                 if (spreadIndex >= 0) {
                     error(node.arguments[spreadIndex], Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
                 }
@@ -9180,7 +9386,7 @@ namespace ts {
             // Note, only class declarations can be declared abstract.
             // In the case of a merged class-module or class-interface declaration,
             // only the class declaration node will have the Abstract flag set.
-            let valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
+            const valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
             if (valueDecl && valueDecl.flags & NodeFlags.Abstract) {
                 error(node, Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, declarationNameToString(valueDecl.name));
                 return resolveErrorCall(node);
@@ -9200,7 +9406,7 @@ namespace ts {
             // but we are not including construct signatures that may have been added to the Object or
             // Function interface, since they have none by default. This is a bit of a leap of faith
             // that the user will not add any.
-            let constructSignatures = getSignaturesOfType(expressionType, SignatureKind.Construct);
+            const constructSignatures = getSignaturesOfType(expressionType, SignatureKind.Construct);
             if (constructSignatures.length) {
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
@@ -9209,9 +9415,9 @@ namespace ts {
             // one or more call signatures, the expression is processed as a function call. A compile-time
             // error occurs if the result of the function call is not Void. The type of the result of the
             // operation is Any.
-            let callSignatures = getSignaturesOfType(expressionType, SignatureKind.Call);
+            const callSignatures = getSignaturesOfType(expressionType, SignatureKind.Call);
             if (callSignatures.length) {
-                let signature = resolveCall(node, callSignatures, candidatesOutArray);
+                const signature = resolveCall(node, callSignatures, candidatesOutArray);
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
@@ -9223,15 +9429,15 @@ namespace ts {
         }
 
         function resolveTaggedTemplateExpression(node: TaggedTemplateExpression, candidatesOutArray: Signature[]): Signature {
-            let tagType = checkExpression(node.tag);
-            let apparentType = getApparentType(tagType);
+            const tagType = checkExpression(node.tag);
+            const apparentType = getApparentType(tagType);
 
             if (apparentType === unknownType) {
                 // Another error has already been reported
                 return resolveErrorCall(node);
             }
 
-            let callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+            const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
 
             if (isTypeAny(tagType) || (!callSignatures.length && !(tagType.flags & TypeFlags.Union) && isTypeAssignableTo(tagType, globalFunctionType))) {
                 return resolveUntypedCall(node);
@@ -9271,18 +9477,18 @@ namespace ts {
           * Resolves a decorator as if it were a call expression.
           */
         function resolveDecorator(node: Decorator, candidatesOutArray: Signature[]): Signature {
-            let funcType = checkExpression(node.expression);
-            let apparentType = getApparentType(funcType);
+            const funcType = checkExpression(node.expression);
+            const apparentType = getApparentType(funcType);
             if (apparentType === unknownType) {
                 return resolveErrorCall(node);
             }
 
-            let callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+            const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
             if (funcType === anyType || (!callSignatures.length && !(funcType.flags & TypeFlags.Union) && isTypeAssignableTo(funcType, globalFunctionType))) {
                 return resolveUntypedCall(node);
             }
 
-            let headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
+            const headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
                 let errorInfo: DiagnosticMessageChain;
                 errorInfo = chainDiagnosticMessages(errorInfo, Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
@@ -9297,7 +9503,7 @@ namespace ts {
         // candidatesOutArray is passed by signature help in the language service, and collectCandidates
         // must fill it up with the appropriate candidate signatures
         function getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[]): Signature {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             // If getResolvedSignature has already been called, we will have cached the resolvedSignature.
             // However, it is possible that either candidatesOutArray was not passed in the first time,
             // or that a different candidatesOutArray was passed in. Therefore, we need to redo the work
@@ -9333,12 +9539,12 @@ namespace ts {
             // Grammar checking; stop grammar-checking if checkGrammarTypeArguments return true
             checkGrammarTypeArguments(node, node.typeArguments) || checkGrammarArguments(node, node.arguments);
 
-            let signature = getResolvedSignature(node);
+            const signature = getResolvedSignature(node);
             if (node.expression.kind === SyntaxKind.SuperKeyword) {
                 return voidType;
             }
             if (node.kind === SyntaxKind.NewExpression) {
-                let declaration = signature.declaration;
+                const declaration = signature.declaration;
 
                 if (declaration &&
                     declaration.kind !== SyntaxKind.Constructor &&
@@ -9352,6 +9558,12 @@ namespace ts {
                     return anyType;
                 }
             }
+
+            // In JavaScript files, calls to any identifier 'require' are treated as external module imports
+            if (isInJavaScriptFile(node) && isRequireCall(node)) {
+                return resolveExternalModuleTypeByLiteral(<StringLiteral>node.arguments[0]);
+            }
+
             return getReturnTypeOfSignature(signature);
         }
 
@@ -9360,11 +9572,16 @@ namespace ts {
         }
 
         function checkAssertion(node: AssertionExpression) {
-            let exprType = getRegularTypeOfObjectLiteral(checkExpression(node.expression));
-            let targetType = getTypeFromTypeNode(node.type);
+            const exprType = getRegularTypeOfObjectLiteral(checkExpression(node.expression));
+            const targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
-                let widenedType = getWidenedType(exprType);
-                if (!(isTypeAssignableTo(targetType, widenedType))) {
+                const widenedType = getWidenedType(exprType);
+
+                // Permit 'number[] | "foo"' to be asserted to 'string'.
+                const bothAreStringLike =
+                    someConstituentTypeHasKind(targetType, TypeFlags.StringLike) &&
+                        someConstituentTypeHasKind(widenedType, TypeFlags.StringLike);
+                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
                     checkTypeAssignableTo(exprType, targetType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
                 }
             }
@@ -9378,15 +9595,15 @@ namespace ts {
         }
 
         function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) {
-            let len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
+            const len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (let i = 0; i < len; i++) {
-                let parameter = signature.parameters[i];
-                let contextualParameterType = getTypeAtPosition(context, i);
+                const parameter = signature.parameters[i];
+                const contextualParameterType = getTypeAtPosition(context, i);
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
             }
-            if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
-                let parameter = lastOrUndefined(signature.parameters);
-                let contextualParameterType = getTypeOfSymbol(lastOrUndefined(context.parameters));
+            if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
+                const parameter = lastOrUndefined(signature.parameters);
+                const contextualParameterType = getTypeOfSymbol(lastOrUndefined(context.parameters));
                 assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
             }
         }
@@ -9395,9 +9612,11 @@ namespace ts {
         // the destructured type into the contained binding elements.
         function assignBindingElementTypes(node: VariableLikeDeclaration) {
             if (isBindingPattern(node.name)) {
-                for (let element of (<BindingPattern>node.name).elements) {
+                for (const element of (<BindingPattern>node.name).elements) {
                     if (element.kind !== SyntaxKind.OmittedExpression) {
-                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        if (element.name.kind === SyntaxKind.Identifier) {
+                            getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        }
                         assignBindingElementTypes(element);
                     }
                 }
@@ -9405,7 +9624,7 @@ namespace ts {
         }
 
         function assignTypeToParameterAndFixTypeParameters(parameter: Symbol, contextualType: Type, mapper: TypeMapper) {
-            let links = getSymbolLinks(parameter);
+            const links = getSymbolLinks(parameter);
             if (!links.type) {
                 links.type = instantiateType(contextualType, mapper);
                 assignBindingElementTypes(<ParameterDeclaration>parameter.valueDeclaration);
@@ -9446,7 +9665,7 @@ namespace ts {
 
         function createPromiseType(promisedType: Type): Type {
             // creates a `Promise<T>` type where `T` is the promisedType argument
-            let globalPromiseType = getGlobalPromiseType();
+            const globalPromiseType = getGlobalPromiseType();
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
                 promisedType = getAwaitedType(promisedType);
@@ -9457,12 +9676,12 @@ namespace ts {
         }
 
         function getReturnTypeFromBody(func: FunctionLikeDeclaration, contextualMapper?: TypeMapper): Type {
-            let contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+            const contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
             if (!func.body) {
                 return unknownType;
             }
 
-            let isAsync = isAsyncFunctionLike(func);
+            const isAsync = isAsyncFunctionLike(func);
             let type: Type;
             if (func.body.kind !== SyntaxKind.Block) {
                 type = checkExpressionCached(<Expression>func.body, contextualMapper);
@@ -9476,11 +9695,11 @@ namespace ts {
             }
             else {
                 let types: Type[];
-                let funcIsGenerator = !!func.asteriskToken;
+                const funcIsGenerator = !!func.asteriskToken;
                 if (funcIsGenerator) {
                     types = checkAndAggregateYieldOperandTypes(<Block>func.body, contextualMapper);
                     if (types.length === 0) {
-                        let iterableIteratorAny = createIterableIteratorType(anyType);
+                        const iterableIteratorAny = createIterableIteratorType(anyType);
                         if (compilerOptions.noImplicitAny) {
                             error(func.asteriskToken,
                                 Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
@@ -9493,7 +9712,7 @@ namespace ts {
                     if (types.length === 0) {
                         if (isAsync) {
                             // For an async function, the return type will not be void, but rather a Promise for void.
-                            let promiseType = createPromiseType(voidType);
+                            const promiseType = createPromiseType(voidType);
                             if (promiseType === emptyObjectType) {
                                 error(func, Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
                                 return unknownType;
@@ -9528,12 +9747,12 @@ namespace ts {
                 reportErrorsFromWidening(func, type);
             }
 
-            let widenedType = getWidenedType(type);
+            const widenedType = getWidenedType(type);
             if (isAsync) {
                 // From within an async function you can return either a non-promise value or a promise. Any
                 // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
                 // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-                let promiseType = createPromiseType(widenedType);
+                const promiseType = createPromiseType(widenedType);
                 if (promiseType === emptyObjectType) {
                     error(func, Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
                     return unknownType;
@@ -9547,10 +9766,10 @@ namespace ts {
         }
 
         function checkAndAggregateYieldOperandTypes(body: Block, contextualMapper?: TypeMapper): Type[] {
-            let aggregatedTypes: Type[] = [];
+            const aggregatedTypes: Type[] = [];
 
             forEachYieldExpression(body, yieldExpression => {
-                let expr = yieldExpression.expression;
+                const expr = yieldExpression.expression;
                 if (expr) {
                     let type = checkExpressionCached(expr, contextualMapper);
 
@@ -9569,10 +9788,10 @@ namespace ts {
         }
 
         function checkAndAggregateReturnExpressionTypes(body: Block, contextualMapper?: TypeMapper, isAsync?: boolean): Type[] {
-            let aggregatedTypes: Type[] = [];
+            const aggregatedTypes: Type[] = [];
 
             forEachReturnStatement(body, returnStatement => {
-                let expr = returnStatement.expression;
+                const expr = returnStatement.expression;
                 if (expr) {
                     let type = checkExpressionCached(expr, contextualMapper);
                     if (isAsync) {
@@ -9592,21 +9811,11 @@ namespace ts {
             return aggregatedTypes;
         }
 
-        function bodyContainsAReturnStatement(funcBody: Block) {
-            return forEachReturnStatement(funcBody, returnStatement => {
-                return true;
-            });
-        }
-
-        function bodyContainsSingleThrowStatement(body: Block) {
-            return (body.statements.length === 1) && (body.statements[0].kind === SyntaxKind.ThrowStatement);
-        }
-
         // TypeScript Specification 1.0 (6.3) - July 2014
         // An explicitly typed function whose return type isn't the Void or the Any type
         // must have at least one return statement somewhere in its body.
         // An exception to this rule is if the function implementation consists of a single 'throw' statement.
-        function checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(func: FunctionLikeDeclaration, returnType: Type): void {
+        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func: FunctionLikeDeclaration, returnType: Type): void {
             if (!produceDiagnostics) {
                 return;
             }
@@ -9617,33 +9826,27 @@ namespace ts {
             }
 
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
-            if (nodeIsMissing(func.body) || func.body.kind !== SyntaxKind.Block) {
+            // also if HasImplicitReturnValue flags is not set this means that all codepaths in function body end with return of throw
+            if (nodeIsMissing(func.body) || func.body.kind !== SyntaxKind.Block || !(func.flags & NodeFlags.HasImplicitReturn)) {
                 return;
             }
 
-            let bodyBlock = <Block>func.body;
-
-            // Ensure the body has at least one return expression.
-            if (bodyContainsAReturnStatement(bodyBlock)) {
-                return;
+            if (func.flags & NodeFlags.HasExplicitReturn) {
+                if (compilerOptions.noImplicitReturns) {
+                    error(func.type, Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
-
-            // If there are no return expressions, then we need to check if
-            // the function body consists solely of a throw statement;
-            // this is to make an exception for unimplemented functions.
-            if (bodyContainsSingleThrowStatement(bodyBlock)) {
-                return;
+            else {
+                // This function does not conform to the specification.
+                error(func.type, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-
-            // This function does not conform to the specification.
-            error(func.type, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement);
         }
 
         function checkFunctionExpressionOrObjectLiteralMethod(node: FunctionExpression | MethodDeclaration, contextualMapper?: TypeMapper): Type {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
 
             // Grammar checking
-            let hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
+            const hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
             if (!hasGrammarError && node.kind === SyntaxKind.FunctionExpression) {
                 checkGrammarForGenerator(node);
             }
@@ -9653,34 +9856,34 @@ namespace ts {
                 return anyFunctionType;
             }
 
-            let isAsync = isAsyncFunctionLike(node);
+            const isAsync = isAsyncFunctionLike(node);
             if (isAsync) {
                 emitAwaiter = true;
             }
 
-            let links = getNodeLinks(node);
-            let type = getTypeOfSymbol(node.symbol);
-            let contextSensitive = isContextSensitive(node);
-            let mightFixTypeParameters = contextSensitive && isInferentialContext(contextualMapper);
+            const links = getNodeLinks(node);
+            const type = getTypeOfSymbol(node.symbol);
+            const contextSensitive = isContextSensitive(node);
+            const mightFixTypeParameters = contextSensitive && isInferentialContext(contextualMapper);
 
             // Check if function expression is contextually typed and assign parameter types if so.
             // See the comment in assignTypeToParameterAndFixTypeParameters to understand why we need to
             // check mightFixTypeParameters.
             if (mightFixTypeParameters || !(links.flags & NodeCheckFlags.ContextChecked)) {
-                let contextualSignature = getContextualSignature(node);
+                const contextualSignature = getContextualSignature(node);
                 // If a type check is started at a function expression that is an argument of a function call, obtaining the
                 // contextual type may recursively get back to here during overload resolution of the call. If so, we will have
                 // already assigned contextual types.
-                let contextChecked = !!(links.flags & NodeCheckFlags.ContextChecked);
+                const contextChecked = !!(links.flags & NodeCheckFlags.ContextChecked);
                 if (mightFixTypeParameters || !contextChecked) {
                     links.flags |= NodeCheckFlags.ContextChecked;
                     if (contextualSignature) {
-                        let signature = getSignaturesOfType(type, SignatureKind.Call)[0];
+                        const signature = getSignaturesOfType(type, SignatureKind.Call)[0];
                         if (contextSensitive) {
                             assignContextualParameterTypes(signature, contextualSignature, contextualMapper || identityMapper);
                         }
                         if (mightFixTypeParameters || !node.type && !signature.resolvedReturnType) {
-                            let returnType = getReturnTypeFromBody(node, contextualMapper);
+                            const returnType = getReturnTypeFromBody(node, contextualMapper);
                             if (!signature.resolvedReturnType) {
                                 signature.resolvedReturnType = returnType;
                             }
@@ -9701,22 +9904,22 @@ namespace ts {
             return type;
         }
 
-        function checkFunctionExpressionOrObjectLiteralMethodBody(node: FunctionExpression | MethodDeclaration) {
+        function checkFunctionExpressionOrObjectLiteralMethodBody(node: ArrowFunction | FunctionExpression | MethodDeclaration) {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
 
-            let isAsync = isAsyncFunctionLike(node);
+            const isAsync = isAsyncFunctionLike(node);
             if (isAsync) {
                 emitAwaiter = true;
             }
 
-            let returnType = node.type && getTypeFromTypeNode(node.type);
+            const returnType = node.type && getTypeFromTypeNode(node.type);
             let promisedType: Type;
             if (returnType && isAsync) {
                 promisedType = checkAsyncFunctionReturnType(node);
             }
 
             if (returnType && !node.asteriskToken) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
 
             if (node.body) {
@@ -9738,10 +9941,10 @@ namespace ts {
                     // should not be checking assignability of a promise to the return type. Instead, we need to
                     // check assignability of the awaited type of the expression body against the promised type of
                     // its return type annotation.
-                    let exprType = checkExpression(<Expression>node.body);
+                    const exprType = checkExpression(<Expression>node.body);
                     if (returnType) {
                         if (isAsync) {
-                            let awaitedType = checkAwaitedType(exprType, node.body, Diagnostics.Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member);
+                            const awaitedType = checkAwaitedType(exprType, node.body, Diagnostics.Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member);
                             checkTypeAssignableTo(awaitedType, promisedType, node.body);
                         }
                         else {
@@ -9764,7 +9967,7 @@ namespace ts {
 
         function checkReferenceExpression(n: Node, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean {
             function findSymbol(n: Node): Symbol {
-                let symbol = getNodeLinks(n).resolvedSymbol;
+                const symbol = getNodeLinks(n).resolvedSymbol;
                 // Because we got the symbol from the resolvedSymbol property, it might be of kind
                 // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
                 // symbol, which will have the correct flags set on it.
@@ -9780,14 +9983,14 @@ namespace ts {
                 // All other expression constructs described in this chapter are classified as values.
                 switch (n.kind) {
                     case SyntaxKind.Identifier: {
-                        let symbol = findSymbol(n);
+                        const symbol = findSymbol(n);
                         // TypeScript 1.0 spec (April 2014): 4.3
                         // An identifier expression that references a variable or parameter is classified as a reference.
                         // An identifier expression that references any other kind of entity is classified as a value(and therefore cannot be the target of an assignment).
                         return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & SymbolFlags.Variable) !== 0;
                     }
                     case SyntaxKind.PropertyAccessExpression: {
-                        let symbol = findSymbol(n);
+                        const symbol = findSymbol(n);
                         // TypeScript 1.0 spec (April 2014): 4.10
                         // A property access expression is always classified as a reference.
                         // NOTE (not in spec): assignment to enum members should not be allowed
@@ -9807,15 +10010,15 @@ namespace ts {
                 switch (n.kind) {
                     case SyntaxKind.Identifier:
                     case SyntaxKind.PropertyAccessExpression: {
-                        let symbol = findSymbol(n);
+                        const symbol = findSymbol(n);
                         return symbol && (symbol.flags & SymbolFlags.Variable) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0;
                     }
                     case SyntaxKind.ElementAccessExpression: {
-                        let index = (<ElementAccessExpression>n).argumentExpression;
-                        let symbol = findSymbol((<ElementAccessExpression>n).expression);
+                        const index = (<ElementAccessExpression>n).argumentExpression;
+                        const symbol = findSymbol((<ElementAccessExpression>n).expression);
                         if (symbol && index && index.kind === SyntaxKind.StringLiteral) {
-                            let name = (<LiteralExpression>index).text;
-                            let prop = getPropertyOfType(getTypeOfSymbol(symbol), name);
+                            const name = (<LiteralExpression>index).text;
+                            const prop = getPropertyOfType(getTypeOfSymbol(symbol), name);
                             return prop && (prop.flags & SymbolFlags.Variable) !== 0 && (getDeclarationFlagsFromSymbol(prop) & NodeFlags.Const) !== 0;
                         }
                         return false;
@@ -9867,12 +10070,12 @@ namespace ts {
                 }
             }
 
-            let operandType = checkExpression(node.expression);
+            const operandType = checkExpression(node.expression);
             return checkAwaitedType(operandType, node);
         }
 
         function checkPrefixUnaryExpression(node: PrefixUnaryExpression): Type {
-            let operandType = checkExpression(node.operand);
+            const operandType = checkExpression(node.operand);
             switch (node.operator) {
                 case SyntaxKind.PlusToken:
                 case SyntaxKind.MinusToken:
@@ -9885,7 +10088,7 @@ namespace ts {
                     return booleanType;
                 case SyntaxKind.PlusPlusToken:
                 case SyntaxKind.MinusMinusToken:
-                    let ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    const ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
                         checkReferenceExpression(node.operand,
@@ -9898,8 +10101,8 @@ namespace ts {
         }
 
         function checkPostfixUnaryExpression(node: PostfixUnaryExpression): Type {
-            let operandType = checkExpression(node.operand);
-            let ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            const operandType = checkExpression(node.operand);
+            const ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
                 checkReferenceExpression(node.operand,
@@ -9916,8 +10119,8 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                let types = (<UnionOrIntersectionType>type).types;
-                for (let current of types) {
+                const types = (<UnionOrIntersectionType>type).types;
+                for (const current of types) {
                     if (current.flags & kind) {
                         return true;
                     }
@@ -9933,8 +10136,8 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                let types = (<UnionOrIntersectionType>type).types;
-                for (let current of types) {
+                const types = (<UnionOrIntersectionType>type).types;
+                for (const current of types) {
                     if (!(current.flags & kind)) {
                         return false;
                     }
@@ -9983,22 +10186,30 @@ namespace ts {
         }
 
         function checkObjectLiteralAssignment(node: ObjectLiteralExpression, sourceType: Type, contextualMapper?: TypeMapper): Type {
-            let properties = node.properties;
-            for (let p of properties) {
+            const properties = node.properties;
+            for (const p of properties) {
                 if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    // TODO(andersh): Computed property support
-                    let name = <Identifier>(<PropertyAssignment>p).name;
-                    let type = isTypeAny(sourceType)
+                    const name = <PropertyName>(<PropertyAssignment>p).name;
+                    if (name.kind === SyntaxKind.ComputedPropertyName) {
+                        checkComputedPropertyName(<ComputedPropertyName>name);
+                    }
+                    if (isComputedNonLiteralName(name)) {
+                        continue;
+                    }
+
+                    const text = getTextOfPropertyName(name);
+                    const type = isTypeAny(sourceType)
                         ? sourceType
-                        : getTypeOfPropertyOfType(sourceType, name.text) ||
-                        isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, IndexKind.Number) ||
+                        : getTypeOfPropertyOfType(sourceType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(sourceType, IndexKind.Number) ||
                         getIndexTypeOfType(sourceType, IndexKind.String);
                     if (type) {
                         if (p.kind === SyntaxKind.ShorthandPropertyAssignment) {
                             checkDestructuringAssignment(<ShorthandPropertyAssignment>p, type);
                         }
                         else {
-                            checkDestructuringAssignment((<PropertyAssignment>p).initializer || name, type);
+                            // non-shorthand property assignments should always have initializers 
+                            checkDestructuringAssignment((<PropertyAssignment>p).initializer, type);
                         }
                     }
                     else {
@@ -10016,14 +10227,14 @@ namespace ts {
             // This elementType will be used if the specific property corresponding to this index is not
             // present (aka the tuple element property). This call also checks that the parentType is in
             // fact an iterable or array (depending on target language).
-            let elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false) || unknownType;
-            let elements = node.elements;
+            const elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false) || unknownType;
+            const elements = node.elements;
             for (let i = 0; i < elements.length; i++) {
-                let e = elements[i];
+                const e = elements[i];
                 if (e.kind !== SyntaxKind.OmittedExpression) {
                     if (e.kind !== SyntaxKind.SpreadElementExpression) {
-                        let propName = "" + i;
-                        let type = isTypeAny(sourceType)
+                        const propName = "" + i;
+                        const type = isTypeAny(sourceType)
                             ? sourceType
                             : isTupleLikeType(sourceType)
                                 ? getTypeOfPropertyOfType(sourceType, propName)
@@ -10045,7 +10256,7 @@ namespace ts {
                             error(e, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                         }
                         else {
-                            let restExpression = (<SpreadElementExpression>e).expression;
+                            const restExpression = (<SpreadElementExpression>e).expression;
                             if (restExpression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>restExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
                                 error((<BinaryExpression>restExpression).operatorToken, Diagnostics.A_rest_element_cannot_have_an_initializer);
                             }
@@ -10086,7 +10297,7 @@ namespace ts {
         }
 
         function checkReferenceAssignment(target: Expression, sourceType: Type, contextualMapper?: TypeMapper): Type {
-            let targetType = checkExpression(target, contextualMapper);
+            const targetType = checkExpression(target, contextualMapper);
             if (checkReferenceExpression(target, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
@@ -10098,7 +10309,7 @@ namespace ts {
         }
 
         function checkBinaryLikeExpression(left: Expression, operatorToken: Node, right: Expression, contextualMapper?: TypeMapper, errorNode?: Node) {
-            let operator = operatorToken.kind;
+            const operator = operatorToken.kind;
             if (operator === SyntaxKind.EqualsToken && (left.kind === SyntaxKind.ObjectLiteralExpression || left.kind === SyntaxKind.ArrayLiteralExpression)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
@@ -10146,8 +10357,8 @@ namespace ts {
                     }
                     else {
                         // otherwise just check each operand separately and report errors as normal
-                        let leftOk = checkArithmeticOperandType(left, leftType, Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
-                        let rightOk = checkArithmeticOperandType(right, rightType, Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
+                        const leftOk = checkArithmeticOperandType(left, leftType, Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
+                        const rightOk = checkArithmeticOperandType(right, rightType, Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
                         if (leftOk && rightOk) {
                             checkAssignmentOperator(numberType);
                         }
@@ -10208,6 +10419,10 @@ namespace ts {
                 case SyntaxKind.ExclamationEqualsToken:
                 case SyntaxKind.EqualsEqualsEqualsToken:
                 case SyntaxKind.ExclamationEqualsEqualsToken:
+                    // Permit 'number[] | "foo"' to be asserted to 'string'.
+                    if (someConstituentTypeHasKind(leftType, TypeFlags.StringLike) && someConstituentTypeHasKind(rightType, TypeFlags.StringLike)) {
+                        return booleanType;
+                    }
                     if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -10229,7 +10444,7 @@ namespace ts {
 
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator: SyntaxKind): boolean {
-                let offendingSymbolOperand =
+                const offendingSymbolOperand =
                     someConstituentTypeHasKind(leftType, TypeFlags.ESSymbol) ? left :
                         someConstituentTypeHasKind(rightType, TypeFlags.ESSymbol) ? right :
                             undefined;
@@ -10265,7 +10480,7 @@ namespace ts {
                     // requires VarExpr to be classified as a reference
                     // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
                     // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    let ok = checkReferenceExpression(left, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
+                    const ok = checkReferenceExpression(left, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
                     // Use default messages
                     if (ok) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
@@ -10310,13 +10525,13 @@ namespace ts {
             }
 
             if (node.expression) {
-                let func = getContainingFunction(node);
+                const func = getContainingFunction(node);
                 // If the user's code is syntactically correct, the func should always have a star. After all,
                 // we are in a yield context.
                 if (func && func.asteriskToken) {
-                    let expressionType = checkExpressionCached(node.expression, /*contextualMapper*/ undefined);
+                    const expressionType = checkExpressionCached(node.expression, /*contextualMapper*/ undefined);
                     let expressionElementType: Type;
-                    let nodeIsYieldStar = !!node.asteriskToken;
+                    const nodeIsYieldStar = !!node.asteriskToken;
                     if (nodeIsYieldStar) {
                         expressionElementType = checkElementTypeOfIterable(expressionType, node.expression);
                     }
@@ -10324,7 +10539,7 @@ namespace ts {
                     // has no explicit return type because the return type is directly computed
                     // from the yield expressions.
                     if (func.type) {
-                        let signatureElementType = getElementTypeOfIterableIterator(getTypeFromTypeNode(func.type)) || anyType;
+                        const signatureElementType = getElementTypeOfIterableIterator(getTypeFromTypeNode(func.type)) || anyType;
                         if (nodeIsYieldStar) {
                             checkTypeAssignableTo(expressionElementType, signatureElementType, node.expression, /*headMessage*/ undefined);
                         }
@@ -10341,11 +10556,20 @@ namespace ts {
 
         function checkConditionalExpression(node: ConditionalExpression, contextualMapper?: TypeMapper): Type {
             checkExpression(node.condition);
-            let type1 = checkExpression(node.whenTrue, contextualMapper);
-            let type2 = checkExpression(node.whenFalse, contextualMapper);
+            const type1 = checkExpression(node.whenTrue, contextualMapper);
+            const type2 = checkExpression(node.whenFalse, contextualMapper);
             return getUnionType([type1, type2]);
         }
 
+        function checkStringLiteralExpression(node: StringLiteral): Type {
+            const contextualType = getContextualType(node);
+            if (contextualType && contextualTypeIsStringLiteralType(contextualType)) {
+                return getStringLiteralType(node);
+            }
+
+            return stringType;
+        }
+
         function checkTemplateExpression(node: TemplateExpression): Type {
             // We just want to check each expressions, but we are unconcerned with
             // the type of each expression, as any value may be coerced into a string.
@@ -10360,15 +10584,15 @@ namespace ts {
         }
 
         function checkExpressionWithContextualType(node: Expression, contextualType: Type, contextualMapper?: TypeMapper): Type {
-            let saveContextualType = node.contextualType;
+            const saveContextualType = node.contextualType;
             node.contextualType = contextualType;
-            let result = checkExpression(node, contextualMapper);
+            const result = checkExpression(node, contextualMapper);
             node.contextualType = saveContextualType;
             return result;
         }
 
         function checkExpressionCached(node: Expression, contextualMapper?: TypeMapper): Type {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = checkExpression(node, contextualMapper);
             }
@@ -10397,17 +10621,17 @@ namespace ts {
                 checkComputedPropertyName(<ComputedPropertyName>node.name);
             }
 
-            let uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
+            const uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
             return instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
         }
 
         function instantiateTypeWithSingleGenericCallSignature(node: Expression | MethodDeclaration, type: Type, contextualMapper?: TypeMapper) {
             if (isInferentialContext(contextualMapper)) {
-                let signature = getSingleCallSignature(type);
+                const signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
-                    let contextualType = getContextualType(<Expression>node);
+                    const contextualType = getApparentTypeOfContextualType(<Expression>node);
                     if (contextualType) {
-                        let contextualSignature = getSingleCallSignature(contextualType);
+                        const contextualSignature = getSingleCallSignature(contextualType);
                         if (contextualSignature && !contextualSignature.typeParameters) {
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper));
                         }
@@ -10431,7 +10655,7 @@ namespace ts {
                 type = checkQualifiedName(<QualifiedName>node);
             }
             else {
-                let uninstantiatedType = checkExpressionWorker(<Expression>node, contextualMapper);
+                const uninstantiatedType = checkExpressionWorker(<Expression>node, contextualMapper);
                 type = instantiateTypeWithSingleGenericCallSignature(<Expression>node, uninstantiatedType, contextualMapper);
             }
 
@@ -10440,7 +10664,7 @@ namespace ts {
                 // - 'left' in property access
                 // - 'object' in indexed access
                 // - target in rhs of import statement
-                let ok =
+                const ok =
                     (node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).expression === node) ||
                     (node.parent.kind === SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).expression === node) ||
                     ((node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName) && isInRightSideOfImportOrExportAssignment(<Identifier>node));
@@ -10476,6 +10700,7 @@ namespace ts {
                 case SyntaxKind.TemplateExpression:
                     return checkTemplateExpression(<TemplateExpression>node);
                 case SyntaxKind.StringLiteral:
+                    return checkStringLiteralExpression(<StringLiteral>node);
                 case SyntaxKind.NoSubstitutionTemplateLiteral:
                     return stringType;
                 case SyntaxKind.RegularExpressionLiteral:
@@ -10594,7 +10819,7 @@ namespace ts {
         function getTypePredicateParameterIndex(parameterList: NodeArray<ParameterDeclaration>, parameter: Identifier): number {
             if (parameterList) {
                 for (let i = 0; i < parameterList.length; i++) {
-                    let param = parameterList[i];
+                    const param = parameterList[i];
                     if (param.name.kind === SyntaxKind.Identifier &&
                         (<Identifier>param.name).text === parameter.text) {
 
@@ -10637,8 +10862,8 @@ namespace ts {
 
             if (node.type) {
                 if (node.type.kind === SyntaxKind.TypePredicate) {
-                    let typePredicate = getSignatureFromDeclaration(node).typePredicate;
-                    let typePredicateNode = <TypePredicateNode>node.type;
+                    const typePredicate = getSignatureFromDeclaration(node).typePredicate;
+                    const typePredicateNode = <TypePredicateNode>node.type;
                     if (isInLegalTypePredicatePosition(typePredicateNode)) {
                         if (typePredicate.parameterIndex >= 0) {
                             if (node.parameters[typePredicate.parameterIndex].dotDotDotToken) {
@@ -10661,7 +10886,7 @@ namespace ts {
                                     param.name.kind === SyntaxKind.ArrayBindingPattern) {
 
                                     (function checkBindingPattern(pattern: BindingPattern) {
-                                        for (let element of pattern.elements) {
+                                        for (const element of pattern.elements) {
                                             if (element.name.kind === SyntaxKind.Identifier &&
                                                 (<Identifier>element.name).text === typePredicate.parameterName) {
 
@@ -10712,13 +10937,13 @@ namespace ts {
 
                 if (node.type) {
                     if (languageVersion >= ScriptTarget.ES6 && isSyntacticallyValidGenerator(node)) {
-                        let returnType = getTypeFromTypeNode(node.type);
+                        const returnType = getTypeFromTypeNode(node.type);
                         if (returnType === voidType) {
                             error(node.type, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            let generatorElementType = getElementTypeOfIterableIterator(returnType) || anyType;
-                            let iterableIteratorInstantiation = createIterableIteratorType(generatorElementType);
+                            const generatorElementType = getElementTypeOfIterableIterator(returnType) || anyType;
+                            const iterableIteratorInstantiation = createIterableIteratorType(generatorElementType);
 
                             // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
                             // However, that would not catch the error in the following case.
@@ -10737,7 +10962,7 @@ namespace ts {
 
         function checkTypeForDuplicateIndexSignatures(node: Node) {
             if (node.kind === SyntaxKind.InterfaceDeclaration) {
-                let nodeSymbol = getSymbolOfNode(node);
+                const nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
@@ -10748,12 +10973,12 @@ namespace ts {
             // TypeScript 1.0 spec (April 2014)
             // 3.7.4: An object type can contain at most one string index signature and one numeric index signature.
             // 8.5: A class declaration can have at most one string index member declaration and one numeric index member declaration
-            let indexSymbol = getIndexSymbol(getSymbolOfNode(node));
+            const indexSymbol = getIndexSymbol(getSymbolOfNode(node));
             if (indexSymbol) {
                 let seenNumericIndexer = false;
                 let seenStringIndexer = false;
-                for (let decl of indexSymbol.declarations) {
-                    let declaration = <SignatureDeclaration>decl;
+                for (const decl of indexSymbol.declarations) {
+                    const declaration = <SignatureDeclaration>decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
                             case SyntaxKind.StringKeyword:
@@ -10807,8 +11032,8 @@ namespace ts {
 
             checkSourceElement(node.body);
 
-            let symbol = getSymbolOfNode(node);
-            let firstDeclaration = getDeclarationOfKind(symbol, node.kind);
+            const symbol = getSymbolOfNode(node);
+            const firstDeclaration = getDeclarationOfKind(symbol, node.kind);
             // Only type check the symbol once
             if (node === firstDeclaration) {
                 checkFunctionOrConstructorSymbol(symbol);
@@ -10862,11 +11087,11 @@ namespace ts {
             // TS 1.0 spec (April 2014): 8.3.2
             // Constructors of classes with no extends clause may not contain super calls, whereas
             // constructors of derived classes must contain at least one super call somewhere in their function body.
-            let containingClassDecl = <ClassDeclaration>node.parent;
+            const containingClassDecl = <ClassDeclaration>node.parent;
             if (getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                let containingClassSymbol = getSymbolOfNode(containingClassDecl);
-                let containingClassInstanceType = <InterfaceType>getDeclaredTypeOfSymbol(containingClassSymbol);
-                let baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
+                const containingClassSymbol = getSymbolOfNode(containingClassDecl);
+                const containingClassInstanceType = <InterfaceType>getDeclaredTypeOfSymbol(containingClassSymbol);
+                const baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
 
                 if (containsSuperCall(node.body)) {
                     if (baseConstructorType === nullType) {
@@ -10878,16 +11103,16 @@ namespace ts {
                     // - The containing class is a derived class.
                     // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
-                    let superCallShouldBeFirst =
+                    const superCallShouldBeFirst =
                         forEach((<ClassDeclaration>node.parent).members, isInstancePropertyWithInitializer) ||
                         forEach(node.parameters, p => p.flags & (NodeFlags.Public | NodeFlags.Private | NodeFlags.Protected));
 
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
-                        let statements = (<Block>node.body).statements;
+                        const statements = (<Block>node.body).statements;
                         let superCallStatement: ExpressionStatement;
-                        for (let statement of statements) {
+                        for (const statement of statements) {
                             if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((<ExpressionStatement>statement).expression)) {
                                 superCallStatement = <ExpressionStatement>statement;
                                 break;
@@ -10917,23 +11142,30 @@ namespace ts {
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
 
                 if (node.kind === SyntaxKind.GetAccessor) {
-                    if (!isInAmbientContext(node) && nodeIsPresent(node.body) && !(bodyContainsAReturnStatement(<Block>node.body) || bodyContainsSingleThrowStatement(<Block>node.body))) {
-                        error(node.name, Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement);
+                    if (!isInAmbientContext(node) && nodeIsPresent(node.body) && (node.flags & NodeFlags.HasImplicitReturn)) {
+                        if (node.flags & NodeFlags.HasExplicitReturn) {
+                            if (compilerOptions.noImplicitReturns) {
+                                error(node.name, Diagnostics.Not_all_code_paths_return_a_value);
+                            }
+                        }
+                        else {
+                            error(node.name, Diagnostics.A_get_accessor_must_return_a_value);
+                        }
                     }
                 }
 
                 if (!hasDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    let otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
-                    let otherAccessor = <AccessorDeclaration>getDeclarationOfKind(node.symbol, otherKind);
+                    const otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
+                    const otherAccessor = <AccessorDeclaration>getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if (((node.flags & NodeFlags.AccessibilityModifier) !== (otherAccessor.flags & NodeFlags.AccessibilityModifier))) {
                             error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
 
-                        let currentAccessorType = getAnnotatedAccessorType(node);
-                        let otherAccessorType = getAnnotatedAccessorType(otherAccessor);
+                        const currentAccessorType = getAnnotatedAccessorType(node);
+                        const otherAccessorType = getAnnotatedAccessorType(otherAccessor);
                         // TypeScript 1.0 spec (April 2014): 4.5
                         // If both accessors include type annotations, the specified types must be identical.
                         if (currentAccessorType && otherAccessorType) {
@@ -10956,9 +11188,9 @@ namespace ts {
         function checkTypeArgumentConstraints(typeParameters: TypeParameter[], typeArguments: TypeNode[]): boolean {
             let result = true;
             for (let i = 0; i < typeParameters.length; i++) {
-                let constraint = getConstraintOfTypeParameter(typeParameters[i]);
+                const constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
-                    let typeArgument = typeArguments[i];
+                    const typeArgument = typeArguments[i];
                     result = result && checkTypeAssignableTo(getTypeFromTypeNode(typeArgument), constraint, typeArgument, Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
                 }
             }
@@ -10967,13 +11199,13 @@ namespace ts {
 
         function checkTypeReferenceNode(node: TypeReferenceNode | ExpressionWithTypeArguments) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            let type = getTypeFromTypeReference(node);
+            const type = getTypeFromTypeReference(node);
             if (type !== unknownType && node.typeArguments) {
                 // Do type argument local checks only if referenced type is successfully resolved
                 forEach(node.typeArguments, checkSourceElement);
                 if (produceDiagnostics) {
-                    let symbol = getNodeLinks(node).resolvedSymbol;
-                    let typeParameters = symbol.flags & SymbolFlags.TypeAlias ? getSymbolLinks(symbol).typeParameters : (<TypeReference>type).target.localTypeParameters;
+                    const symbol = getNodeLinks(node).resolvedSymbol;
+                    const typeParameters = symbol.flags & SymbolFlags.TypeAlias ? getSymbolLinks(symbol).typeParameters : (<TypeReference>type).target.localTypeParameters;
                     checkTypeArgumentConstraints(typeParameters, node.typeArguments);
                 }
             }
@@ -10986,7 +11218,7 @@ namespace ts {
         function checkTypeLiteral(node: TypeLiteralNode) {
             forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
-                let type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                const type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 checkIndexConstraints(type);
                 checkTypeForDuplicateIndexSignatures(node);
             }
@@ -10998,7 +11230,7 @@ namespace ts {
 
         function checkTupleType(node: TupleTypeNode) {
             // Grammar checking
-            let hasErrorFromDisallowedTrailingComma = checkGrammarForDisallowedTrailingComma(node.elementTypes);
+            const hasErrorFromDisallowedTrailingComma = checkGrammarForDisallowedTrailingComma(node.elementTypes);
             if (!hasErrorFromDisallowedTrailingComma && node.elementTypes.length === 0) {
                 grammarErrorOnNode(node, Diagnostics.A_tuple_type_element_list_cannot_be_empty);
             }
@@ -11018,7 +11250,7 @@ namespace ts {
             if (!produceDiagnostics) {
                 return;
             }
-            let signature = getSignatureFromDeclaration(signatureDeclarationNode);
+            const signature = getSignatureFromDeclaration(signatureDeclarationNode);
             if (!signature.hasStringLiterals) {
                 return;
             }
@@ -11038,16 +11270,16 @@ namespace ts {
             // Use declaring type to obtain full list of signatures.
             if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === SyntaxKind.InterfaceDeclaration) {
                 Debug.assert(signatureDeclarationNode.kind === SyntaxKind.CallSignature || signatureDeclarationNode.kind === SyntaxKind.ConstructSignature);
-                let signatureKind = signatureDeclarationNode.kind === SyntaxKind.CallSignature ? SignatureKind.Call : SignatureKind.Construct;
-                let containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
-                let containingType = getDeclaredTypeOfSymbol(containingSymbol);
+                const signatureKind = signatureDeclarationNode.kind === SyntaxKind.CallSignature ? SignatureKind.Call : SignatureKind.Construct;
+                const containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
+                const containingType = getDeclaredTypeOfSymbol(containingSymbol);
                 signaturesToCheck = getSignaturesOfType(containingType, signatureKind);
             }
             else {
                 signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
             }
 
-            for (let otherSignature of signaturesToCheck) {
+            for (const otherSignature of signaturesToCheck) {
                 if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) {
                     return;
                 }
@@ -11086,19 +11318,19 @@ namespace ts {
                 // The caveat is that if some overloads are defined in lib.d.ts, we don't want to
                 // report the errors on those. To achieve this, we will say that the implementation is
                 // the canonical signature only if it is in the same container as the first overload
-                let implementationSharesContainerWithFirstOverload = implementation !== undefined && implementation.parent === overloads[0].parent;
+                const implementationSharesContainerWithFirstOverload = implementation !== undefined && implementation.parent === overloads[0].parent;
                 return implementationSharesContainerWithFirstOverload ? implementation : overloads[0];
             }
 
             function checkFlagAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionLikeDeclaration, flagsToCheck: NodeFlags, someOverloadFlags: NodeFlags, allOverloadFlags: NodeFlags): void {
                 // Error if some overloads have a flag that is not shared by all overloads. To find the
                 // deviations, we XOR someOverloadFlags with allOverloadFlags
-                let someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
+                const someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
                 if (someButNotAllOverloadFlags !== 0) {
-                    let canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    const canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
 
                     forEach(overloads, o => {
-                        let deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
+                        const deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
                         if (deviation & NodeFlags.Export) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
                         }
@@ -11117,9 +11349,9 @@ namespace ts {
 
             function checkQuestionTokenAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionLikeDeclaration, someHaveQuestionToken: boolean, allHaveQuestionToken: boolean): void {
                 if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    let canonicalHasQuestionToken = hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    const canonicalHasQuestionToken = hasQuestionToken(getCanonicalOverload(overloads, implementation));
                     forEach(overloads, o => {
-                        let deviation = hasQuestionToken(o) !== canonicalHasQuestionToken;
+                        const deviation = hasQuestionToken(o) !== canonicalHasQuestionToken;
                         if (deviation) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_optional_or_required);
                         }
@@ -11127,7 +11359,7 @@ namespace ts {
                 }
             }
 
-            let flagsToCheck: NodeFlags = NodeFlags.Export | NodeFlags.Ambient | NodeFlags.Private | NodeFlags.Protected | NodeFlags.Abstract;
+            const flagsToCheck: NodeFlags = NodeFlags.Export | NodeFlags.Ambient | NodeFlags.Private | NodeFlags.Protected | NodeFlags.Abstract;
             let someNodeFlags: NodeFlags = 0;
             let allNodeFlags = flagsToCheck;
             let someHaveQuestionToken = false;
@@ -11137,8 +11369,8 @@ namespace ts {
             let lastSeenNonAmbientDeclaration: FunctionLikeDeclaration;
             let previousDeclaration: FunctionLikeDeclaration;
 
-            let declarations = symbol.declarations;
-            let isConstructor = (symbol.flags & SymbolFlags.Constructor) !== 0;
+            const declarations = symbol.declarations;
+            const isConstructor = (symbol.flags & SymbolFlags.Constructor) !== 0;
 
             function reportImplementationExpectedError(node: FunctionLikeDeclaration): void {
                 if (node.name && nodeIsMissing(node.name)) {
@@ -11146,7 +11378,7 @@ namespace ts {
                 }
 
                 let seen = false;
-                let subsequentNode = forEachChild(node.parent, c => {
+                const subsequentNode = forEachChild(node.parent, c => {
                     if (seen) {
                         return c;
                     }
@@ -11156,14 +11388,20 @@ namespace ts {
                 });
                 if (subsequentNode) {
                     if (subsequentNode.kind === node.kind) {
-                        let errorNode: Node = (<FunctionLikeDeclaration>subsequentNode).name || subsequentNode;
+                        const errorNode: Node = (<FunctionLikeDeclaration>subsequentNode).name || subsequentNode;
                         // TODO(jfreeman): These are methods, so handle computed name case
                         if (node.name && (<FunctionLikeDeclaration>subsequentNode).name && (<Identifier>node.name).text === (<Identifier>(<FunctionLikeDeclaration>subsequentNode).name).text) {
-                            // the only situation when this is possible (same kind\same name but different symbol) - mixed static and instance class members
-                            Debug.assert(node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature);
-                            Debug.assert((node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static));
-                            let diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static;
-                            error(errorNode, diagnostic);
+                            const reportError =
+                                (node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) &&
+                                (node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static);
+                            // we can get here in two cases
+                            // 1. mixed static and instance class members
+                            // 2. something with the same name was defined before the set of overloads that prevents them from merging
+                            // here we'll report error only for the first case since for second we should already report error in binder 
+                            if (reportError) {
+                                const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static;
+                                error(errorNode, diagnostic);
+                            }
                             return;
                         }
                         else if (nodeIsPresent((<FunctionLikeDeclaration>subsequentNode).body)) {
@@ -11172,7 +11410,7 @@ namespace ts {
                         }
                     }
                 }
-                let errorNode: Node = node.name || node;
+                const errorNode: Node = node.name || node;
                 if (isConstructor) {
                     error(errorNode, Diagnostics.Constructor_implementation_is_missing);
                 }
@@ -11190,13 +11428,13 @@ namespace ts {
 
             // when checking exported function declarations across modules check only duplicate implementations
             // names and consistency of modifiers are verified when we check local symbol
-            let isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & SymbolFlags.Module;
+            const isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & SymbolFlags.Module;
             let duplicateFunctionDeclaration = false;
             let multipleConstructorImplementation = false;
-            for (let current of declarations) {
-                let node = <FunctionLikeDeclaration>current;
-                let inAmbientContext = isInAmbientContext(node);
-                let inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
+            for (const current of declarations) {
+                const node = <FunctionLikeDeclaration>current;
+                const inAmbientContext = isInAmbientContext(node);
+                const inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -11209,7 +11447,7 @@ namespace ts {
                 }
 
                 if (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || node.kind === SyntaxKind.Constructor) {
-                    let currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
+                    const currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
                     someHaveQuestionToken = someHaveQuestionToken || hasQuestionToken(node);
@@ -11258,7 +11496,7 @@ namespace ts {
 
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & NodeFlags.Abstract) ) {
+                !(lastSeenNonAmbientDeclaration.flags & NodeFlags.Abstract)) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
 
@@ -11267,8 +11505,8 @@ namespace ts {
                 checkQuestionTokenAgreementBetweenOverloads(declarations, bodyDeclaration, someHaveQuestionToken, allHaveQuestionToken);
 
                 if (bodyDeclaration) {
-                    let signatures = getSignaturesOfSymbol(symbol);
-                    let bodySignature = getSignatureFromDeclaration(bodyDeclaration);
+                    const signatures = getSignaturesOfSymbol(symbol);
+                    const bodySignature = getSignatureFromDeclaration(bodyDeclaration);
                     // If the implementation signature has string literals, we will have reported an error in
                     // checkSpecializedSignatureDeclaration
                     if (!bodySignature.hasStringLiterals) {
@@ -11286,7 +11524,7 @@ namespace ts {
                         // function g(x: string, y: string) { }
                         //
                         // The implementation is completely unrelated to the specialized signature, yet we do not check this.
-                        for (let signature of signatures) {
+                        for (const signature of signatures) {
                             if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) {
                                 error(signature.declaration, Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
                                 break;
@@ -11324,9 +11562,9 @@ namespace ts {
             let exportedDeclarationSpaces = SymbolFlags.None;
             let nonExportedDeclarationSpaces = SymbolFlags.None;
             let defaultExportedDeclarationSpaces = SymbolFlags.None;
-            for (let d of symbol.declarations) {
-                let declarationSpaces = getDeclarationSpaces(d);
-                let effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, NodeFlags.Export | NodeFlags.Default);
+            for (const d of symbol.declarations) {
+                const declarationSpaces = getDeclarationSpaces(d);
+                const effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, NodeFlags.Export | NodeFlags.Default);
 
                 if (effectiveDeclarationFlags & NodeFlags.Export) {
                     if (effectiveDeclarationFlags & NodeFlags.Default) {
@@ -11342,15 +11580,15 @@ namespace ts {
             }
 
             // Spaces for anyting not declared a 'default export'.
-            let nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
+            const nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
 
-            let commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
-            let commonDeclarationSpacesForDefaultAndNonDefault = defaultExportedDeclarationSpaces & nonDefaultExportedDeclarationSpaces;
+            const commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
+            const commonDeclarationSpacesForDefaultAndNonDefault = defaultExportedDeclarationSpaces & nonDefaultExportedDeclarationSpaces;
 
             if (commonDeclarationSpacesForExportsAndLocals || commonDeclarationSpacesForDefaultAndNonDefault) {
                 // declaration spaces for exported and non-exported declarations intersect
-                for (let d of symbol.declarations) {
-                    let declarationSpaces = getDeclarationSpaces(d);
+                for (const d of symbol.declarations) {
+                    const declarationSpaces = getDeclarationSpaces(d);
 
                     // Only error on the declarations that conributed to the intersecting spaces.
                     if (declarationSpaces & commonDeclarationSpacesForDefaultAndNonDefault) {
@@ -11375,7 +11613,7 @@ namespace ts {
                         return SymbolFlags.ExportType | SymbolFlags.ExportValue;
                     case SyntaxKind.ImportEqualsDeclaration:
                         let result: SymbolFlags = 0;
-                        let target = resolveAlias(getSymbolOfNode(d));
+                        const target = resolveAlias(getSymbolOfNode(d));
                         forEach(target.declarations, d => { result |= getDeclarationSpaces(d); });
                         return result;
                     default:
@@ -11425,32 +11663,32 @@ namespace ts {
                 return (<GenericType>promise).typeArguments[0];
             }
 
-            let globalPromiseLikeType = getInstantiatedGlobalPromiseLikeType();
+            const globalPromiseLikeType = getInstantiatedGlobalPromiseLikeType();
             if (globalPromiseLikeType === emptyObjectType || !isTypeAssignableTo(promise, globalPromiseLikeType)) {
                 return undefined;
             }
 
-            let thenFunction = getTypeOfPropertyOfType(promise, "then");
+            const thenFunction = getTypeOfPropertyOfType(promise, "then");
             if (thenFunction && (thenFunction.flags & TypeFlags.Any)) {
                 return undefined;
             }
 
-            let thenSignatures = thenFunction ? getSignaturesOfType(thenFunction, SignatureKind.Call) : emptyArray;
+            const thenSignatures = thenFunction ? getSignaturesOfType(thenFunction, SignatureKind.Call) : emptyArray;
             if (thenSignatures.length === 0) {
                 return undefined;
             }
 
-            let onfulfilledParameterType = getUnionType(map(thenSignatures, getTypeOfFirstParameterOfSignature));
+            const onfulfilledParameterType = getUnionType(map(thenSignatures, getTypeOfFirstParameterOfSignature));
             if (onfulfilledParameterType.flags & TypeFlags.Any) {
                 return undefined;
             }
 
-            let onfulfilledParameterSignatures = getSignaturesOfType(onfulfilledParameterType, SignatureKind.Call);
+            const onfulfilledParameterSignatures = getSignaturesOfType(onfulfilledParameterType, SignatureKind.Call);
             if (onfulfilledParameterSignatures.length === 0) {
                 return undefined;
             }
 
-            let valueParameterType = getUnionType(map(onfulfilledParameterSignatures, getTypeOfFirstParameterOfSignature));
+            const valueParameterType = getUnionType(map(onfulfilledParameterSignatures, getTypeOfFirstParameterOfSignature));
             return valueParameterType;
         }
 
@@ -11474,15 +11712,15 @@ namespace ts {
 
             function checkAwaitedTypeWorker(type: Type): Type {
                 if (type.flags & TypeFlags.Union) {
-                    let types: Type[] = [];
-                    for (let constituentType of (<UnionType>type).types) {
+                    const types: Type[] = [];
+                    for (const constituentType of (<UnionType>type).types) {
                         types.push(checkAwaitedTypeWorker(constituentType));
                     }
 
                     return getUnionType(types);
                 }
                 else {
-                    let promisedType = getPromisedType(type);
+                    const promisedType = getPromisedType(type);
                     if (promisedType === undefined) {
                         // The type was not a PromiseLike, so it could not be unwrapped any further.
                         // As long as the type does not have a callable "then" property, it is
@@ -11549,7 +11787,7 @@ namespace ts {
                         // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
                         // See the comments above for more information.
                         awaitedTypeStack.push(type.id);
-                        let awaitedType = checkAwaitedTypeWorker(promisedType);
+                        const awaitedType = checkAwaitedTypeWorker(promisedType);
                         awaitedTypeStack.pop();
                         return awaitedType;
                     }
@@ -11571,7 +11809,7 @@ namespace ts {
           * callable `then` signature.
           */
         function checkAsyncFunctionReturnType(node: FunctionLikeDeclaration): Type {
-            let globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
+            const globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
             if (globalPromiseConstructorLikeType === emptyObjectType) {
                 // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
                 // compatibility with __awaiter.
@@ -11605,29 +11843,32 @@ namespace ts {
             // When we get the type of the `Promise` symbol here, we get the type of the static
             // side of the `Promise` class, which would be `{ new <T>(...): Promise<T> }`.
 
-            let promiseType = getTypeFromTypeNode(node.type);
+            const promiseType = getTypeFromTypeNode(node.type);
             if (promiseType === unknownType && compilerOptions.isolatedModules) {
                 // If we are compiling with isolatedModules, we may not be able to resolve the
                 // type as a value. As such, we will just return unknownType;
                 return unknownType;
             }
 
-            let promiseConstructor = getMergedSymbol(promiseType.symbol);
+            const promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
             if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                error(node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType));
+                const typeName = promiseConstructor
+                    ? symbolToString(promiseConstructor)
+                    : typeToString(promiseType);
+                error(node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
                 return unknownType;
             }
 
             // Validate the promise constructor type.
-            let promiseConstructorType = getTypeOfSymbol(promiseConstructor);
+            const promiseConstructorType = getTypeOfSymbol(promiseConstructor);
             if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
                 return unknownType;
             }
 
             // Verify there is no local declaration that could collide with the promise constructor.
-            let promiseName = getEntityNameFromTypeNode(node.type);
-            let root = getFirstIdentifier(promiseName);
-            let rootSymbol = getSymbol(node.locals, root.text, SymbolFlags.Value);
+            const promiseName = getEntityNameFromTypeNode(node.type);
+            const root = getFirstIdentifier(promiseName);
+            const rootSymbol = getSymbol(node.locals, root.text, SymbolFlags.Value);
             if (rootSymbol) {
                 error(rootSymbol.valueDeclaration, Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions,
                     root.text,
@@ -11641,19 +11882,19 @@ namespace ts {
 
         /** Check a decorator */
         function checkDecorator(node: Decorator): void {
-            let signature = getResolvedSignature(node);
-            let returnType = getReturnTypeOfSignature(signature);
+            const signature = getResolvedSignature(node);
+            const returnType = getReturnTypeOfSignature(signature);
             if (returnType.flags & TypeFlags.Any) {
                 return;
             }
 
             let expectedReturnType: Type;
-            let headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
+            const headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             let errorInfo: DiagnosticMessageChain;
             switch (node.parent.kind) {
                 case SyntaxKind.ClassDeclaration:
-                    let classSymbol = getSymbolOfNode(node.parent);
-                    let classConstructorType = getTypeOfSymbol(classSymbol);
+                    const classSymbol = getSymbolOfNode(node.parent);
+                    const classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
 
@@ -11675,8 +11916,8 @@ namespace ts {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
-                    let methodType = getTypeOfNode(node.parent);
-                    let descriptorType = createTypedPropertyDescriptorType(methodType);
+                    const methodType = getTypeOfNode(node.parent);
+                    const descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
                     break;
             }
@@ -11695,13 +11936,13 @@ namespace ts {
             // as if it were an expression so that we can emit the type in a value position when we
             // serialize the type metadata.
             if (node && node.kind === SyntaxKind.TypeReference) {
-                let root = getFirstIdentifier((<TypeReferenceNode>node).typeName);
-                let meaning = root.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace;
+                const root = getFirstIdentifier((<TypeReferenceNode>node).typeName);
+                const meaning = root.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace;
                 // Resolve type so we know which symbol is referenced
-                let rootSymbol = resolveName(root, root.text, meaning | SymbolFlags.Alias, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+                const rootSymbol = resolveName(root, root.text, meaning | SymbolFlags.Alias, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                 // Resolved symbol is alias
                 if (rootSymbol && rootSymbol.flags & SymbolFlags.Alias) {
-                    let aliasTarget = resolveAlias(rootSymbol);
+                    const aliasTarget = resolveAlias(rootSymbol);
                     // If alias has value symbol - mark alias as referenced
                     if (aliasTarget.flags & SymbolFlags.Value && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
                         markAliasSymbolAsReferenced(rootSymbol);
@@ -11737,7 +11978,7 @@ namespace ts {
         /** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
         function checkParameterTypeAnnotationsAsExpressions(node: FunctionLikeDeclaration) {
             // ensure all type annotations with a value declaration are checked as an expression
-            for (let parameter of node.parameters) {
+            for (const parameter of node.parameters) {
                 checkTypeAnnotationAsExpression(parameter);
             }
         }
@@ -11762,7 +12003,7 @@ namespace ts {
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
                     case SyntaxKind.ClassDeclaration:
-                        let constructor = getFirstConstructorWithBody(<ClassDeclaration>node);
+                        const constructor = getFirstConstructorWithBody(<ClassDeclaration>node);
                         if (constructor) {
                             checkParameterTypeAnnotationsAsExpressions(constructor);
                         }
@@ -11802,7 +12043,7 @@ namespace ts {
         function checkFunctionLikeDeclaration(node: FunctionLikeDeclaration): void {
             checkDecorators(node);
             checkSignatureDeclaration(node);
-            let isAsync = isAsyncFunctionLike(node);
+            const isAsync = isAsyncFunctionLike(node);
             if (isAsync) {
                 emitAwaiter = true;
             }
@@ -11820,10 +12061,10 @@ namespace ts {
                 // first we want to check the local symbol that contain this declaration
                 // - if node.localSymbol !== undefined - this is current declaration is exported and localSymbol points to the local symbol
                 // - if node.localSymbol === undefined - this node is non-exported so we can just pick the result of getSymbolOfNode
-                let symbol = getSymbolOfNode(node);
-                let localSymbol = node.localSymbol || symbol;
+                const symbol = getSymbolOfNode(node);
+                const localSymbol = node.localSymbol || symbol;
 
-                let firstDeclaration = getDeclarationOfKind(localSymbol, node.kind);
+                const firstDeclaration = getDeclarationOfKind(localSymbol, node.kind);
                 // Only type check the symbol once
                 if (node === firstDeclaration) {
                     checkFunctionOrConstructorSymbol(localSymbol);
@@ -11840,13 +12081,13 @@ namespace ts {
 
             checkSourceElement(node.body);
             if (node.type && !isAccessor(node.kind) && !node.asteriskToken) {
-                let returnType = getTypeFromTypeNode(node.type);
+                const returnType = getTypeFromTypeNode(node.type);
                 let promisedType: Type;
                 if (isAsync) {
                     promisedType = checkAsyncFunctionReturnType(node);
                 }
 
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, isAsync ? promisedType : returnType);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType);
             }
 
             if (produceDiagnostics && !node.type) {
@@ -11910,7 +12151,7 @@ namespace ts {
                 return false;
             }
 
-            let root = getRootDeclaration(node);
+            const root = getRootDeclaration(node);
             if (root.kind === SyntaxKind.Parameter && nodeIsMissing((<FunctionLikeDeclaration>root.parent).body)) {
                 // just an overload - no codegen impact
                 return false;
@@ -11930,7 +12171,7 @@ namespace ts {
             let current = node;
             while (current) {
                 if (getNodeCheckFlags(current) & NodeCheckFlags.CaptureThis) {
-                    let isDeclaration = node.kind !== SyntaxKind.Identifier;
+                    const isDeclaration = node.kind !== SyntaxKind.Identifier;
                     if (isDeclaration) {
                         error((<Declaration>node).name, Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -11949,14 +12190,14 @@ namespace ts {
             }
 
             // bubble up and find containing type
-            let enclosingClass = getContainingClass(node);
+            const enclosingClass = getContainingClass(node);
             // if containing type was not found or it is ambient - exit (no codegen)
             if (!enclosingClass || isInAmbientContext(enclosingClass)) {
                 return;
             }
 
             if (getClassExtendsHeritageClauseElement(enclosingClass)) {
-                let isDeclaration = node.kind !== SyntaxKind.Identifier;
+                const isDeclaration = node.kind !== SyntaxKind.Identifier;
                 if (isDeclaration) {
                     error(node, Diagnostics.Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference);
                 }
@@ -11977,8 +12218,8 @@ namespace ts {
             }
 
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
-            let parent = getDeclarationContainer(node);
-            if (parent.kind === SyntaxKind.SourceFile && isExternalModule(<SourceFile>parent)) {
+            const parent = getDeclarationContainer(node);
+            if (parent.kind === SyntaxKind.SourceFile && isExternalOrCommonJsModule(<SourceFile>parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module,
                     declarationNameToString(name), declarationNameToString(name));
@@ -12000,15 +12241,15 @@ namespace ts {
             // A non-initialized declaration is a no-op as the block declaration will resolve before the var
             // declaration. the problem is if the declaration has an initializer. this will act as a write to the
             // block declared value. this is fine for let, but not const.
-            // Only consider declarations with initializers, uninitialized let declarations will not
+            // Only consider declarations with initializers, uninitialized const declarations will not
             // step on a let/const variable.
-            // Do not consider let and const declarations, as duplicate block-scoped declarations
+            // Do not consider const and const declarations, as duplicate block-scoped declarations
             // are handled by the binder.
-            // We are only looking for let declarations that step on let\const declarations from a
+            // We are only looking for const declarations that step on let\const declarations from a
             // different scope. e.g.:
             //      {
             //          const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration
-            //          let x = 0; // symbol for this declaration will be 'symbol'
+            //          const x = 0; // symbol for this declaration will be 'symbol'
             //      }
 
             // skip block-scoped variables and parameters
@@ -12023,22 +12264,22 @@ namespace ts {
                 return;
             }
 
-            let symbol = getSymbolOfNode(node);
+            const symbol = getSymbolOfNode(node);
             if (symbol.flags & SymbolFlags.FunctionScopedVariable) {
-                let localDeclarationSymbol = resolveName(node, (<Identifier>node.name).text, SymbolFlags.Variable, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
+                const localDeclarationSymbol = resolveName(node, (<Identifier>node.name).text, SymbolFlags.Variable, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & SymbolFlags.BlockScopedVariable) {
                     if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & NodeFlags.BlockScoped) {
-                        let varDeclList = getAncestor(localDeclarationSymbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
-                        let container =
+                        const varDeclList = getAncestor(localDeclarationSymbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
+                        const container =
                             varDeclList.parent.kind === SyntaxKind.VariableStatement && varDeclList.parent.parent
                                 ? varDeclList.parent.parent
                                 : undefined;
 
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
-                        let namesShareScope =
+                        const namesShareScope =
                             container &&
                             (container.kind === SyntaxKind.Block && isFunctionLike(container.parent) ||
                                 container.kind === SyntaxKind.ModuleBlock ||
@@ -12050,7 +12291,7 @@ namespace ts {
                         // otherwise if variable has an initializer - show error that initialization will fail
                         // since LHS will be block scoped name instead of function scoped
                         if (!namesShareScope) {
-                            let name = symbolToString(localDeclarationSymbol);
+                            const name = symbolToString(localDeclarationSymbol);
                             error(node, Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
                         }
                     }
@@ -12064,12 +12305,12 @@ namespace ts {
                 return;
             }
 
-            let func = getContainingFunction(node);
+            const func = getContainingFunction(node);
             visit(node.initializer);
 
             function visit(n: Node) {
                 if (n.kind === SyntaxKind.Identifier) {
-                    let referencedSymbol = getNodeLinks(n).resolvedSymbol;
+                    const referencedSymbol = getNodeLinks(n).resolvedSymbol;
                     // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
                     // if it contains entry with a specified name and if this entry matches the resolved symbol
                     if (referencedSymbol && referencedSymbol !== unknownSymbol && getSymbol(func.locals, referencedSymbol.name, SymbolFlags.Value) === referencedSymbol) {
@@ -12107,6 +12348,14 @@ namespace ts {
                     checkExpressionCached(node.initializer);
                 }
             }
+
+            if (node.kind === SyntaxKind.BindingElement) {
+                // check computed properties inside property names of binding elements
+                if (node.propertyName && node.propertyName.kind === SyntaxKind.ComputedPropertyName) {
+                    checkComputedPropertyName(<ComputedPropertyName>node.propertyName);
+                }
+            }
+
             // For a binding pattern, check contained binding elements
             if (isBindingPattern(node.name)) {
                 forEach((<BindingPattern>node.name).elements, checkSourceElement);
@@ -12124,8 +12373,8 @@ namespace ts {
                 }
                 return;
             }
-            let symbol = getSymbolOfNode(node);
-            let type = getTypeOfVariableOrParameterOrProperty(symbol);
+            const symbol = getSymbolOfNode(node);
+            const type = getTypeOfVariableOrParameterOrProperty(symbol);
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
                 if (node.initializer) {
@@ -12136,7 +12385,7 @@ namespace ts {
             else {
                 // Node is a secondary declaration, check that type is identical to primary declaration and check that
                 // initializer is consistent with type associated with the node
-                let declarationType = getWidenedTypeForVariableLikeDeclaration(node);
+                const declarationType = getWidenedTypeForVariableLikeDeclaration(node);
                 if (type !== unknownType && declarationType !== unknownType && !isTypeIdenticalTo(type, declarationType)) {
                     error(node.name, Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2, declarationNameToString(node.name), typeToString(type), typeToString(declarationType));
                 }
@@ -12200,6 +12449,11 @@ namespace ts {
 
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
+
+            if (node.thenStatement.kind === SyntaxKind.EmptyStatement) {
+                error(node.thenStatement, Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
+            }
+
             checkSourceElement(node.elseStatement);
         }
 
@@ -12253,8 +12507,8 @@ namespace ts {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
-                let varExpr = <Expression>node.initializer;
-                let iteratedType = checkRightHandSideOfForOf(node.expression);
+                const varExpr = <Expression>node.initializer;
+                const iteratedType = checkRightHandSideOfForOf(node.expression);
 
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === SyntaxKind.ArrayLiteralExpression || varExpr.kind === SyntaxKind.ObjectLiteralExpression) {
@@ -12264,7 +12518,7 @@ namespace ts {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
-                    let leftType = checkExpression(varExpr);
+                    const leftType = checkExpression(varExpr);
                     checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ Diagnostics.Invalid_left_hand_side_in_for_of_statement,
                         /*constantVariableMessage*/ Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant);
 
@@ -12291,7 +12545,7 @@ namespace ts {
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
             if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                let variable = (<VariableDeclarationList>node.initializer).declarations[0];
+                const variable = (<VariableDeclarationList>node.initializer).declarations[0];
                 if (variable && isBindingPattern(variable.name)) {
                     error(variable.name, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
@@ -12303,8 +12557,8 @@ namespace ts {
                 // for (Var in Expr) Statement
                 //   Var must be an expression classified as a reference of type Any or the String primitive type,
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-                let varExpr = <Expression>node.initializer;
-                let leftType = checkExpression(varExpr);
+                const varExpr = <Expression>node.initializer;
+                const leftType = checkExpression(varExpr);
                 if (varExpr.kind === SyntaxKind.ArrayLiteralExpression || varExpr.kind === SyntaxKind.ObjectLiteralExpression) {
                     error(varExpr, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
@@ -12317,7 +12571,7 @@ namespace ts {
                 }
             }
 
-            let rightType = checkExpression(node.expression);
+            const rightType = checkExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.ObjectType | TypeFlags.TypeParameter)) {
@@ -12328,16 +12582,16 @@ namespace ts {
         }
 
         function checkForInOrForOfVariableDeclaration(iterationStatement: ForInStatement | ForOfStatement): void {
-            let variableDeclarationList = <VariableDeclarationList>iterationStatement.initializer;
+            const variableDeclarationList = <VariableDeclarationList>iterationStatement.initializer;
             // checkGrammarForInOrForOfStatement will check that there is exactly one declaration.
             if (variableDeclarationList.declarations.length >= 1) {
-                let decl = variableDeclarationList.declarations[0];
+                const decl = variableDeclarationList.declarations[0];
                 checkVariableDeclaration(decl);
             }
         }
 
         function checkRightHandSideOfForOf(rhsExpression: Expression): Type {
-            let expressionType = getTypeOfExpression(rhsExpression);
+            const expressionType = getTypeOfExpression(rhsExpression);
             return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true);
         }
 
@@ -12355,7 +12609,7 @@ namespace ts {
             }
 
             if (isArrayLikeType(inputType)) {
-                let indexType = getIndexTypeOfType(inputType, IndexKind.Number);
+                const indexType = getIndexTypeOfType(inputType, IndexKind.Number);
                 if (indexType) {
                     return indexType;
                 }
@@ -12369,7 +12623,7 @@ namespace ts {
          * When errorNode is undefined, it means we should not report any errors.
          */
         function checkElementTypeOfIterable(iterable: Type, errorNode: Node): Type {
-            let elementType = getElementTypeOfIterable(iterable, errorNode);
+            const elementType = getElementTypeOfIterable(iterable, errorNode);
             // Now even though we have extracted the iteratedType, we will have to validate that the type
             // passed in is actually an Iterable.
             if (errorNode && elementType) {
@@ -12405,7 +12659,7 @@ namespace ts {
                 return undefined;
             }
 
-            let typeAsIterable = <IterableOrIteratorType>type;
+            const typeAsIterable = <IterableOrIteratorType>type;
             if (!typeAsIterable.iterableElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
                 // then just grab its type argument.
@@ -12413,12 +12667,12 @@ namespace ts {
                     typeAsIterable.iterableElementType = (<GenericType>type).typeArguments[0];
                 }
                 else {
-                    let iteratorFunction = getTypeOfPropertyOfType(type, getPropertyNameForKnownSymbolName("iterator"));
+                    const iteratorFunction = getTypeOfPropertyOfType(type, getPropertyNameForKnownSymbolName("iterator"));
                     if (isTypeAny(iteratorFunction)) {
                         return undefined;
                     }
 
-                    let iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, SignatureKind.Call) : emptyArray;
+                    const iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, SignatureKind.Call) : emptyArray;
                     if (iteratorFunctionSignatures.length === 0) {
                         if (errorNode) {
                             error(errorNode, Diagnostics.Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator);
@@ -12451,7 +12705,7 @@ namespace ts {
                 return undefined;
             }
 
-            let typeAsIterator = <IterableOrIteratorType>type;
+            const typeAsIterator = <IterableOrIteratorType>type;
             if (!typeAsIterator.iteratorElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
                 // then just grab its type argument.
@@ -12459,12 +12713,12 @@ namespace ts {
                     typeAsIterator.iteratorElementType = (<GenericType>type).typeArguments[0];
                 }
                 else {
-                    let iteratorNextFunction = getTypeOfPropertyOfType(type, "next");
+                    const iteratorNextFunction = getTypeOfPropertyOfType(type, "next");
                     if (isTypeAny(iteratorNextFunction)) {
                         return undefined;
                     }
 
-                    let iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, SignatureKind.Call) : emptyArray;
+                    const iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, SignatureKind.Call) : emptyArray;
                     if (iteratorNextFunctionSignatures.length === 0) {
                         if (errorNode) {
                             error(errorNode, Diagnostics.An_iterator_must_have_a_next_method);
@@ -12472,12 +12726,12 @@ namespace ts {
                         return undefined;
                     }
 
-                    let iteratorNextResult = getUnionType(map(iteratorNextFunctionSignatures, getReturnTypeOfSignature));
+                    const iteratorNextResult = getUnionType(map(iteratorNextFunctionSignatures, getReturnTypeOfSignature));
                     if (isTypeAny(iteratorNextResult)) {
                         return undefined;
                     }
 
-                    let iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value");
+                    const iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value");
                     if (!iteratorNextValue) {
                         if (errorNode) {
                             error(errorNode, Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
@@ -12529,9 +12783,14 @@ namespace ts {
 
             // After we remove all types that are StringLike, we will know if there was a string constituent
             // based on whether the remaining type is the same as the initial type.
-            let arrayType = removeTypesFromUnionType(arrayOrStringType, TypeFlags.StringLike, /*isTypeOfKind*/ true, /*allowEmptyUnionResult*/ true);
-            let hasStringConstituent = arrayOrStringType !== arrayType;
-
+            let arrayType = arrayOrStringType;
+            if (arrayOrStringType.flags & TypeFlags.Union) {
+                arrayType = getUnionType(filter((arrayOrStringType as UnionType).types, t => !(t.flags & TypeFlags.StringLike)));
+            }
+            else if (arrayOrStringType.flags & TypeFlags.StringLike) {
+                arrayType = emptyUnionType;
+            }
+            const hasStringConstituent = arrayOrStringType !== arrayType;
             let reportedError = false;
             if (hasStringConstituent) {
                 if (languageVersion < ScriptTarget.ES5) {
@@ -12552,7 +12811,7 @@ namespace ts {
                     // if the input type is number | string, we want to say that number is not an array type.
                     // But if the input was just number, we want to say that number is not an array type
                     // or a string type.
-                    let diagnostic = hasStringConstituent
+                    const diagnostic = hasStringConstituent
                         ? Diagnostics.Type_0_is_not_an_array_type
                         : Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
                     error(errorNode, diagnostic, typeToString(arrayType));
@@ -12560,7 +12819,7 @@ namespace ts {
                 return hasStringConstituent ? stringType : unknownType;
             }
 
-            let arrayElementType = getIndexTypeOfType(arrayType, IndexKind.Number) || unknownType;
+            const arrayElementType = getIndexTypeOfType(arrayType, IndexKind.Number) || unknownType;
             if (hasStringConstituent) {
                 // This is just an optimization for the case where arrayOrStringType is string | string[]
                 if (arrayElementType.flags & TypeFlags.StringLike) {
@@ -12587,18 +12846,18 @@ namespace ts {
         function checkReturnStatement(node: ReturnStatement) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                let functionBlock = getContainingFunction(node);
+                const functionBlock = getContainingFunction(node);
                 if (!functionBlock) {
                     grammarErrorOnFirstToken(node, Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
                 }
             }
 
             if (node.expression) {
-                let func = getContainingFunction(node);
+                const func = getContainingFunction(node);
                 if (func) {
-                    let signature = getSignatureFromDeclaration(func);
-                    let returnType = getReturnTypeOfSignature(signature);
-                    let exprType = checkExpressionCached(node.expression);
+                    const signature = getSignatureFromDeclaration(func);
+                    const returnType = getReturnTypeOfSignature(signature);
+                    const exprType = checkExpressionCached(node.expression);
 
                     if (func.asteriskToken) {
                         // A generator does not need its return expressions checked against its return type.
@@ -12612,14 +12871,14 @@ namespace ts {
                         error(node.expression, Diagnostics.Setters_cannot_return_a_value);
                     }
                     else if (func.kind === SyntaxKind.Constructor) {
-                        if (!isTypeAssignableTo(exprType, returnType)) {
+                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
                     else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || signature.typePredicate) {
                         if (isAsyncFunctionLike(func)) {
-                            let promisedType = getPromisedType(returnType);
-                            let awaitedType = checkAwaitedType(exprType, node.expression, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
+                            const promisedType = getPromisedType(returnType);
+                            const awaitedType = checkAwaitedType(exprType, node.expression, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                             if (promisedType) {
                                 // If the function has a return type, but promisedType is
                                 // undefined, an error will be reported in checkAsyncFunctionReturnType
@@ -12654,7 +12913,8 @@ namespace ts {
             let firstDefaultClause: CaseOrDefaultClause;
             let hasDuplicateDefaultClause = false;
 
-            let expressionType = checkExpression(node.expression);
+            const expressionType = checkExpression(node.expression);
+            const expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, TypeFlags.StringLike);
             forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
@@ -12662,21 +12922,27 @@ namespace ts {
                         firstDefaultClause = clause;
                     }
                     else {
-                        let sourceFile = getSourceFileOfNode(node);
-                        let start = skipTrivia(sourceFile.text, clause.pos);
-                        let end = clause.statements.length > 0 ? clause.statements[0].pos : clause.end;
+                        const sourceFile = getSourceFileOfNode(node);
+                        const start = skipTrivia(sourceFile.text, clause.pos);
+                        const end = clause.statements.length > 0 ? clause.statements[0].pos : clause.end;
                         grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.A_default_clause_cannot_appear_more_than_once_in_a_switch_statement);
                         hasDuplicateDefaultClause = true;
                     }
                 }
 
                 if (produceDiagnostics && clause.kind === SyntaxKind.CaseClause) {
-                    let caseClause = <CaseClause>clause;
+                    const caseClause = <CaseClause>clause;
                     // TypeScript 1.0 spec (April 2014):5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
-                    let caseType = checkExpression(caseClause.expression);
-                    if (!isTypeAssignableTo(expressionType, caseType)) {
-                        // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails
+                    const caseType = checkExpression(caseClause.expression);
+
+                    const expressionTypeIsAssignableToCaseType =
+                        // Permit 'number[] | "foo"' to be asserted to 'string'.
+                        (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, TypeFlags.StringLike)) ||
+                        isTypeAssignableTo(expressionType, caseType);
+
+                    if (!expressionTypeIsAssignableToCaseType) {
+                        // 'expressionType is not assignable to caseType', try the reversed check and report errors if it fails
                         checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
@@ -12693,7 +12959,7 @@ namespace ts {
                         break;
                     }
                     if (current.kind === SyntaxKind.LabeledStatement && (<LabeledStatement>current).label.text === node.label.text) {
-                        let sourceFile = getSourceFileOfNode(node);
+                        const sourceFile = getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, Diagnostics.Duplicate_label_0, getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
                     }
@@ -12723,7 +12989,7 @@ namespace ts {
             checkGrammarStatementInAmbientContext(node);
 
             checkBlock(node.tryBlock);
-            let catchClause = node.catchClause;
+            const catchClause = node.catchClause;
             if (catchClause) {
                 // Grammar checking
                 if (catchClause.variableDeclaration) {
@@ -12737,10 +13003,10 @@ namespace ts {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        let identifierName = (<Identifier>catchClause.variableDeclaration.name).text;
-                        let locals = catchClause.block.locals;
+                        const identifierName = (<Identifier>catchClause.variableDeclaration.name).text;
+                        const locals = catchClause.block.locals;
                         if (locals && hasProperty(locals, identifierName)) {
-                            let localSymbol = locals[identifierName];
+                            const localSymbol = locals[identifierName];
                             if (localSymbol && (localSymbol.flags & SymbolFlags.BlockScopedVariable) !== 0) {
                                 grammarErrorOnNode(localSymbol.valueDeclaration, Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
                             }
@@ -12757,27 +13023,27 @@ namespace ts {
         }
 
         function checkIndexConstraints(type: Type) {
-            let declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
-            let declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
+            const declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
+            const declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
 
-            let stringIndexType = getIndexTypeOfType(type, IndexKind.String);
-            let numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
+            const stringIndexType = getIndexTypeOfType(type, IndexKind.String);
+            const numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
 
             if (stringIndexType || numberIndexType) {
                 forEach(getPropertiesOfObjectType(type), prop => {
-                    let propType = getTypeOfSymbol(prop);
+                    const propType = getTypeOfSymbol(prop);
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number);
                 });
 
                 if (type.flags & TypeFlags.Class && isClassLike(type.symbol.valueDeclaration)) {
-                    let classDeclaration = <ClassLikeDeclaration>type.symbol.valueDeclaration;
-                    for (let member of classDeclaration.members) {
+                    const classDeclaration = <ClassLikeDeclaration>type.symbol.valueDeclaration;
+                    for (const member of classDeclaration.members) {
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
                         if (!(member.flags & NodeFlags.Static) && hasDynamicName(member)) {
-                            let propType = getTypeOfSymbol(member.symbol);
+                            const propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number);
                         }
@@ -12790,7 +13056,7 @@ namespace ts {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
                 if (!errorNode && (type.flags & TypeFlags.Interface)) {
-                    let someBaseTypeHasBothIndexers = forEach(getBaseTypes(<InterfaceType>type), base => getIndexTypeOfType(base, IndexKind.String) && getIndexTypeOfType(base, IndexKind.Number));
+                    const someBaseTypeHasBothIndexers = forEach(getBaseTypes(<InterfaceType>type), base => getIndexTypeOfType(base, IndexKind.String) && getIndexTypeOfType(base, IndexKind.Number));
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
             }
@@ -12830,12 +13096,12 @@ namespace ts {
                     // for interfaces property and indexer might be inherited from different bases
                     // check if any base class already has both property and indexer.
                     // check should be performed only if 'type' is the first type that brings property\indexer together
-                    let someBaseClassHasBothPropertyAndIndexer = forEach(getBaseTypes(<InterfaceType>containingType), base => getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind));
+                    const someBaseClassHasBothPropertyAndIndexer = forEach(getBaseTypes(<InterfaceType>containingType), base => getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind));
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
 
                 if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    let errorMessage =
+                    const errorMessage =
                         indexKind === IndexKind.String
                             ? Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
                             : Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
@@ -12862,7 +13128,7 @@ namespace ts {
         function checkTypeParameters(typeParameterDeclarations: TypeParameterDeclaration[]) {
             if (typeParameterDeclarations) {
                 for (let i = 0, n = typeParameterDeclarations.length; i < n; i++) {
-                    let node = typeParameterDeclarations[i];
+                    const node = typeParameterDeclarations[i];
                     checkTypeParameter(node);
 
                     if (produceDiagnostics) {
@@ -12900,22 +13166,22 @@ namespace ts {
             }
             checkTypeParameters(node.typeParameters);
             checkExportsOnMergedDeclarations(node);
-            let symbol = getSymbolOfNode(node);
-            let type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
-            let typeWithThis = getTypeWithThisArgument(type);
-            let staticType = <ObjectType>getTypeOfSymbol(symbol);
+            const symbol = getSymbolOfNode(node);
+            const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
+            const typeWithThis = getTypeWithThisArgument(type);
+            const staticType = <ObjectType>getTypeOfSymbol(symbol);
 
-            let baseTypeNode = getClassExtendsHeritageClauseElement(node);
+            const baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 emitExtends = emitExtends || !isInAmbientContext(node);
-                let baseTypes = getBaseTypes(type);
+                const baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
-                    let baseType = baseTypes[0];
-                    let staticBaseType = getBaseConstructorTypeOfClass(type);
+                    const baseType = baseTypes[0];
+                    const staticBaseType = getBaseConstructorTypeOfClass(type);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
                         forEach(baseTypeNode.typeArguments, checkSourceElement);
-                        for (let constructor of getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments)) {
+                        for (const constructor of getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments)) {
                             if (!checkTypeArgumentConstraints(constructor.typeParameters, baseTypeNode.typeArguments)) {
                                 break;
                             }
@@ -12930,7 +13196,7 @@ namespace ts {
                         // that all instantiated base constructor signatures return the same type. We can simply compare the type
                         // references (as opposed to checking the structure of the types) because elsewhere we have already checked
                         // that the base type is a class or interface type (and not, for example, an anonymous object type).
-                        let constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
+                        const constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
                         if (forEach(constructors, sig => getReturnTypeOfSignature(sig) !== baseType)) {
                             error(baseTypeNode.expression, Diagnostics.Base_constructors_must_all_have_the_same_return_type);
                         }
@@ -12939,17 +13205,17 @@ namespace ts {
                 }
             }
 
-            let implementedTypeNodes = getClassImplementsHeritageClauseElements(node);
+            const implementedTypeNodes = getClassImplementsHeritageClauseElements(node);
             if (implementedTypeNodes) {
-                for (let typeRefNode of implementedTypeNodes) {
+                for (const typeRefNode of implementedTypeNodes) {
                     if (!isSupportedExpressionWithTypeArguments(typeRefNode)) {
                         error(typeRefNode.expression, Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
                     }
                     checkTypeReferenceNode(typeRefNode);
                     if (produceDiagnostics) {
-                        let t = getTypeFromTypeNode(typeRefNode);
+                        const t = getTypeFromTypeNode(typeRefNode);
                         if (t !== unknownType) {
-                            let declaredType = (t.flags & TypeFlags.Reference) ? (<TypeReference>t).target : t;
+                            const declaredType = (t.flags & TypeFlags.Reference) ? (<TypeReference>t).target : t;
                             if (declaredType.flags & (TypeFlags.Class | TypeFlags.Interface)) {
                                 checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
@@ -12994,16 +13260,16 @@ namespace ts {
             // derived class instance member variables and accessors, but not by other kinds of members.
 
             // NOTE: assignability is checked in checkClassDeclaration
-            let baseProperties = getPropertiesOfObjectType(baseType);
-            for (let baseProperty of baseProperties) {
-                let base = getTargetSymbol(baseProperty);
+            const baseProperties = getPropertiesOfObjectType(baseType);
+            for (const baseProperty of baseProperties) {
+                const base = getTargetSymbol(baseProperty);
 
                 if (base.flags & SymbolFlags.Prototype) {
                     continue;
                 }
 
-                let derived = getTargetSymbol(getPropertyOfObjectType(type, base.name));
-                let baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
+                const derived = getTargetSymbol(getPropertyOfObjectType(type, base.name));
+                const baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
 
                 Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
 
@@ -13014,7 +13280,7 @@ namespace ts {
                     if (derived === base) {
                         // derived class inherits base without override/redeclaration
 
-                        let derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
+                        const derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
 
                         // It is an error to inherit an abstract member without implementing it or being declared abstract.
                         // If there is no declaration for the derived class (as in the case of class expressions),
@@ -13032,7 +13298,7 @@ namespace ts {
                     }
                     else {
                         // derived overrides base.
-                        let derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
+                        const derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
                         if ((baseDeclarationFlags & NodeFlags.Private) || (derivedDeclarationFlags & NodeFlags.Private)) {
                             // either base or derived property is private - not override, skip it
                             continue;
@@ -13089,8 +13355,8 @@ namespace ts {
             // When a generic interface has multiple declarations,  all declarations must have identical type parameter
             // lists, i.e. identical type parameter names with identical constraints in identical order.
             for (let i = 0, len = list1.length; i < len; i++) {
-                let tp1 = list1[i];
-                let tp2 = list2[i];
+                const tp1 = list1[i];
+                const tp2 = list2[i];
                 if (tp1.name.text !== tp2.name.text) {
                     return false;
                 }
@@ -13108,29 +13374,29 @@ namespace ts {
         }
 
         function checkInheritedPropertiesAreIdentical(type: InterfaceType, typeNode: Node): boolean {
-            let baseTypes = getBaseTypes(type);
+            const baseTypes = getBaseTypes(type);
             if (baseTypes.length < 2) {
                 return true;
             }
 
-            let seen: Map<{ prop: Symbol; containingType: Type }> = {};
+            const seen: Map<{ prop: Symbol; containingType: Type }> = {};
             forEach(resolveDeclaredMembers(type).declaredProperties, p => { seen[p.name] = { prop: p, containingType: type }; });
             let ok = true;
 
-            for (let base of baseTypes) {
-                let properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (let prop of properties) {
+            for (const base of baseTypes) {
+                const properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
+                for (const prop of properties) {
                     if (!hasProperty(seen, prop.name)) {
                         seen[prop.name] = { prop: prop, containingType: base };
                     }
                     else {
-                        let existing = seen[prop.name];
-                        let isInheritedProperty = existing.containingType !== type;
+                        const existing = seen[prop.name];
+                        const isInheritedProperty = existing.containingType !== type;
                         if (isInheritedProperty && !isPropertyIdenticalTo(existing.prop, prop)) {
                             ok = false;
 
-                            let typeName1 = typeToString(existing.containingType);
-                            let typeName2 = typeToString(base);
+                            const typeName1 = typeToString(existing.containingType);
+                            const typeName2 = typeToString(base);
 
                             let errorInfo = chainDiagnosticMessages(undefined, Diagnostics.Named_property_0_of_types_1_and_2_are_not_identical, symbolToString(prop), typeName1, typeName2);
                             errorInfo = chainDiagnosticMessages(errorInfo, Diagnostics.Interface_0_cannot_simultaneously_extend_types_1_and_2, typeToString(type), typeName1, typeName2);
@@ -13152,8 +13418,8 @@ namespace ts {
                 checkTypeNameIsReserved(node.name, Diagnostics.Interface_name_cannot_be_0);
 
                 checkExportsOnMergedDeclarations(node);
-                let symbol = getSymbolOfNode(node);
-                let firstInterfaceDecl = <InterfaceDeclaration>getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
+                const symbol = getSymbolOfNode(node);
+                const firstInterfaceDecl = <InterfaceDeclaration>getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
                 if (symbol.declarations.length > 1) {
                     if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
                         error(node.name, Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
@@ -13162,11 +13428,11 @@ namespace ts {
 
                 // Only check this symbol once
                 if (node === firstInterfaceDecl) {
-                    let type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
-                    let typeWithThis = getTypeWithThisArgument(type);
+                    const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
+                    const typeWithThis = getTypeWithThisArgument(type);
                     // run subsequent checks only if first set succeeded
                     if (checkInheritedPropertiesAreIdentical(type, node.name)) {
-                        for (let baseType of getBaseTypes(type)) {
+                        for (const baseType of getBaseTypes(type)) {
                             checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name, Diagnostics.Interface_0_incorrectly_extends_interface_1);
                         }
                         checkIndexConstraints(type);
@@ -13196,26 +13462,29 @@ namespace ts {
         }
 
         function computeEnumMemberValues(node: EnumDeclaration) {
-            let nodeLinks = getNodeLinks(node);
+            const nodeLinks = getNodeLinks(node);
 
             if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) {
-                let enumSymbol = getSymbolOfNode(node);
-                let enumType = getDeclaredTypeOfSymbol(enumSymbol);
+                const enumSymbol = getSymbolOfNode(node);
+                const enumType = getDeclaredTypeOfSymbol(enumSymbol);
                 let autoValue = 0; // set to undefined when enum member is non-constant
-                let ambient = isInAmbientContext(node);
-                let enumIsConst = isConst(node);
+                const ambient = isInAmbientContext(node);
+                const enumIsConst = isConst(node);
 
                 for (const member of node.members) {
-                    if (member.name.kind === SyntaxKind.ComputedPropertyName) {
+                    if (isComputedNonLiteralName(<PropertyName>member.name)) {
                         error(member.name, Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
-                    else if (isNumericLiteralName((<Identifier>member.name).text)) {
-                        error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                    else {
+                        const text = getTextOfPropertyName(<PropertyName>member.name);
+                        if (isNumericLiteralName(text)) {
+                            error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                        }
                     }
 
                     const previousEnumMemberIsNonConstant = autoValue === undefined;
 
-                    let initializer = member.initializer;
+                    const initializer = member.initializer;
                     if (initializer) {
                         autoValue = computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient);
                     }
@@ -13244,7 +13513,7 @@ namespace ts {
                 // Controls if error should be reported after evaluation of constant value is completed
                 // Can be false if another more precise error was already reported during evaluation.
                 let reportError = true;
-                let value = evalConstant(initializer);
+                const value = evalConstant(initializer);
 
                 if (reportError) {
                     if (value === undefined) {
@@ -13274,7 +13543,7 @@ namespace ts {
                 function evalConstant(e: Node): number {
                     switch (e.kind) {
                         case SyntaxKind.PrefixUnaryExpression:
-                            let value = evalConstant((<PrefixUnaryExpression>e).operand);
+                            const value = evalConstant((<PrefixUnaryExpression>e).operand);
                             if (value === undefined) {
                                 return undefined;
                             }
@@ -13285,11 +13554,11 @@ namespace ts {
                             }
                             return undefined;
                         case SyntaxKind.BinaryExpression:
-                            let left = evalConstant((<BinaryExpression>e).left);
+                            const left = evalConstant((<BinaryExpression>e).left);
                             if (left === undefined) {
                                 return undefined;
                             }
-                            let right = evalConstant((<BinaryExpression>e).right);
+                            const right = evalConstant((<BinaryExpression>e).right);
                             if (right === undefined) {
                                 return undefined;
                             }
@@ -13314,8 +13583,8 @@ namespace ts {
                         case SyntaxKind.Identifier:
                         case SyntaxKind.ElementAccessExpression:
                         case SyntaxKind.PropertyAccessExpression:
-                            let member = initializer.parent;
-                            let currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
+                            const member = initializer.parent;
+                            const currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             let enumType: Type;
                             let propertyName: string;
 
@@ -13365,12 +13634,12 @@ namespace ts {
                                 return undefined;
                             }
 
-                            let property = getPropertyOfObjectType(enumType, propertyName);
+                            const property = getPropertyOfObjectType(enumType, propertyName);
                             if (!property || !(property.flags & SymbolFlags.EnumMember)) {
                                 return undefined;
                             }
 
-                            let propertyDecl = property.valueDeclaration;
+                            const propertyDecl = property.valueDeclaration;
                             // self references are illegal
                             if (member === propertyDecl) {
                                 return undefined;
@@ -13404,7 +13673,7 @@ namespace ts {
 
             computeEnumMemberValues(node);
 
-            let enumIsConst = isConst(node);
+            const enumIsConst = isConst(node);
             if (compilerOptions.isolatedModules && enumIsConst && isInAmbientContext(node)) {
                 error(node.name, Diagnostics.Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided);
             }
@@ -13415,8 +13684,8 @@ namespace ts {
             // for the first member.
             //
             // Only perform this check once per symbol
-            let enumSymbol = getSymbolOfNode(node);
-            let firstDeclaration = getDeclarationOfKind(enumSymbol, node.kind);
+            const enumSymbol = getSymbolOfNode(node);
+            const firstDeclaration = getDeclarationOfKind(enumSymbol, node.kind);
             if (node === firstDeclaration) {
                 if (enumSymbol.declarations.length > 1) {
                     // check that const is placed\omitted on all enum declarations
@@ -13434,12 +13703,12 @@ namespace ts {
                         return false;
                     }
 
-                    let enumDeclaration = <EnumDeclaration>declaration;
+                    const enumDeclaration = <EnumDeclaration>declaration;
                     if (!enumDeclaration.members.length) {
                         return false;
                     }
 
-                    let firstEnumMember = enumDeclaration.members[0];
+                    const firstEnumMember = enumDeclaration.members[0];
                     if (!firstEnumMember.initializer) {
                         if (seenEnumMissingInitialInitializer) {
                             error(firstEnumMember.name, Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
@@ -13453,8 +13722,8 @@ namespace ts {
         }
 
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol: Symbol): Declaration {
-            let declarations = symbol.declarations;
-            for (let declaration of declarations) {
+            const declarations = symbol.declarations;
+            for (const declaration of declarations) {
                 if ((declaration.kind === SyntaxKind.ClassDeclaration ||
                     (declaration.kind === SyntaxKind.FunctionDeclaration && nodeIsPresent((<FunctionLikeDeclaration>declaration).body))) &&
                     !isInAmbientContext(declaration)) {
@@ -13465,8 +13734,8 @@ namespace ts {
         }
 
         function inSameLexicalScope(node1: Node, node2: Node) {
-            let container1 = getEnclosingBlockScopeContainer(node1);
-            let container2 = getEnclosingBlockScopeContainer(node2);
+            const container1 = getEnclosingBlockScopeContainer(node1);
+            const container2 = getEnclosingBlockScopeContainer(node2);
             if (isGlobalSourceFile(container1)) {
                 return isGlobalSourceFile(container2);
             }
@@ -13481,8 +13750,8 @@ namespace ts {
         function checkModuleDeclaration(node: ModuleDeclaration) {
             if (produceDiagnostics) {
                 // Grammar checking
-                let isAmbientExternalModule = node.name.kind === SyntaxKind.StringLiteral;
-                let contextErrorMessage = isAmbientExternalModule
+                const isAmbientExternalModule = node.name.kind === SyntaxKind.StringLiteral;
+                const contextErrorMessage = isAmbientExternalModule
                     ? Diagnostics.An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file
                     : Diagnostics.A_namespace_declaration_is_only_allowed_in_a_namespace_or_module;
                 if (checkGrammarModuleElementContext(node, contextErrorMessage)) {
@@ -13499,14 +13768,14 @@ namespace ts {
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
-                let symbol = getSymbolOfNode(node);
+                const symbol = getSymbolOfNode(node);
 
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & SymbolFlags.ValueModule
                     && symbol.declarations.length > 1
                     && !isInAmbientContext(node)
                     && isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules)) {
-                    let firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
+                    const firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
                         if (getSourceFileOfNode(node) !== getSourceFileOfNode(firstNonAmbientClassOrFunc)) {
                             error(node.name, Diagnostics.A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged);
@@ -13518,7 +13787,7 @@ namespace ts {
 
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    let mergedClass = getDeclarationOfKind(symbol, SyntaxKind.ClassDeclaration);
+                    const mergedClass = getDeclarationOfKind(symbol, SyntaxKind.ClassDeclaration);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= NodeCheckFlags.LexicalModuleMergesWithClass;
@@ -13555,12 +13824,12 @@ namespace ts {
         }
 
         function checkExternalImportOrExportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration): boolean {
-            let moduleName = getExternalModuleName(node);
+            const moduleName = getExternalModuleName(node);
             if (!nodeIsMissing(moduleName) && moduleName.kind !== SyntaxKind.StringLiteral) {
                 error(moduleName, Diagnostics.String_literal_expected);
                 return false;
             }
-            let inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral;
+            const inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral;
             if (node.parent.kind !== SyntaxKind.SourceFile && !inAmbientExternalModule) {
                 error(moduleName, node.kind === SyntaxKind.ExportDeclaration ?
                     Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
@@ -13579,15 +13848,15 @@ namespace ts {
         }
 
         function checkAliasSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) {
-            let symbol = getSymbolOfNode(node);
-            let target = resolveAlias(symbol);
+            const symbol = getSymbolOfNode(node);
+            const target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                let excludedMeanings =
+                const excludedMeanings =
                     (symbol.flags & SymbolFlags.Value ? SymbolFlags.Value : 0) |
                     (symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |
                     (symbol.flags & SymbolFlags.Namespace ? SymbolFlags.Namespace : 0);
                 if (target.flags & excludedMeanings) {
-                    let message = node.kind === SyntaxKind.ExportSpecifier ?
+                    const message = node.kind === SyntaxKind.ExportSpecifier ?
                         Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -13610,7 +13879,7 @@ namespace ts {
                 grammarErrorOnFirstToken(node, Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
-                let importClause = node.importClause;
+                const importClause = node.importClause;
                 if (importClause) {
                     if (importClause.name) {
                         checkImportBinding(importClause);
@@ -13640,11 +13909,11 @@ namespace ts {
                     markExportAsReferenced(node);
                 }
                 if (isInternalModuleImportEqualsDeclaration(node)) {
-                    let target = resolveAlias(getSymbolOfNode(node));
+                    const target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & SymbolFlags.Value) {
                             // Target is a value symbol, check that it is not hidden by a local declaration with the same name
-                            let moduleName = getFirstIdentifier(<EntityName>node.moduleReference);
+                            const moduleName = getFirstIdentifier(<EntityName>node.moduleReference);
                             if (!(resolveEntityName(moduleName, SymbolFlags.Value | SymbolFlags.Namespace).flags & SymbolFlags.Namespace)) {
                                 error(moduleName, Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, declarationNameToString(moduleName));
                             }
@@ -13679,14 +13948,14 @@ namespace ts {
                     // export { x, y } from "foo"
                     forEach(node.exportClause.elements, checkExportSpecifier);
 
-                    let inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral;
+                    const inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral;
                     if (node.parent.kind !== SyntaxKind.SourceFile && !inAmbientExternalModule) {
                         error(node, Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
                 else {
                     // export * from "foo"
-                    let moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
+                    const moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
                     if (moduleSymbol && moduleSymbol.exports["export="]) {
                         error(node.moduleSpecifier, Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
@@ -13713,7 +13982,7 @@ namespace ts {
                 return;
             }
 
-            let container = node.parent.kind === SyntaxKind.SourceFile ? <SourceFile>node.parent : <ModuleDeclaration>node.parent.parent;
+            const container = node.parent.kind === SyntaxKind.SourceFile ? <SourceFile>node.parent : <ModuleDeclaration>node.parent.parent;
             if (container.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>container).name.kind === SyntaxKind.Identifier) {
                 error(node, Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
@@ -13763,12 +14032,12 @@ namespace ts {
         }
 
         function checkExternalModuleExports(node: SourceFile | ModuleDeclaration) {
-            let moduleSymbol = getSymbolOfNode(node);
-            let links = getSymbolLinks(moduleSymbol);
+            const moduleSymbol = getSymbolOfNode(node);
+            const links = getSymbolLinks(moduleSymbol);
             if (!links.exportsChecked) {
-                let exportEqualsSymbol = moduleSymbol.exports["export="];
+                const exportEqualsSymbol = moduleSymbol.exports["export="];
                 if (exportEqualsSymbol && hasExportedMembers(moduleSymbol)) {
-                    let declaration = getDeclarationOfAliasSymbol(exportEqualsSymbol) || exportEqualsSymbol.valueDeclaration;
+                    const declaration = getDeclarationOfAliasSymbol(exportEqualsSymbol) || exportEqualsSymbol.valueDeclaration;
                     error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);
                 }
                 links.exportsChecked = true;
@@ -13786,7 +14055,7 @@ namespace ts {
                 return;
             }
 
-            let kind = node.kind;
+            const kind = node.kind;
             if (cancellationToken) {
                 // Only bother checking on a few construct kinds.  We don't want to be excessivly
                 // hitting the cancellation token on every node we check.
@@ -13910,8 +14179,8 @@ namespace ts {
 
         // Function and class expression bodies are checked after all statements in the enclosing body. This is
         // to ensure constructs like the following are permitted:
-        //     let foo = function () {
-        //        let s = foo();
+        //     const foo = function () {
+        //        const s = foo();
         //        return "hello";
         //     }
         // Here, performing a full type check of the body of the function expression whilst in the process of
@@ -14017,7 +14286,7 @@ namespace ts {
         }
 
         function checkSourceFile(node: SourceFile) {
-            let start = new Date().getTime();
+            const start = new Date().getTime();
 
             checkSourceFileWorker(node);
 
@@ -14026,12 +14295,16 @@ namespace ts {
 
         // Fully type check a source file and collect the relevant diagnostics.
         function checkSourceFileWorker(node: SourceFile) {
-            let links = getNodeLinks(node);
+            const links = getNodeLinks(node);
             if (!(links.flags & NodeCheckFlags.TypeChecked)) {
                 // Check whether the file has declared it is the default lib,
                 // and whether the user has specifically chosen to avoid checking it.
-                if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) {
-                    return;
+                if (compilerOptions.skipDefaultLibCheck) {
+                    // If the user specified '--noLib' and a file has a '/// <reference no-default-lib="true"/>',
+                    // then we should treat that file as a default lib.
+                    if (node.hasNoDefaultLib) {
+                        return;
+                    }
                 }
 
                 // Grammar checking
@@ -14045,7 +14318,7 @@ namespace ts {
                 forEach(node.statements, checkSourceElement);
                 checkFunctionAndClassExpressionBodies(node);
 
-                if (isExternalModule(node)) {
+                if (isExternalOrCommonJsModule(node)) {
                     checkExternalModuleExports(node);
                 }
 
@@ -14128,7 +14401,7 @@ namespace ts {
         }
 
         function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
-            let symbols: SymbolTable = {};
+            const symbols: SymbolTable = {};
             let memberFlags: NodeFlags = 0;
 
             if (isInsideWithStatementBody(location)) {
@@ -14148,7 +14421,7 @@ namespace ts {
 
                     switch (location.kind) {
                         case SyntaxKind.SourceFile:
-                            if (!isExternalModule(<SourceFile>location)) {
+                            if (!isExternalOrCommonJsModule(<SourceFile>location)) {
                                 break;
                             }
                         case SyntaxKind.ModuleDeclaration:
@@ -14158,12 +14431,12 @@ namespace ts {
                             copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember);
                             break;
                         case SyntaxKind.ClassExpression:
-                            let className = (<ClassExpression>location).name;
+                            const className = (<ClassExpression>location).name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                            // fall through; this fall-through is necessary because we would like to handle
-                            // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
+                        // fall through; this fall-through is necessary because we would like to handle
+                        // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
                         case SyntaxKind.ClassDeclaration:
                         case SyntaxKind.InterfaceDeclaration:
                             // If we didn't come from static member of class or interface,
@@ -14175,7 +14448,7 @@ namespace ts {
                             }
                             break;
                         case SyntaxKind.FunctionExpression:
-                            let funcName = (<FunctionExpression>location).name;
+                            const funcName = (<FunctionExpression>location).name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
                             }
@@ -14202,7 +14475,7 @@ namespace ts {
              */
             function copySymbol(symbol: Symbol, meaning: SymbolFlags): void {
                 if (symbol.flags & meaning) {
-                    let id = symbol.name;
+                    const id = symbol.name;
                     // We will copy all symbol regardless of its reserved name because
                     // symbolsToArray will check whether the key is a reserved name and
                     // it will not copy symbol with reserved name to the array
@@ -14214,8 +14487,8 @@ namespace ts {
 
             function copySymbols(source: SymbolTable, meaning: SymbolFlags): void {
                 if (meaning) {
-                    for (let id in source) {
-                        let symbol = source[id];
+                    for (const id in source) {
+                        const symbol = source[id];
                         copySymbol(symbol, meaning);
                     }
                 }
@@ -14319,8 +14592,8 @@ namespace ts {
                 return resolveEntityName(<EntityName>entityName, meaning);
             }
             else if ((entityName.parent.kind === SyntaxKind.JsxOpeningElement) ||
-                     (entityName.parent.kind === SyntaxKind.JsxSelfClosingElement) ||
-                     (entityName.parent.kind === SyntaxKind.JsxClosingElement)) {
+                (entityName.parent.kind === SyntaxKind.JsxSelfClosingElement) ||
+                (entityName.parent.kind === SyntaxKind.JsxClosingElement)) {
                 return getJsxElementTagSymbol(<JsxOpeningLikeElement>entityName.parent);
             }
             else if (isExpression(entityName)) {
@@ -14332,18 +14605,18 @@ namespace ts {
                 if (entityName.kind === SyntaxKind.Identifier) {
                     // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                     // return the alias symbol.
-                    let meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Alias;
+                    const meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Alias;
                     return resolveEntityName(<Identifier>entityName, meaning);
                 }
                 else if (entityName.kind === SyntaxKind.PropertyAccessExpression) {
-                    let symbol = getNodeLinks(entityName).resolvedSymbol;
+                    const symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(<PropertyAccessExpression>entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
                 else if (entityName.kind === SyntaxKind.QualifiedName) {
-                    let symbol = getNodeLinks(entityName).resolvedSymbol;
+                    const symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(<QualifiedName>entityName);
                     }
@@ -14387,10 +14660,10 @@ namespace ts {
                         : getSymbolOfPartOfRightHandSideOfImportEquals(<Identifier>node);
                 }
                 else if (node.parent.kind === SyntaxKind.BindingElement &&
-                        node.parent.parent.kind === SyntaxKind.ObjectBindingPattern &&
-                        node === (<BindingElement>node.parent).propertyName) {
-                    let typeOfPattern = getTypeOfNode(node.parent.parent);
-                    let propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, (<Identifier>node).text);
+                    node.parent.parent.kind === SyntaxKind.ObjectBindingPattern &&
+                    node === (<BindingElement>node.parent).propertyName) {
+                    const typeOfPattern = getTypeOfNode(node.parent.parent);
+                    const propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, (<Identifier>node).text);
 
                     if (propertyDeclaration) {
                         return propertyDeclaration;
@@ -14406,12 +14679,12 @@ namespace ts {
 
                 case SyntaxKind.ThisKeyword:
                 case SyntaxKind.SuperKeyword:
-                    let type = isExpression(node) ? checkExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
+                    const type = isExpression(node) ? checkExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
                     return type.symbol;
 
                 case SyntaxKind.ConstructorKeyword:
                     // constructor keyword for an overload, should take us to the definition if it exist
-                    let constructorDeclaration = node.parent;
+                    const constructorDeclaration = node.parent;
                     if (constructorDeclaration && constructorDeclaration.kind === SyntaxKind.Constructor) {
                         return (<ClassDeclaration>constructorDeclaration.parent).symbol;
                     }
@@ -14425,14 +14698,14 @@ namespace ts {
                             (<ImportDeclaration>node.parent).moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, <LiteralExpression>node);
                     }
-                    // Fall through
+                // Fall through
 
                 case SyntaxKind.NumericLiteral:
                     // index access
                     if (node.parent.kind === SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).argumentExpression === node) {
-                        let objectType = checkExpression((<ElementAccessExpression>node.parent).expression);
+                        const objectType = checkExpression((<ElementAccessExpression>node.parent).expression);
                         if (objectType === unknownType) return undefined;
-                        let apparentType = getApparentType(objectType);
+                        const apparentType = getApparentType(objectType);
                         if (apparentType === unknownType) return undefined;
                         return getPropertyOfType(apparentType, (<LiteralExpression>node).text);
                     }
@@ -14473,23 +14746,23 @@ namespace ts {
 
             if (isTypeDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolAtLocation because it is a declaration
-                let symbol = getSymbolOfNode(node);
+                const symbol = getSymbolOfNode(node);
                 return getDeclaredTypeOfSymbol(symbol);
             }
 
             if (isTypeDeclarationName(node)) {
-                let symbol = getSymbolAtLocation(node);
+                const symbol = getSymbolAtLocation(node);
                 return symbol && getDeclaredTypeOfSymbol(symbol);
             }
 
             if (isDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolAtLocation because it is a declaration
-                let symbol = getSymbolOfNode(node);
+                const symbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(symbol);
             }
 
             if (isDeclarationName(node)) {
-                let symbol = getSymbolAtLocation(node);
+                const symbol = getSymbolAtLocation(node);
                 return symbol && getTypeOfSymbol(symbol);
             }
 
@@ -14498,8 +14771,8 @@ namespace ts {
             }
 
             if (isInRightSideOfImportOrExportAssignment(<Identifier>node)) {
-                let symbol = getSymbolAtLocation(node);
-                let declaredType = symbol && getDeclaredTypeOfSymbol(symbol);
+                const symbol = getSymbolAtLocation(node);
+                const declaredType = symbol && getDeclaredTypeOfSymbol(symbol);
                 return declaredType !== unknownType ? declaredType : getTypeOfSymbol(symbol);
             }
 
@@ -14519,7 +14792,7 @@ namespace ts {
           * whether the element is declared as "static".
           */
         function getParentTypeOfClassElement(node: ClassElement) {
-            let classSymbol = getSymbolOfNode(node.parent);
+            const classSymbol = getSymbolOfNode(node.parent);
             return node.flags & NodeFlags.Static
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
@@ -14529,7 +14802,7 @@ namespace ts {
         // if the type has call or construct signatures
         function getAugmentedPropertiesOfType(type: Type): Symbol[] {
             type = getApparentType(type);
-            let propsByName = createSymbolTable(getPropertiesOfType(type));
+            const propsByName = createSymbolTable(getPropertiesOfType(type));
             if (getSignaturesOfType(type, SignatureKind.Call).length || getSignaturesOfType(type, SignatureKind.Construct).length) {
                 forEach(getPropertiesOfType(globalFunctionType), p => {
                     if (!hasProperty(propsByName, p.name)) {
@@ -14542,10 +14815,10 @@ namespace ts {
 
         function getRootSymbols(symbol: Symbol): Symbol[] {
             if (symbol.flags & SymbolFlags.SyntheticProperty) {
-                let symbols: Symbol[] = [];
-                let name = symbol.name;
+                const symbols: Symbol[] = [];
+                const name = symbol.name;
                 forEach(getSymbolLinks(symbol).containingType.types, t => {
-                    let symbol = getPropertyOfType(t, name);
+                    const symbol = getPropertyOfType(t, name);
                     if (symbol) {
                         symbols.push(symbol);
                     }
@@ -14553,7 +14826,7 @@ namespace ts {
                 return symbols;
             }
             else if (symbol.flags & SymbolFlags.Transient) {
-                let target = getSymbolLinks(symbol).target;
+                const target = getSymbolLinks(symbol).target;
                 if (target) {
                     return [target];
                 }
@@ -14563,6 +14836,10 @@ namespace ts {
 
         // Emitter support
 
+        function isArgumentsLocalBinding(node: Identifier): boolean {
+            return getReferencedValueSymbol(node) === argumentsSymbol;
+        }
+
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
         // node of the exported entity's container. Otherwise, return undefined.
         function getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration {
@@ -14572,13 +14849,13 @@ namespace ts {
                     // If we reference an exported entity within the same module declaration, then whether
                     // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
                     // kinds that we do NOT prefix.
-                    let exportSymbol = getMergedSymbol(symbol.exportSymbol);
+                    const exportSymbol = getMergedSymbol(symbol.exportSymbol);
                     if (exportSymbol.flags & SymbolFlags.ExportHasLocal) {
                         return undefined;
                     }
                     symbol = exportSymbol;
                 }
-                let parentSymbol = getParentOfSymbol(symbol);
+                const parentSymbol = getParentOfSymbol(symbol);
                 if (parentSymbol) {
                     if (parentSymbol.flags & SymbolFlags.ValueModule && parentSymbol.valueDeclaration.kind === SyntaxKind.SourceFile) {
                         return <SourceFile>parentSymbol.valueDeclaration;
@@ -14595,7 +14872,7 @@ namespace ts {
         // When resolved as an expression identifier, if the given node references an import, return the declaration of
         // that import. Otherwise, return undefined.
         function getReferencedImportDeclaration(node: Identifier): Declaration {
-            let symbol = getReferencedValueSymbol(node);
+            const symbol = getReferencedValueSymbol(node);
             return symbol && symbol.flags & SymbolFlags.Alias ? getDeclarationOfAliasSymbol(symbol) : undefined;
         }
 
@@ -14613,11 +14890,11 @@ namespace ts {
 
         function isNestedRedeclarationSymbol(symbol: Symbol): boolean {
             if (symbol.flags & SymbolFlags.BlockScoped) {
-                let links = getSymbolLinks(symbol);
+                const links = getSymbolLinks(symbol);
                 if (links.isNestedRedeclaration === undefined) {
-                    let container = getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+                    const container = getEnclosingBlockScopeContainer(symbol.valueDeclaration);
                     links.isNestedRedeclaration = isStatementWithLocals(container) &&
-                    !!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+                        !!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                 }
                 return links.isNestedRedeclaration;
             }
@@ -14627,7 +14904,7 @@ namespace ts {
         // When resolved as an expression identifier, if the given node references a nested block scoped entity with
         // a name that hides an existing name, return the declaration of that entity. Otherwise, return undefined.
         function getReferencedNestedRedeclaration(node: Identifier): Declaration {
-            let symbol = getReferencedValueSymbol(node);
+            const symbol = getReferencedValueSymbol(node);
             return symbol && isNestedRedeclarationSymbol(symbol) ? symbol.valueDeclaration : undefined;
         }
 
@@ -14646,7 +14923,7 @@ namespace ts {
                 case SyntaxKind.ExportSpecifier:
                     return isAliasResolvedToValue(getSymbolOfNode(node));
                 case SyntaxKind.ExportDeclaration:
-                    let exportClause = (<ExportDeclaration>node).exportClause;
+                    const exportClause = (<ExportDeclaration>node).exportClause;
                     return exportClause && forEach(exportClause.elements, isValueAliasDeclaration);
                 case SyntaxKind.ExportAssignment:
                     return (<ExportAssignment>node).expression && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
@@ -14660,12 +14937,12 @@ namespace ts {
                 return false;
             }
 
-            let isValue = isAliasResolvedToValue(getSymbolOfNode(node));
+            const isValue = isAliasResolvedToValue(getSymbolOfNode(node));
             return isValue && node.moduleReference && !nodeIsMissing(node.moduleReference);
         }
 
         function isAliasResolvedToValue(symbol: Symbol): boolean {
-            let target = resolveAlias(symbol);
+            const target = resolveAlias(symbol);
             if (target === unknownSymbol && compilerOptions.isolatedModules) {
                 return true;
             }
@@ -14683,7 +14960,7 @@ namespace ts {
 
         function isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean {
             if (isAliasSymbolDeclaration(node)) {
-                let symbol = getSymbolOfNode(node);
+                const symbol = getSymbolOfNode(node);
                 if (getSymbolLinks(symbol).referenced) {
                     return true;
                 }
@@ -14697,8 +14974,8 @@ namespace ts {
 
         function isImplementationOfOverload(node: FunctionLikeDeclaration) {
             if (nodeIsPresent(node.body)) {
-                let symbol = getSymbolOfNode(node);
-                let signaturesOfSymbol = getSignaturesOfSymbol(symbol);
+                const symbol = getSymbolOfNode(node);
+                const signaturesOfSymbol = getSignaturesOfSymbol(symbol);
                 // If this function body corresponds to function with multiple signature, it is implementation of overload
                 // e.g.: function foo(a: string): string;
                 //       function foo(a: number): number;
@@ -14730,7 +15007,7 @@ namespace ts {
                 return getEnumMemberValue(<EnumMember>node);
             }
 
-            let symbol = getNodeLinks(node).resolvedSymbol;
+            const symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol && (symbol.flags & SymbolFlags.EnumMember)) {
                 // inline property\index accesses only for const enums
                 if (isConstEnumDeclaration(symbol.valueDeclaration.parent)) {
@@ -14747,19 +15024,19 @@ namespace ts {
 
         function getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind {
             // Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
-            let valueSymbol = resolveEntityName(typeName, SymbolFlags.Value, /*ignoreErrors*/ true);
-            let constructorType = valueSymbol ? getTypeOfSymbol(valueSymbol) : undefined;
+            const valueSymbol = resolveEntityName(typeName, SymbolFlags.Value, /*ignoreErrors*/ true);
+            const constructorType = valueSymbol ? getTypeOfSymbol(valueSymbol) : undefined;
             if (constructorType && isConstructorType(constructorType)) {
                 return TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue;
             }
 
             // Resolve the symbol as a type so that we can provide a more useful hint for the type serializer.
-            let typeSymbol = resolveEntityName(typeName, SymbolFlags.Type, /*ignoreErrors*/ true);
+            const typeSymbol = resolveEntityName(typeName, SymbolFlags.Type, /*ignoreErrors*/ true);
             // We might not be able to resolve type symbol so use unknown type in that case (eg error case)
             if (!typeSymbol) {
                 return TypeReferenceSerializationKind.ObjectType;
             }
-            let type = getDeclaredTypeOfSymbol(typeSymbol);
+            const type = getDeclaredTypeOfSymbol(typeSymbol);
             if (type === unknownType) {
                 return TypeReferenceSerializationKind.Unknown;
             }
@@ -14797,8 +15074,8 @@ namespace ts {
 
         function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
             // Get type of the symbol if this is the valid symbol otherwise get type at location
-            let symbol = getSymbolOfNode(declaration);
-            let type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
+            const symbol = getSymbolOfNode(declaration);
+            const type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
                 ? getTypeOfSymbol(symbol)
                 : unknownType;
 
@@ -14806,12 +15083,12 @@ namespace ts {
         }
 
         function writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            let signature = getSignatureFromDeclaration(signatureDeclaration);
+            const signature = getSignatureFromDeclaration(signatureDeclaration);
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
 
         function writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            let type = getTypeOfExpression(expr);
+            const type = getTypeOfExpression(expr);
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 
@@ -14827,7 +15104,7 @@ namespace ts {
 
         function getReferencedValueDeclaration(reference: Identifier): Declaration {
             Debug.assert(!nodeIsSynthesized(reference));
-            let symbol = getReferencedValueSymbol(reference);
+            const symbol = getReferencedValueSymbol(reference);
             return symbol && getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration;
         }
 
@@ -14836,12 +15113,12 @@ namespace ts {
                 return unknownType;
             }
 
-            let signature = getSingleCallSignature(functionType);
+            const signature = getSingleCallSignature(functionType);
             if (!signature) {
                 return unknownType;
             }
 
-            let instantiatedSignature = getSignatureInstantiation(signature, typeArguments);
+            const instantiatedSignature = getSignatureInstantiation(signature, typeArguments);
             return getOrCreateTypeFromSignature(instantiatedSignature);
         }
 
@@ -14867,28 +15144,39 @@ namespace ts {
                 collectLinkedAliases,
                 getReferencedValueDeclaration,
                 getTypeReferenceSerializationKind,
-                isOptionalParameter
+                isOptionalParameter,
+                isArgumentsLocalBinding,
+                getExternalModuleFileFromDeclaration
             };
         }
 
+        function getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): SourceFile {
+                const specifier = getExternalModuleName(declaration);
+                const moduleSymbol = getSymbolAtLocation(specifier);
+                if (!moduleSymbol) {
+                    return undefined;
+                }
+                return getDeclarationOfKind(moduleSymbol, SyntaxKind.SourceFile) as SourceFile;
+        }
+
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
             forEach(host.getSourceFiles(), file => {
-                bindSourceFile(file);
+                bindSourceFile(file, compilerOptions);
             });
 
             // Initialize global symbol table
             forEach(host.getSourceFiles(), file => {
-                if (!isExternalModule(file)) {
+                if (!isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
             });
 
-            // Initialize special symbols
             getSymbolLinks(undefinedSymbol).type = undefinedType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments");
             getSymbolLinks(unknownSymbol).type = unknownType;
             globals[undefinedSymbol.name] = undefinedSymbol;
+
             // Initialize special types
             globalArrayType = <GenericType>getGlobalType("Array", /*arity*/ 1);
             globalObjectType = getGlobalType("Object");
@@ -14938,7 +15226,7 @@ namespace ts {
         }
 
         function createInstantiatedPromiseLikeType(): ObjectType {
-            let promiseLikeType = getGlobalPromiseLikeType();
+            const promiseLikeType = getGlobalPromiseLikeType();
             if (promiseLikeType !== emptyGenericType) {
                 return createTypeReference(<GenericType>promiseLikeType, [anyType]);
             }
@@ -14948,10 +15236,10 @@ namespace ts {
 
         function createThenableType() {
             // build the thenable type that is used to verify against a non-promise "thenable" operand to `await`.
-            let thenPropertySymbol = createSymbol(SymbolFlags.Transient | SymbolFlags.Property, "then");
+            const thenPropertySymbol = createSymbol(SymbolFlags.Transient | SymbolFlags.Property, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
 
-            let thenableType = <ResolvedType>createObjectType(TypeFlags.Anonymous);
+            const thenableType = <ResolvedType>createObjectType(TypeFlags.Anonymous);
             thenableType.properties = [thenPropertySymbol];
             thenableType.members = createSymbolTable(thenableType.properties);
             thenableType.callSignatures = [];
@@ -14968,7 +15256,7 @@ namespace ts {
                 return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_not_valid_here);
             }
             else if (node.kind === SyntaxKind.GetAccessor || node.kind === SyntaxKind.SetAccessor) {
-                let accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, <AccessorDeclaration>node);
+                const accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, <AccessorDeclaration>node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
                 }
@@ -15023,7 +15311,7 @@ namespace ts {
 
             let lastStatic: Node, lastPrivate: Node, lastProtected: Node, lastDeclare: Node, lastAsync: Node;
             let flags = 0;
-            for (let modifier of node.modifiers) {
+            for (const modifier of node.modifiers) {
                 switch (modifier.kind) {
                     case SyntaxKind.PublicKeyword:
                     case SyntaxKind.ProtectedKeyword:
@@ -15214,9 +15502,9 @@ namespace ts {
 
         function checkGrammarForDisallowedTrailingComma(list: NodeArray<Node>): boolean {
             if (list && list.hasTrailingComma) {
-                let start = list.end - ",".length;
-                let end = list.end;
-                let sourceFile = getSourceFileOfNode(list[0]);
+                const start = list.end - ",".length;
+                const end = list.end;
+                const sourceFile = getSourceFileOfNode(list[0]);
                 return grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Trailing_comma_not_allowed);
             }
         }
@@ -15227,8 +15515,8 @@ namespace ts {
             }
 
             if (typeParameters && typeParameters.length === 0) {
-                let start = typeParameters.pos - "<".length;
-                let end = skipTrivia(file.text, typeParameters.end) + ">".length;
+                const start = typeParameters.pos - "<".length;
+                const end = skipTrivia(file.text, typeParameters.end) + ">".length;
                 return grammarErrorAtPos(file, start, end - start, Diagnostics.Type_parameter_list_cannot_be_empty);
             }
         }
@@ -15239,10 +15527,10 @@ namespace ts {
             }
 
             let seenOptionalParameter = false;
-            let parameterCount = parameters.length;
+            const parameterCount = parameters.length;
 
             for (let i = 0; i < parameterCount; i++) {
-                let parameter = parameters[i];
+                const parameter = parameters[i];
                 if (parameter.dotDotDotToken) {
                     if (i !== (parameterCount - 1)) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
@@ -15275,16 +15563,16 @@ namespace ts {
 
         function checkGrammarFunctionLikeDeclaration(node: FunctionLikeDeclaration): boolean {
             // Prevent cascading error by short-circuit
-            let file = getSourceFileOfNode(node);
+            const file = getSourceFileOfNode(node);
             return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarTypeParameterList(node, node.typeParameters, file) ||
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
 
         function checkGrammarArrowFunction(node: FunctionLikeDeclaration, file: SourceFile): boolean {
             if (node.kind === SyntaxKind.ArrowFunction) {
-                let arrowFunction = <ArrowFunction>node;
-                let startLine = getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
-                let endLine = getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
+                const arrowFunction = <ArrowFunction>node;
+                const startLine = getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
+                const endLine = getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
                 if (startLine !== endLine) {
                     return grammarErrorOnNode(arrowFunction.equalsGreaterThanToken, Diagnostics.Line_terminator_not_permitted_before_arrow);
                 }
@@ -15293,7 +15581,7 @@ namespace ts {
         }
 
         function checkGrammarIndexSignatureParameters(node: SignatureDeclaration): boolean {
-            let parameter = node.parameters[0];
+            const parameter = node.parameters[0];
             if (node.parameters.length !== 1) {
                 if (parameter) {
                     return grammarErrorOnNode(parameter.name, Diagnostics.An_index_signature_must_have_exactly_one_parameter);
@@ -15338,9 +15626,9 @@ namespace ts {
 
         function checkGrammarForAtLeastOneTypeArgument(node: Node, typeArguments: NodeArray<TypeNode>): boolean {
             if (typeArguments && typeArguments.length === 0) {
-                let sourceFile = getSourceFileOfNode(node);
-                let start = typeArguments.pos - "<".length;
-                let end = skipTrivia(sourceFile.text, typeArguments.end) + ">".length;
+                const sourceFile = getSourceFileOfNode(node);
+                const start = typeArguments.pos - "<".length;
+                const end = skipTrivia(sourceFile.text, typeArguments.end) + ">".length;
                 return grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Type_argument_list_cannot_be_empty);
             }
         }
@@ -15352,8 +15640,8 @@ namespace ts {
 
         function checkGrammarForOmittedArgument(node: CallExpression, args: NodeArray<Expression>): boolean {
             if (args) {
-                let sourceFile = getSourceFileOfNode(node);
-                for (let arg of args) {
+                const sourceFile = getSourceFileOfNode(node);
+                for (const arg of args) {
                     if (arg.kind === SyntaxKind.OmittedExpression) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, Diagnostics.Argument_expression_expected);
                     }
@@ -15367,13 +15655,13 @@ namespace ts {
         }
 
         function checkGrammarHeritageClause(node: HeritageClause): boolean {
-            let types = node.types;
+            const types = node.types;
             if (checkGrammarForDisallowedTrailingComma(types)) {
                 return true;
             }
             if (types && types.length === 0) {
-                let listType = tokenToString(node.token);
-                let sourceFile = getSourceFileOfNode(node);
+                const listType = tokenToString(node.token);
+                const sourceFile = getSourceFileOfNode(node);
                 return grammarErrorAtPos(sourceFile, types.pos, 0, Diagnostics._0_list_cannot_be_empty, listType);
             }
         }
@@ -15383,7 +15671,7 @@ namespace ts {
             let seenImplementsClause = false;
 
             if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && node.heritageClauses) {
-                for (let heritageClause of node.heritageClauses) {
+                for (const heritageClause of node.heritageClauses) {
                     if (heritageClause.token === SyntaxKind.ExtendsKeyword) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, Diagnostics.extends_clause_already_seen);
@@ -15418,7 +15706,7 @@ namespace ts {
             let seenExtendsClause = false;
 
             if (node.heritageClauses) {
-                for (let heritageClause of node.heritageClauses) {
+                for (const heritageClause of node.heritageClauses) {
                     if (heritageClause.token === SyntaxKind.ExtendsKeyword) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, Diagnostics.extends_clause_already_seen);
@@ -15445,7 +15733,7 @@ namespace ts {
                 return false;
             }
 
-            let computedPropertyName = <ComputedPropertyName>node;
+            const computedPropertyName = <ComputedPropertyName>node;
             if (computedPropertyName.expression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>computedPropertyName.expression).operatorToken.kind === SyntaxKind.CommaToken) {
                 return grammarErrorOnNode(computedPropertyName.expression, Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
@@ -15476,14 +15764,14 @@ namespace ts {
         }
 
         function checkGrammarObjectLiteralExpression(node: ObjectLiteralExpression, inDestructuring: boolean) {
-            let seen: Map<SymbolFlags> = {};
-            let Property = 1;
-            let GetAccessor = 2;
-            let SetAccesor = 4;
-            let GetOrSetAccessor = GetAccessor | SetAccesor;
+            const seen: Map<SymbolFlags> = {};
+            const Property = 1;
+            const GetAccessor = 2;
+            const SetAccesor = 4;
+            const GetOrSetAccessor = GetAccessor | SetAccesor;
 
-            for (let prop of node.properties) {
-                let name = prop.name;
+            for (const prop of node.properties) {
+                const name = prop.name;
                 if (prop.kind === SyntaxKind.OmittedExpression ||
                     name.kind === SyntaxKind.ComputedPropertyName) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
@@ -15531,7 +15819,7 @@ namespace ts {
                     seen[(<Identifier>name).text] = currentKind;
                 }
                 else {
-                    let existingKind = seen[(<Identifier>name).text];
+                    const existingKind = seen[(<Identifier>name).text];
                     if (currentKind === Property && existingKind === Property) {
                         continue;
                     }
@@ -15550,15 +15838,15 @@ namespace ts {
             }
         }
 
-        function checkGrammarJsxElement(node: JsxOpeningElement|JsxSelfClosingElement) {
+        function checkGrammarJsxElement(node: JsxOpeningLikeElement) {
             const seen: Map<boolean> = {};
-            for (let attr of node.attributes) {
+            for (const attr of node.attributes) {
                 if (attr.kind === SyntaxKind.JsxSpreadAttribute) {
                     continue;
                 }
 
-                let jsxAttr = (<JsxAttribute>attr);
-                let name = jsxAttr.name;
+                const jsxAttr = (<JsxAttribute>attr);
+                const name = jsxAttr.name;
                 if (!hasProperty(seen, name.text)) {
                     seen[name.text] = true;
                 }
@@ -15566,7 +15854,7 @@ namespace ts {
                     return grammarErrorOnNode(name, Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
 
-                let initializer = jsxAttr.initializer;
+                const initializer = jsxAttr.initializer;
                 if (initializer && initializer.kind === SyntaxKind.JsxExpression && !(<JsxExpression>initializer).expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
@@ -15579,23 +15867,23 @@ namespace ts {
             }
 
             if (forInOrOfStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                let variableList = <VariableDeclarationList>forInOrOfStatement.initializer;
+                const variableList = <VariableDeclarationList>forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     if (variableList.declarations.length > 1) {
-                        let diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
+                        const diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
                             ? Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
-                    let firstDeclaration = variableList.declarations[0];
+                    const firstDeclaration = variableList.declarations[0];
                     if (firstDeclaration.initializer) {
-                        let diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
+                        const diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
                             ? Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        let diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
+                        const diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
                             ? Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -15607,7 +15895,7 @@ namespace ts {
         }
 
         function checkGrammarAccessor(accessor: MethodDeclaration): boolean {
-            let kind = accessor.kind;
+            const kind = accessor.kind;
             if (languageVersion < ScriptTarget.ES5) {
                 return grammarErrorOnNode(accessor.name, Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
             }
@@ -15631,7 +15919,7 @@ namespace ts {
                     return grammarErrorOnNode(accessor.name, Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
                 }
                 else {
-                    let parameter = accessor.parameters[0];
+                    const parameter = accessor.parameters[0];
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
@@ -15649,7 +15937,7 @@ namespace ts {
         }
 
         function checkGrammarForNonSymbolComputedProperty(node: DeclarationName, message: DiagnosticMessage) {
-            if (node.kind === SyntaxKind.ComputedPropertyName && !isWellKnownSymbolSyntactically((<ComputedPropertyName>node).expression)) {
+            if (isDynamicName(node)) {
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -15694,21 +15982,6 @@ namespace ts {
             }
         }
 
-        function isIterationStatement(node: Node, lookInLabeledStatements: boolean): boolean {
-            switch (node.kind) {
-                case SyntaxKind.ForStatement:
-                case SyntaxKind.ForInStatement:
-                case SyntaxKind.ForOfStatement:
-                case SyntaxKind.DoStatement:
-                case SyntaxKind.WhileStatement:
-                    return true;
-                case SyntaxKind.LabeledStatement:
-                    return lookInLabeledStatements && isIterationStatement((<LabeledStatement>node).statement, lookInLabeledStatements);
-            }
-
-            return false;
-        }
-
         function checkGrammarBreakOrContinueStatement(node: BreakOrContinueStatement): boolean {
             let current: Node = node;
             while (current) {
@@ -15721,7 +15994,7 @@ namespace ts {
                         if (node.label && (<LabeledStatement>current).label.text === node.label.text) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            let isMisplacedContinueLabel = node.kind === SyntaxKind.ContinueStatement
+                            const isMisplacedContinueLabel = node.kind === SyntaxKind.ContinueStatement
                                 && !isIterationStatement((<LabeledStatement>current).statement, /*lookInLabeledStatement*/ true);
 
                             if (isMisplacedContinueLabel) {
@@ -15749,14 +16022,14 @@ namespace ts {
             }
 
             if (node.label) {
-                let message = node.kind === SyntaxKind.BreakStatement
+                const message = node.kind === SyntaxKind.BreakStatement
                     ? Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
 
                 return grammarErrorOnNode(node, message);
             }
             else {
-                let message = node.kind === SyntaxKind.BreakStatement
+                const message = node.kind === SyntaxKind.BreakStatement
                     ? Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -15765,7 +16038,7 @@ namespace ts {
 
         function checkGrammarBindingElement(node: BindingElement) {
             if (node.dotDotDotToken) {
-                let elements = (<BindingPattern>node.parent).elements;
+                const elements = (<BindingPattern>node.parent).elements;
                 if (node !== lastOrUndefined(elements)) {
                     return grammarErrorOnNode(node, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                 }
@@ -15786,7 +16059,7 @@ namespace ts {
                 if (isInAmbientContext(node)) {
                     if (node.initializer) {
                         // Error on equals token which immediate precedes the initializer
-                        let equalsTokenLength = "=".length;
+                        const equalsTokenLength = "=".length;
                         return grammarErrorAtPos(getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength,
                             equalsTokenLength, Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
                     }
@@ -15801,7 +16074,7 @@ namespace ts {
                 }
             }
 
-            let checkLetConstNames = languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node));
+            const checkLetConstNames = languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node));
 
             // 1. LexicalDeclaration : LetOrConst BindingList ;
             // It is a Syntax Error if the BoundNames of BindingList contains "let".
@@ -15820,8 +16093,8 @@ namespace ts {
                 }
             }
             else {
-                let elements = (<BindingPattern>name).elements;
-                for (let element of elements) {
+                const elements = (<BindingPattern>name).elements;
+                for (const element of elements) {
                     if (element.kind !== SyntaxKind.OmittedExpression) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
@@ -15830,7 +16103,7 @@ namespace ts {
         }
 
         function checkGrammarVariableDeclarationList(declarationList: VariableDeclarationList): boolean {
-            let declarations = declarationList.declarations;
+            const declarations = declarationList.declarations;
             if (checkGrammarForDisallowedTrailingComma(declarationList.declarations)) {
                 return true;
             }
@@ -15870,7 +16143,7 @@ namespace ts {
 
         function isIntegerLiteral(expression: Expression): boolean {
             if (expression.kind === SyntaxKind.PrefixUnaryExpression) {
-                let unaryExpression = <PrefixUnaryExpression>expression;
+                const unaryExpression = <PrefixUnaryExpression>expression;
                 if (unaryExpression.operator === SyntaxKind.PlusToken || unaryExpression.operator === SyntaxKind.MinusToken) {
                     expression = unaryExpression.operand;
                 }
@@ -15892,9 +16165,9 @@ namespace ts {
         }
 
         function grammarErrorOnFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean {
-            let sourceFile = getSourceFileOfNode(node);
+            const sourceFile = getSourceFileOfNode(node);
             if (!hasParseDiagnostics(sourceFile)) {
-                let span = getSpanOfTokenAtPosition(sourceFile, node.pos);
+                const span = getSpanOfTokenAtPosition(sourceFile, node.pos);
                 diagnostics.add(createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2));
                 return true;
             }
@@ -15908,7 +16181,7 @@ namespace ts {
         }
 
         function grammarErrorOnNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean {
-            let sourceFile = getSourceFileOfNode(node);
+            const sourceFile = getSourceFileOfNode(node);
             if (!hasParseDiagnostics(sourceFile)) {
                 diagnostics.add(createDiagnosticForNode(node, message, arg0, arg1, arg2));
                 return true;
@@ -15962,11 +16235,14 @@ namespace ts {
             //  DeclarationElement:
             //     ExportAssignment
             //     export_opt   InterfaceDeclaration
+            //     export_opt   TypeAliasDeclaration
             //     export_opt   ImportDeclaration
             //     export_opt   ExternalImportDeclaration
             //     export_opt   AmbientDeclaration
             //
+            // TODO: The spec needs to be amended to reflect this grammar.
             if (node.kind === SyntaxKind.InterfaceDeclaration ||
+                node.kind === SyntaxKind.TypeAliasDeclaration ||
                 node.kind === SyntaxKind.ImportDeclaration ||
                 node.kind === SyntaxKind.ImportEqualsDeclaration ||
                 node.kind === SyntaxKind.ExportDeclaration ||
@@ -15981,7 +16257,7 @@ namespace ts {
         }
 
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file: SourceFile): boolean {
-            for (let decl of file.statements) {
+            for (const decl of file.statements) {
                 if (isDeclaration(decl) || decl.kind === SyntaxKind.VariableStatement) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
@@ -16002,7 +16278,7 @@ namespace ts {
                 }
 
                 // Find containing block which is either Block, ModuleBlock, SourceFile
-                let links = getNodeLinks(node);
+                const links = getNodeLinks(node);
                 if (!links.hasReportedStatementInAmbientContext && isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
@@ -16013,7 +16289,7 @@ namespace ts {
                 // this has already been reported, and don't report if it has.
                 //
                 if (node.parent.kind === SyntaxKind.Block || node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
-                    let links = getNodeLinks(node.parent);
+                    const links = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links.hasReportedStatementInAmbientContext) {
                         return links.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -16035,9 +16311,9 @@ namespace ts {
         }
 
         function grammarErrorAfterFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean {
-            let sourceFile = getSourceFileOfNode(node);
+            const sourceFile = getSourceFileOfNode(node);
             if (!hasParseDiagnostics(sourceFile)) {
-                let span = getSpanOfTokenAtPosition(sourceFile, node.pos);
+                const span = getSpanOfTokenAtPosition(sourceFile, node.pos);
                 diagnostics.add(createFileDiagnostic(sourceFile, textSpanEnd(span), /*length*/ 0, message, arg0, arg1, arg2));
                 return true;
             }
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 0c561ab06d8..3fca97c0450 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -1,6 +1,7 @@
 /// <reference path="sys.ts"/>
 /// <reference path="types.ts"/>
 /// <reference path="core.ts"/>
+/// <reference path="diagnosticInformationMap.generated.ts"/>
 /// <reference path="scanner.ts"/>
 
 namespace ts {
@@ -79,9 +80,9 @@ namespace ts {
                 "es6": ModuleKind.ES6,
                 "es2015": ModuleKind.ES2015,
             },
-            description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6,
+            description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
             paramType: Diagnostics.KIND,
-            error: Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es6
+            error: Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
         },
         {
             name: "newLine",
@@ -150,6 +151,12 @@ namespace ts {
             type: "boolean",
             description: Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
+        {
+            name: "pretty",
+            paramType: Diagnostics.KIND,
+            description: Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
         {
             name: "project",
             shortName: "p",
@@ -212,9 +219,9 @@ namespace ts {
                 "es6": ScriptTarget.ES6,
                 "es2015": ScriptTarget.ES2015,
             },
-            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
+            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
             paramType: Diagnostics.VERSION,
-            error: Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES6
+            error: Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
         },
         {
             name: "version",
@@ -247,6 +254,31 @@ namespace ts {
             },
             description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
             error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         }
     ];
 
@@ -263,8 +295,8 @@ namespace ts {
             return optionNameMapCache;
         }
 
-        let optionNameMap: Map<CommandLineOption> = {};
-        let shortOptionNames: Map<string> = {};
+        const optionNameMap: Map<CommandLineOption> = {};
+        const shortOptionNames: Map<string> = {};
         forEach(optionDeclarations, option => {
             optionNameMap[option.name.toLowerCase()] = option;
             if (option.shortName) {
@@ -277,10 +309,10 @@ namespace ts {
     }
 
     export function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine {
-        let options: CompilerOptions = {};
-        let fileNames: string[] = [];
-        let errors: Diagnostic[] = [];
-        let { optionNameMap, shortOptionNames } = getOptionNameMap();
+        const options: CompilerOptions = {};
+        const fileNames: string[] = [];
+        const errors: Diagnostic[] = [];
+        const { optionNameMap, shortOptionNames } = getOptionNameMap();
 
         parseStrings(commandLine);
         return {
@@ -305,7 +337,7 @@ namespace ts {
                     }
 
                     if (hasProperty(optionNameMap, s)) {
-                        let opt = optionNameMap[s];
+                        const opt = optionNameMap[s];
 
                         // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
                         if (!args[i] && opt.type !== "boolean") {
@@ -345,19 +377,19 @@ namespace ts {
         }
 
         function parseResponseFile(fileName: string) {
-            let text = readFile ? readFile(fileName) : sys.readFile(fileName);
+            const text = readFile ? readFile(fileName) : sys.readFile(fileName);
 
             if (!text) {
                 errors.push(createCompilerDiagnostic(Diagnostics.File_0_not_found, fileName));
                 return;
             }
 
-            let args: string[] = [];
+            const args: string[] = [];
             let pos = 0;
             while (true) {
                 while (pos < text.length && text.charCodeAt(pos) <= CharacterCodes.space) pos++;
                 if (pos >= text.length) break;
-                let start = pos;
+                const start = pos;
                 if (text.charCodeAt(start) === CharacterCodes.doubleQuote) {
                     pos++;
                     while (pos < text.length && text.charCodeAt(pos) !== CharacterCodes.doubleQuote) pos++;
@@ -400,13 +432,41 @@ namespace ts {
       */
     export function parseConfigFileTextToJson(fileName: string, jsonText: string): { config?: any; error?: Diagnostic } {
         try {
-            return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} };
+            const jsonTextWithoutComments = removeComments(jsonText);
+            return { config: /\S/.test(jsonTextWithoutComments) ? JSON.parse(jsonTextWithoutComments) : {} };
         }
         catch (e) {
             return { error: createCompilerDiagnostic(Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
         }
     }
 
+
+    /**
+     * Remove the comments from a json like text.
+     * Comments can be single line comments (starting with # or //) or multiline comments using / * * /
+     *
+     * This method replace comment content by whitespace rather than completely remove them to keep positions in json parsing error reporting accurate.
+     */
+    function removeComments(jsonText: string): string {
+        let output = "";
+        const scanner = createScanner(ScriptTarget.ES5, /* skipTrivia */ false, LanguageVariant.Standard, jsonText);
+        let token: SyntaxKind;
+        while ((token = scanner.scan()) !== SyntaxKind.EndOfFileToken) {
+            switch (token) {
+                case SyntaxKind.SingleLineCommentTrivia:
+                case SyntaxKind.MultiLineCommentTrivia:
+                    // replace comments with whitespace to preserve original character positions
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
+
+
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
@@ -415,7 +475,7 @@ namespace ts {
       *    file to. e.g. outDir
       */
     export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine {
-        let { options, errors } = convertCompilerOptionsFromJson(json["compilerOptions"], basePath);
+        const { options, errors } = convertCompilerOptionsFromJson(json["compilerOptions"], basePath);
 
         return {
             options,
@@ -434,12 +494,12 @@ namespace ts {
                 }
             }
             else {
-                let exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
-                let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
+                const exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
+                const sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
                 for (let i = 0; i < sysFiles.length; i++) {
-                    let name = sysFiles[i];
+                    const name = sysFiles[i];
                     if (fileExtensionIs(name, ".d.ts")) {
-                        let baseName = name.substr(0, name.length - ".d.ts".length);
+                        const baseName = name.substr(0, name.length - ".d.ts".length);
                         if (!contains(sysFiles, baseName + ".tsx") && !contains(sysFiles, baseName + ".ts")) {
                             fileNames.push(name);
                         }
@@ -459,24 +519,24 @@ namespace ts {
     }
 
     export function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string): { options: CompilerOptions, errors: Diagnostic[] } {
-        let options: CompilerOptions = {};
-        let errors: Diagnostic[] = [];
+        const options: CompilerOptions = {};
+        const errors: Diagnostic[] = [];
 
         if (!jsonOptions) {
             return { options, errors };
         }
 
-        let optionNameMap = arrayToMap(optionDeclarations, opt => opt.name);
+        const optionNameMap = arrayToMap(optionDeclarations, opt => opt.name);
 
-        for (let id in jsonOptions) {
+        for (const id in jsonOptions) {
             if (hasProperty(optionNameMap, id)) {
-                let opt = optionNameMap[id];
-                let optType = opt.type;
+                const opt = optionNameMap[id];
+                const optType = opt.type;
                 let value = jsonOptions[id];
-                let expectedType = typeof optType === "string" ? optType : "string";
+                const expectedType = typeof optType === "string" ? optType : "string";
                 if (typeof value === expectedType) {
                     if (typeof optType !== "string") {
-                        let key = value.toLowerCase();
+                        const key = value.toLowerCase();
                         if (hasProperty(optType, key)) {
                             value = optType[key];
                         }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 9a4f5452eed..2092a59a545 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -17,45 +17,55 @@ namespace ts {
         True = -1
     }
 
-    export function createFileMap<T>(getCanonicalFileName: (fileName: string) => string): FileMap<T> {
+    export function createFileMap<T>(keyMapper?: (key: string) => string): FileMap<T> {
         let files: Map<T> = {};
         return {
             get,
             set,
             contains,
             remove,
-            clear,
-            forEachValue: forEachValueInMap
+            forEachValue: forEachValueInMap,
+            clear
         };
 
-        function set(fileName: string, value: T) {
-            files[normalizeKey(fileName)] = value;
+        function forEachValueInMap(f: (key: Path, value: T) => void) {
+            for (const key in files) {
+                f(<Path>key, files[key]);
+            }
         }
 
-        function get(fileName: string) {
-            return files[normalizeKey(fileName)];
+        // path should already be well-formed so it does not need to be normalized
+        function get(path: Path): T {
+            return files[toKey(path)];
         }
 
-        function contains(fileName: string) {
-            return hasProperty(files, normalizeKey(fileName));
+        function set(path: Path, value: T) {
+            files[toKey(path)] = value;
         }
 
-        function remove (fileName: string) {
-            let key = normalizeKey(fileName);
+        function contains(path: Path) {
+            return hasProperty(files, toKey(path));
+        }
+
+        function remove(path: Path) {
+            const key = toKey(path);
             delete files[key];
         }
 
-        function forEachValueInMap(f: (value: T) => void) {
-            forEachValue(files, f);
-        }
-
-        function normalizeKey(key: string) {
-            return getCanonicalFileName(normalizeSlashes(key));
-        }
-
         function clear() {
             files = {};
         }
+
+        function toKey(path: Path): string {
+            return keyMapper ? keyMapper(path) : path;
+        }
+    }
+
+    export function toPath(fileName: string, basePath: string, getCanonicalFileName: (path: string) => string): Path {
+        const nonCanonicalizedPath = isRootedDiskPath(fileName)
+            ? normalizePath(fileName)
+            : getNormalizedAbsolutePath(fileName, basePath);
+        return <Path>getCanonicalFileName(nonCanonicalizedPath);
     }
 
     export const enum Comparison {
@@ -74,7 +84,7 @@ namespace ts {
     export function forEach<T, U>(array: T[], callback: (element: T, index: number) => U): U {
         if (array) {
             for (let i = 0, len = array.length; i < len; i++) {
-                let result = callback(array[i], i);
+                const result = callback(array[i], i);
                 if (result) {
                     return result;
                 }
@@ -85,7 +95,7 @@ namespace ts {
 
     export function contains<T>(array: T[], value: T): boolean {
         if (array) {
-            for (let v of array) {
+            for (const v of array) {
                 if (v === value) {
                     return true;
                 }
@@ -108,7 +118,7 @@ namespace ts {
     export function countWhere<T>(array: T[], predicate: (x: T) => boolean): number {
         let count = 0;
         if (array) {
-            for (let v of array) {
+            for (const v of array) {
                 if (predicate(v)) {
                     count++;
                 }
@@ -121,7 +131,7 @@ namespace ts {
         let result: T[];
         if (array) {
             result = [];
-            for (let item of array) {
+            for (const item of array) {
                 if (f(item)) {
                     result.push(item);
                 }
@@ -134,7 +144,7 @@ namespace ts {
         let result: U[];
         if (array) {
             result = [];
-            for (let v of array) {
+            for (const v of array) {
                 result.push(f(v));
             }
         }
@@ -152,7 +162,7 @@ namespace ts {
         let result: T[];
         if (array) {
             result = [];
-            for (let item of array) {
+            for (const item of array) {
                 if (!contains(result, item)) {
                     result.push(item);
                 }
@@ -163,7 +173,7 @@ namespace ts {
 
     export function sum(array: any[], prop: string): number {
         let result = 0;
-        for (let v of array) {
+        for (const v of array) {
             result += v[prop];
         }
         return result;
@@ -171,7 +181,7 @@ namespace ts {
 
     export function addRange<T>(to: T[], from: T[]): void {
         if (to && from) {
-            for (let v of from) {
+            for (const v of from) {
                 to.push(v);
             }
         }
@@ -210,8 +220,8 @@ namespace ts {
         let high = array.length - 1;
 
         while (low <= high) {
-            let middle = low + ((high - low) >> 1);
-            let midValue = array[middle];
+            const middle = low + ((high - low) >> 1);
+            const midValue = array[middle];
 
             if (midValue === value) {
                 return middle;
@@ -260,7 +270,7 @@ namespace ts {
         return initial;
     }
 
-    let hasOwnProperty = Object.prototype.hasOwnProperty;
+    const hasOwnProperty = Object.prototype.hasOwnProperty;
 
     export function hasProperty<T>(map: Map<T>, key: string): boolean {
         return hasOwnProperty.call(map, key);
@@ -271,7 +281,7 @@ namespace ts {
     }
 
     export function isEmpty<T>(map: Map<T>) {
-        for (let id in map) {
+        for (const id in map) {
             if (hasProperty(map, id)) {
                 return false;
             }
@@ -280,19 +290,19 @@ namespace ts {
     }
 
     export function clone<T>(object: T): T {
-        let result: any = {};
-        for (let id in object) {
+        const result: any = {};
+        for (const id in object) {
             result[id] = (<any>object)[id];
         }
         return <T>result;
     }
 
     export function extend<T1, T2>(first: Map<T1>, second: Map<T2>): Map<T1 & T2> {
-        let result: Map<T1 & T2> = {};
-        for (let id in first) {
+        const result: Map<T1 & T2> = {};
+        for (const id in first) {
             (result as any)[id] = first[id];
         }
-        for (let id in second) {
+        for (const id in second) {
             if (!hasProperty(result, id)) {
                 (result as any)[id] = second[id];
             }
@@ -302,7 +312,7 @@ namespace ts {
 
     export function forEachValue<T, U>(map: Map<T>, callback: (value: T) => U): U {
         let result: U;
-        for (let id in map) {
+        for (const id in map) {
             if (result = callback(map[id])) break;
         }
         return result;
@@ -310,7 +320,7 @@ namespace ts {
 
     export function forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U {
         let result: U;
-        for (let id in map) {
+        for (const id in map) {
             if (result = callback(id)) break;
         }
         return result;
@@ -321,7 +331,7 @@ namespace ts {
     }
 
     export function copyMap<T>(source: Map<T>, target: Map<T>): void {
-        for (let p in source) {
+        for (const p in source) {
             target[p] = source[p];
         }
     }
@@ -337,7 +347,7 @@ namespace ts {
      * index in the array will be the one associated with the produced key.
      */
     export function arrayToMap<T>(array: T[], makeKey: (value: T) => string): Map<T> {
-        let result: Map<T> = {};
+        const result: Map<T> = {};
 
         forEach(array, value => {
             result[makeKey(value)] = value;
@@ -365,15 +375,15 @@ namespace ts {
 
     export let localizedDiagnosticMessages: Map<string> = undefined;
 
-    export function getLocaleSpecificMessage(message: string) {
-        return localizedDiagnosticMessages && localizedDiagnosticMessages[message]
-            ? localizedDiagnosticMessages[message]
-            : message;
+    export function getLocaleSpecificMessage(message: DiagnosticMessage) {
+        return localizedDiagnosticMessages && localizedDiagnosticMessages[message.key]
+            ? localizedDiagnosticMessages[message.key]
+            : message.message;
     }
 
     export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage, ...args: any[]): Diagnostic;
     export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage): Diagnostic {
-        let end = start + length;
+        const end = start + length;
 
         Debug.assert(start >= 0, "start must be non-negative, is " + start);
         Debug.assert(length >= 0, "length must be non-negative, is " + length);
@@ -383,7 +393,7 @@ namespace ts {
             Debug.assert(end <= file.text.length, `end must be the bounds of the file. ${ end } > ${ file.text.length }`);
         }
 
-        let text = getLocaleSpecificMessage(message.key);
+        let text = getLocaleSpecificMessage(message);
 
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
@@ -402,7 +412,7 @@ namespace ts {
 
     export function createCompilerDiagnostic(message: DiagnosticMessage, ...args: any[]): Diagnostic;
     export function createCompilerDiagnostic(message: DiagnosticMessage): Diagnostic {
-        let text = getLocaleSpecificMessage(message.key);
+        let text = getLocaleSpecificMessage(message);
 
         if (arguments.length > 1) {
             text = formatStringFromArgs(text, arguments, 1);
@@ -421,7 +431,7 @@ namespace ts {
 
     export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
     export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
-        let text = getLocaleSpecificMessage(message.key);
+        let text = getLocaleSpecificMessage(message);
 
         if (arguments.length > 2) {
             text = formatStringFromArgs(text, arguments, 2);
@@ -469,10 +479,10 @@ namespace ts {
     function compareMessageText(text1: string | DiagnosticMessageChain, text2: string | DiagnosticMessageChain): Comparison {
         while (text1 && text2) {
             // We still have both chains.
-            let string1 = typeof text1 === "string" ? text1 : text1.messageText;
-            let string2 = typeof text2 === "string" ? text2 : text2.messageText;
+            const string1 = typeof text1 === "string" ? text1 : text1.messageText;
+            const string2 = typeof text2 === "string" ? text2 : text2.messageText;
 
-            let res = compareValues(string1, string2);
+            const res = compareValues(string1, string2);
             if (res) {
                 return res;
             }
@@ -499,11 +509,11 @@ namespace ts {
             return diagnostics;
         }
 
-        let newDiagnostics = [diagnostics[0]];
+        const newDiagnostics = [diagnostics[0]];
         let previousDiagnostic = diagnostics[0];
         for (let i = 1; i < diagnostics.length; i++) {
-            let currentDiagnostic = diagnostics[i];
-            let isDupe = compareDiagnostics(currentDiagnostic, previousDiagnostic) === Comparison.EqualTo;
+            const currentDiagnostic = diagnostics[i];
+            const isDupe = compareDiagnostics(currentDiagnostic, previousDiagnostic) === Comparison.EqualTo;
             if (!isDupe) {
                 newDiagnostics.push(currentDiagnostic);
                 previousDiagnostic = currentDiagnostic;
@@ -521,9 +531,9 @@ namespace ts {
     export function getRootLength(path: string): number {
         if (path.charCodeAt(0) === CharacterCodes.slash) {
             if (path.charCodeAt(1) !== CharacterCodes.slash) return 1;
-            let p1 = path.indexOf("/", 2);
+            const p1 = path.indexOf("/", 2);
             if (p1 < 0) return 2;
-            let p2 = path.indexOf("/", p1 + 1);
+            const p2 = path.indexOf("/", p1 + 1);
             if (p2 < 0) return p1 + 1;
             return p2 + 1;
         }
@@ -539,7 +549,7 @@ namespace ts {
         if (path.lastIndexOf("file:///", 0) === 0) {
             return "file:///".length;
         }
-        let idx = path.indexOf("://");
+        const idx = path.indexOf("://");
         if (idx !== -1) {
             return idx + "://".length;
         }
@@ -548,9 +558,9 @@ namespace ts {
 
     export let directorySeparator = "/";
     function getNormalizedParts(normalizedSlashedPath: string, rootLength: number) {
-        let parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);
-        let normalized: string[] = [];
-        for (let part of parts) {
+        const parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);
+        const normalized: string[] = [];
+        for (const part of parts) {
             if (part !== ".") {
                 if (part === ".." && normalized.length > 0 && lastOrUndefined(normalized) !== "..") {
                     normalized.pop();
@@ -570,8 +580,8 @@ namespace ts {
 
     export function normalizePath(path: string): string {
         path = normalizeSlashes(path);
-        let rootLength = getRootLength(path);
-        let normalized = getNormalizedParts(path, rootLength);
+        const rootLength = getRootLength(path);
+        const normalized = getNormalizedParts(path, rootLength);
         return path.substr(0, rootLength) + normalized.join(directorySeparator);
     }
 
@@ -588,7 +598,7 @@ namespace ts {
     }
 
     function normalizedPathComponents(path: string, rootLength: number) {
-        let normalizedParts = getNormalizedParts(path, rootLength);
+        const normalizedParts = getNormalizedParts(path, rootLength);
         return [path.substr(0, rootLength)].concat(normalizedParts);
     }
 
@@ -619,7 +629,7 @@ namespace ts {
         // In this example the root is:  http://www.website.com/
         // normalized path components should be ["http://www.website.com/", "folder1", "folder2"]
 
-        let urlLength = url.length;
+        const urlLength = url.length;
         // Initial root length is http:// part
         let rootLength = url.indexOf("://") + "://".length;
         while (rootLength < urlLength) {
@@ -640,7 +650,7 @@ namespace ts {
         }
 
         // Find the index of "/" after website.com so the root can be http://www.website.com/ (from existing http://)
-        let indexOfNextSlash = url.indexOf(directorySeparator, rootLength);
+        const indexOfNextSlash = url.indexOf(directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
             // Found the "/" after the website.com so the root is length of http://www.website.com/
             // and get components afetr the root normally like any other folder components
@@ -666,8 +676,8 @@ namespace ts {
     }
 
     export function getRelativePathToDirectoryOrUrl(directoryPathOrUrl: string, relativeOrAbsolutePath: string, currentDirectory: string, getCanonicalFileName: (fileName: string) => string, isAbsolutePathAnUrl: boolean) {
-        let pathComponents = getNormalizedPathOrUrlComponents(relativeOrAbsolutePath, currentDirectory);
-        let directoryComponents = getNormalizedPathOrUrlComponents(directoryPathOrUrl, currentDirectory);
+        const pathComponents = getNormalizedPathOrUrlComponents(relativeOrAbsolutePath, currentDirectory);
+        const directoryComponents = getNormalizedPathOrUrlComponents(directoryPathOrUrl, currentDirectory);
         if (directoryComponents.length > 1 && lastOrUndefined(directoryComponents) === "") {
             // If the directory path given was of type test/cases/ then we really need components of directory to be only till its name
             // that is  ["test", "cases", ""] needs to be actually ["test", "cases"]
@@ -684,7 +694,7 @@ namespace ts {
         // Get the relative path
         if (joinStartIndex) {
             let relativePath = "";
-            let relativePathComponents = pathComponents.slice(joinStartIndex, pathComponents.length);
+            const relativePathComponents = pathComponents.slice(joinStartIndex, pathComponents.length);
             for (; joinStartIndex < directoryComponents.length; joinStartIndex++) {
                 if (directoryComponents[joinStartIndex] !== "") {
                     relativePath = relativePath + ".." + directorySeparator;
@@ -707,7 +717,7 @@ namespace ts {
         if (!path) {
             return undefined;
         }
-        let i = path.lastIndexOf(directorySeparator);
+        const i = path.lastIndexOf(directorySeparator);
         return i < 0 ? path : path.substring(i + 1);
     }
 
@@ -720,8 +730,8 @@ namespace ts {
     }
 
     export function fileExtensionIs(path: string, extension: string): boolean {
-        let pathLen = path.length;
-        let extLen = extension.length;
+        const pathLen = path.length;
+        const extLen = extension.length;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
 
@@ -729,17 +739,12 @@ namespace ts {
      *  List of supported extensions in order of file resolution precedence.
      */
     export const supportedExtensions = [".ts", ".tsx", ".d.ts"];
-    /**
-     *  List of extensions that will be used to look for external modules.
-     *  This list is kept separate from supportedExtensions to for cases when we'll allow to include .js files in compilation,
-     *  but still would like to load only TypeScript files as modules 
-     */
-    export const moduleFileExtensions = supportedExtensions;
+    export const supportedJsExtensions = supportedExtensions.concat(".js", ".jsx");
 
     export function isSupportedSourceFileName(fileName: string) {
         if (!fileName) { return false; }
 
-        for (let extension of supportedExtensions) {
+        for (const extension of supportedExtensions) {
             if (fileExtensionIs(fileName, extension)) {
                 return true;
             }
@@ -749,7 +754,7 @@ namespace ts {
 
     const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
     export function removeFileExtension(path: string): string {
-        for (let ext of extensionsToRemove) {
+        for (const ext of extensionsToRemove) {
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
             }
@@ -757,9 +762,9 @@ namespace ts {
         return path;
     }
 
-    let backslashOrDoubleQuote = /[\"\\]/g;
-    let escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
-    let escapedCharsMap: Map<string> = {
+    const backslashOrDoubleQuote = /[\"\\]/g;
+    const escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    const escapedCharsMap: Map<string> = {
         "\0": "\\0",
         "\t": "\\t",
         "\v": "\\v",
@@ -775,7 +780,8 @@ namespace ts {
     };
 
     export interface ObjectAllocator {
-        getNodeConstructor(kind: SyntaxKind): new () => Node;
+        getNodeConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Node;
+        getSourceFileConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => SourceFile;
         getSymbolConstructor(): new (flags: SymbolFlags, name: string) => Symbol;
         getTypeConstructor(): new (checker: TypeChecker, flags: TypeFlags) => Type;
         getSignatureConstructor(): new (checker: TypeChecker) => Signature;
@@ -794,19 +800,17 @@ namespace ts {
     function Signature(checker: TypeChecker) {
     }
 
+    function Node(kind: SyntaxKind, pos: number, end: number) {
+        this.kind = kind;
+        this.pos = pos;
+        this.end = end;
+        this.flags = NodeFlags.None;
+        this.parent = undefined;
+    }
+
     export let objectAllocator: ObjectAllocator = {
-        getNodeConstructor: kind => {
-            function Node() {
-            }
-            Node.prototype = {
-                kind: kind,
-                pos: -1,
-                end: -1,
-                flags: 0,
-                parent: undefined,
-            };
-            return <any>Node;
-        },
+        getNodeConstructor: () => <any>Node,
+        getSourceFileConstructor: () => <any>Node,
         getSymbolConstructor: () => <any>Symbol,
         getTypeConstructor: () => <any>Type,
         getSignatureConstructor: () => <any>Signature
@@ -820,7 +824,7 @@ namespace ts {
     }
 
     export namespace Debug {
-        let currentAssertionLevel = AssertionLevel.None;
+        const currentAssertionLevel = AssertionLevel.None;
 
         export function shouldAssert(level: AssertionLevel): boolean {
             return currentAssertionLevel >= level;
@@ -832,23 +836,23 @@ namespace ts {
                 if (verboseDebugInfo) {
                     verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
                 }
-
+                debugger;
                 throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
             }
         }
 
         export function fail(message?: string): void {
-            Debug.assert(false, message);
+            Debug.assert(/*expression*/ false, message);
         }
     }
 
     export function copyListRemovingItem<T>(item: T, list: T[]) {
-        let copiedList: T[] = [];
-        for (var i = 0, len = list.length; i < len; i++) {
-            if (list[i] !== item) {
-                copiedList.push(list[i]);
+        const copiedList: T[] = [];
+        for (const e of list) {
+            if (e !== item) {
+                copiedList.push(e);
             }
         }
         return copiedList;
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 00085f16086..669cbcbcf0c 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -31,30 +31,34 @@ namespace ts {
     }
 
     export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] {
-        let diagnostics: Diagnostic[] = [];
-        let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js");
+        const diagnostics: Diagnostic[] = [];
+        const jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js");
         emitDeclarations(host, resolver, diagnostics, jsFilePath, targetSourceFile);
         return diagnostics;
     }
 
     function emitDeclarations(host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[], jsFilePath: string, root?: SourceFile): DeclarationEmit {
-        let newLine = host.getNewLine();
-        let compilerOptions = host.getCompilerOptions();
+        const newLine = host.getNewLine();
+        const compilerOptions = host.getCompilerOptions();
 
         let write: (s: string) => void;
         let writeLine: () => void;
         let increaseIndent: () => void;
         let decreaseIndent: () => void;
-        let writeTextOfNode: (sourceFile: SourceFile, node: Node) => void;
+        let writeTextOfNode: (text: string, node: Node) => void;
 
         let writer = createAndSetNewTextWriterWithSymbolWriter();
 
         let enclosingDeclaration: Node;
-        let currentSourceFile: SourceFile;
+        let currentText: string;
+        let currentLineMap: number[];
+        let currentIdentifiers: Map<string>;
+        let isCurrentFileExternalModule: boolean;
         let reportedDeclarationError = false;
         let errorNameNode: DeclarationName;
-        let emitJsDocComments = compilerOptions.removeComments ? function (declaration: Node) { } : writeJsDocComments;
-        let emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        const emitJsDocComments = compilerOptions.removeComments ? function (declaration: Node) { } : writeJsDocComments;
+        const emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        let noDeclare = !root;
 
         let moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[] = [];
         let asynchronousSubModuleDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[];
@@ -69,7 +73,7 @@ namespace ts {
             if (!compilerOptions.noResolve) {
                 let addedGlobalFileReference = false;
                 forEach(root.referencedFiles, fileReference => {
-                    let referencedFile = tryResolveScriptReference(host, root, fileReference);
+                    const referencedFile = tryResolveScriptReference(host, root, fileReference);
 
                     // All the references that are not going to be part of same file
                     if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference
@@ -88,7 +92,7 @@ namespace ts {
 
             // create asynchronous output for the importDeclarations
             if (moduleElementDeclarationEmitInfo.length) {
-                let oldWriter = writer;
+                const oldWriter = writer;
                 forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => {
                     if (aliasEmitInfo.isVisible) {
                         Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration);
@@ -103,16 +107,17 @@ namespace ts {
         }
         else {
             // Emit references corresponding to this file
-            let emittedReferencedFiles: SourceFile[] = [];
+            const emittedReferencedFiles: SourceFile[] = [];
+            let prevModuleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[] = [];
             forEach(host.getSourceFiles(), sourceFile => {
-                if (!isExternalModuleOrDeclarationFile(sourceFile)) {
+                if (!isDeclarationFile(sourceFile)) {
                     // Check what references need to be added
                     if (!compilerOptions.noResolve) {
                         forEach(sourceFile.referencedFiles, fileReference => {
-                            let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference);
+                            const referencedFile = tryResolveScriptReference(host, sourceFile, fileReference);
 
-                            // If the reference file is a declaration file or an external module, emit that reference
-                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
+                            // If the reference file is a declaration file, emit that reference
+                            if (referencedFile && (isDeclarationFile(referencedFile) &&
                                 !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted
 
                                 writeReferencePath(referencedFile);
@@ -120,10 +125,43 @@ namespace ts {
                             }
                         });
                     }
+                }
 
+                if (!isExternalModuleOrDeclarationFile(sourceFile)) {
+                    noDeclare = false;
                     emitSourceFile(sourceFile);
                 }
+                else if (isExternalModule(sourceFile)) {
+                    noDeclare = true;
+                    write(`declare module "${getResolvedExternalModuleName(host, sourceFile)}" {`);
+                    writeLine();
+                    increaseIndent();
+                    emitSourceFile(sourceFile);
+                    decreaseIndent();
+                    write("}");
+                    writeLine();
+
+                    // create asynchronous output for the importDeclarations
+                    if (moduleElementDeclarationEmitInfo.length) {
+                        const oldWriter = writer;
+                        forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => {
+                            if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
+                                Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration);
+                                createAndSetNewTextWriterWithSymbolWriter();
+                                Debug.assert(aliasEmitInfo.indent === 1);
+                                increaseIndent();
+                                writeImportDeclaration(<ImportDeclaration>aliasEmitInfo.node);
+                                aliasEmitInfo.asynchronousOutput = writer.getText();
+                                decreaseIndent();
+                            }
+                        });
+                        setWriter(oldWriter);
+                    }
+                    prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
+                    moduleElementDeclarationEmitInfo = [];
+                }
             });
+            moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo);
         }
 
         return {
@@ -134,14 +172,13 @@ namespace ts {
         };
 
         function hasInternalAnnotation(range: CommentRange) {
-            let text = currentSourceFile.text;
-            let comment = text.substring(range.pos, range.end);
+            const comment = currentText.substring(range.pos, range.end);
             return comment.indexOf("@internal") >= 0;
         }
 
         function stripInternal(node: Node) {
             if (node) {
-                let leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                const leadingCommentRanges = getLeadingCommentRanges(currentText, node.pos);
                 if (forEach(leadingCommentRanges, hasInternalAnnotation)) {
                     return;
                 }
@@ -151,7 +188,7 @@ namespace ts {
         }
 
         function createAndSetNewTextWriterWithSymbolWriter(): EmitTextWriterWithSymbolWriter {
-            let writer = <EmitTextWriterWithSymbolWriter>createTextWriter(newLine);
+            const writer = <EmitTextWriterWithSymbolWriter>createTextWriter(newLine);
             writer.trackSymbol = trackSymbol;
             writer.reportInaccessibleThisError = reportInaccessibleThisError;
             writer.writeKeyword = writer.write;
@@ -175,7 +212,7 @@ namespace ts {
         }
 
         function writeAsynchronousModuleElements(nodes: Node[]) {
-            let oldWriter = writer;
+            const oldWriter = writer;
             forEach(nodes, declaration => {
                 let nodeToCheck: Node;
                 if (declaration.kind === SyntaxKind.VariableDeclaration) {
@@ -238,12 +275,12 @@ namespace ts {
             else {
                 // Report error
                 reportedDeclarationError = true;
-                let errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                const errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
                         diagnostics.push(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode,
                             errorInfo.diagnosticMessage,
-                            getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName),
+                            getTextOfNodeFromSourceText(currentText, errorInfo.typeName),
                             symbolAccesibilityResult.errorSymbolName,
                             symbolAccesibilityResult.errorModuleName));
                     }
@@ -297,14 +334,14 @@ namespace ts {
         }
 
         function emitLines(nodes: Node[]) {
-            for (let node of nodes) {
+            for (const node of nodes) {
                 emit(node);
             }
         }
 
         function emitSeparatedList(nodes: Node[], separator: string, eachNodeEmitFn: (node: Node) => void, canEmitFn?: (node: Node) => boolean) {
             let currentWriterPos = writer.getTextPos();
-            for (let node of nodes) {
+            for (const node of nodes) {
                 if (!canEmitFn || canEmitFn(node)) {
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(separator);
@@ -321,10 +358,10 @@ namespace ts {
 
         function writeJsDocComments(declaration: Node) {
             if (declaration) {
-                let jsDocComments = getJsDocComments(declaration, currentSourceFile);
-                emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments);
+                const jsDocComments = getJsDocCommentsFromText(declaration, currentText);
+                emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, writeCommentRange);
+                emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, writeCommentRange);
             }
         }
 
@@ -343,7 +380,7 @@ namespace ts {
                 case SyntaxKind.VoidKeyword:
                 case SyntaxKind.ThisKeyword:
                 case SyntaxKind.StringLiteral:
-                    return writeTextOfNode(currentSourceFile, type);
+                    return writeTextOfNode(currentText, type);
                 case SyntaxKind.ExpressionWithTypeArguments:
                     return emitExpressionWithTypeArguments(<ExpressionWithTypeArguments>type);
                 case SyntaxKind.TypeReference:
@@ -375,19 +412,19 @@ namespace ts {
 
             function writeEntityName(entityName: EntityName | Expression) {
                 if (entityName.kind === SyntaxKind.Identifier) {
-                    writeTextOfNode(currentSourceFile, entityName);
+                    writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    let left = entityName.kind === SyntaxKind.QualifiedName ? (<QualifiedName>entityName).left : (<PropertyAccessExpression>entityName).expression;
-                    let right = entityName.kind === SyntaxKind.QualifiedName ? (<QualifiedName>entityName).right : (<PropertyAccessExpression>entityName).name;
+                    const left = entityName.kind === SyntaxKind.QualifiedName ? (<QualifiedName>entityName).left : (<PropertyAccessExpression>entityName).expression;
+                    const right = entityName.kind === SyntaxKind.QualifiedName ? (<QualifiedName>entityName).right : (<PropertyAccessExpression>entityName).name;
                     writeEntityName(left);
                     write(".");
-                    writeTextOfNode(currentSourceFile, right);
+                    writeTextOfNode(currentText, right);
                 }
             }
 
             function emitEntityName(entityName: EntityName | PropertyAccessExpression) {
-                let visibilityResult = resolver.isEntityNameVisible(entityName,
+                const visibilityResult = resolver.isEntityNameVisible(entityName,
                     // Aliases can be written asynchronously so use correct enclosing declaration
                     entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration ? entityName.parent : enclosingDeclaration);
 
@@ -417,7 +454,7 @@ namespace ts {
             }
 
             function emitTypePredicate(type: TypePredicateNode) {
-                writeTextOfNode(currentSourceFile, type.parameterName);
+                writeTextOfNode(currentText, type.parameterName);
                 write(" is ");
                 emitType(type.type);
             }
@@ -466,8 +503,12 @@ namespace ts {
         }
 
         function emitSourceFile(node: SourceFile) {
-            currentSourceFile = node;
+            currentText = node.text;
+            currentLineMap = getLineStarts(node);
+            currentIdentifiers = node.identifiers;
+            isCurrentFileExternalModule = isExternalModule(node);
             enclosingDeclaration = node;
+            emitDetachedComments(currentText, currentLineMap, writer, writeCommentRange, node, newLine, true /* remove comments */);
             emitLines(node.statements);
         }
 
@@ -476,14 +517,14 @@ namespace ts {
         // Note that export default is only allowed at most once in a module, so we
         // do not need to keep track of created temp names.
         function getExportDefaultTempVariableName(): string {
-            let baseName = "_default";
-            if (!hasProperty(currentSourceFile.identifiers, baseName)) {
+            const baseName = "_default";
+            if (!hasProperty(currentIdentifiers, baseName)) {
                 return baseName;
             }
             let count = 0;
             while (true) {
-                let name = baseName + "_" + (++count);
-                if (!hasProperty(currentSourceFile.identifiers, name)) {
+                const name = baseName + "_" + (++count);
+                if (!hasProperty(currentIdentifiers, name)) {
                     return name;
                 }
             }
@@ -492,11 +533,11 @@ namespace ts {
         function emitExportAssignment(node: ExportAssignment) {
             if (node.expression.kind === SyntaxKind.Identifier) {
                 write(node.isExportEquals ? "export = " : "export default ");
-                writeTextOfNode(currentSourceFile, node.expression);
+                writeTextOfNode(currentText, node.expression);
             }
             else {
                 // Expression
-                let tempVarName = getExportDefaultTempVariableName();
+                const tempVarName = getExportDefaultTempVariableName();
                 write("declare var ");
                 write(tempVarName);
                 write(": ");
@@ -512,7 +553,7 @@ namespace ts {
 
             // Make all the declarations visible for the export name
             if (node.expression.kind === SyntaxKind.Identifier) {
-                let nodes = resolver.collectLinkedAliases(<Identifier>node.expression);
+                const nodes = resolver.collectLinkedAliases(<Identifier>node.expression);
 
                 // write each of these declarations asynchronously
                 writeAsynchronousModuleElements(nodes);
@@ -536,7 +577,7 @@ namespace ts {
             }
             // Import equals declaration in internal module can become visible as part of any emit so lets make sure we add these irrespective
             else if (node.kind === SyntaxKind.ImportEqualsDeclaration ||
-                (node.parent.kind === SyntaxKind.SourceFile && isExternalModule(currentSourceFile))) {
+                (node.parent.kind === SyntaxKind.SourceFile && isCurrentFileExternalModule)) {
                 let isVisible: boolean;
                 if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== SyntaxKind.SourceFile) {
                     // Import declaration of another module that is visited async so lets put it in right spot
@@ -549,7 +590,7 @@ namespace ts {
                 }
                 else {
                     if (node.kind === SyntaxKind.ImportDeclaration) {
-                        let importDeclaration = <ImportDeclaration>node;
+                        const importDeclaration = <ImportDeclaration>node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
                             isVisibleNamedBinding(importDeclaration.importClause.namedBindings);
@@ -592,7 +633,7 @@ namespace ts {
 
         function emitModuleElementDeclarationFlags(node: Node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent === currentSourceFile) {
+            if (node.parent.kind === SyntaxKind.SourceFile) {
                 // If the node is exported
                 if (node.flags & NodeFlags.Export) {
                     write("export ");
@@ -601,7 +642,7 @@ namespace ts {
                 if (node.flags & NodeFlags.Default) {
                     write("default ");
                 }
-                else if (node.kind !== SyntaxKind.InterfaceDeclaration) {
+                else if (node.kind !== SyntaxKind.InterfaceDeclaration && !noDeclare) {
                     write("declare ");
                 }
             }
@@ -631,7 +672,7 @@ namespace ts {
                 write("export ");
             }
             write("import ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" = ");
             if (isInternalModuleImportEqualsDeclaration(node)) {
                 emitTypeWithNewGetSymbolAccessibilityDiagnostic(<EntityName>node.moduleReference, getImportEntityNameVisibilityError);
@@ -639,7 +680,7 @@ namespace ts {
             }
             else {
                 write("require(");
-                writeTextOfNode(currentSourceFile, getExternalModuleImportEqualsDeclarationExpression(node));
+                writeTextOfNode(currentText, getExternalModuleImportEqualsDeclarationExpression(node));
                 write(");");
             }
             writer.writeLine();
@@ -675,9 +716,9 @@ namespace ts {
             }
             write("import ");
             if (node.importClause) {
-                let currentWriterPos = writer.getTextPos();
+                const currentWriterPos = writer.getTextPos();
                 if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) {
-                    writeTextOfNode(currentSourceFile, node.importClause.name);
+                    writeTextOfNode(currentText, node.importClause.name);
                 }
                 if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) {
                     if (currentWriterPos !== writer.getTextPos()) {
@@ -686,7 +727,7 @@ namespace ts {
                     }
                     if (node.importClause.namedBindings.kind === SyntaxKind.NamespaceImport) {
                         write("* as ");
-                        writeTextOfNode(currentSourceFile, (<NamespaceImport>node.importClause.namedBindings).name);
+                        writeTextOfNode(currentText, (<NamespaceImport>node.importClause.namedBindings).name);
                     }
                     else {
                         write("{ ");
@@ -696,24 +737,38 @@ namespace ts {
                 }
                 write(" from ");
             }
-            writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+            emitExternalModuleSpecifier(node.moduleSpecifier);
             write(";");
             writer.writeLine();
         }
 
+        function emitExternalModuleSpecifier(moduleSpecifier: Expression) {
+            if (moduleSpecifier.kind === SyntaxKind.StringLiteral && (!root) && (compilerOptions.out || compilerOptions.outFile)) {
+                const moduleName = getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent as (ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration));
+                if (moduleName) {
+                    write("\"");
+                    write(moduleName);
+                    write("\"");
+                    return;
+                }
+            }
+
+            writeTextOfNode(currentText, moduleSpecifier);
+        }
+
         function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
             if (node.propertyName) {
-                writeTextOfNode(currentSourceFile, node.propertyName);
+                writeTextOfNode(currentText, node.propertyName);
                 write(" as ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
         }
 
         function emitExportSpecifier(node: ExportSpecifier) {
             emitImportOrExportSpecifier(node);
 
             // Make all the declarations visible for the export name
-            let nodes = resolver.collectLinkedAliases(node.propertyName || node.name);
+            const nodes = resolver.collectLinkedAliases(node.propertyName || node.name);
 
             // write each of these declarations asynchronously
             writeAsynchronousModuleElements(nodes);
@@ -732,7 +787,7 @@ namespace ts {
             }
             if (node.moduleSpecifier) {
                 write(" from ");
-                writeTextOfNode(currentSourceFile, node.moduleSpecifier);
+                emitExternalModuleSpecifier(node.moduleSpecifier);
             }
             write(";");
             writer.writeLine();
@@ -747,13 +802,13 @@ namespace ts {
             else {
                 write("module ");
             }
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             while (node.body.kind !== SyntaxKind.ModuleBlock) {
                 node = <ModuleDeclaration>node.body;
                 write(".");
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
-            let prevEnclosingDeclaration = enclosingDeclaration;
+            const prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             write(" {");
             writeLine();
@@ -766,12 +821,12 @@ namespace ts {
         }
 
         function writeTypeAliasDeclaration(node: TypeAliasDeclaration) {
-            let prevEnclosingDeclaration = enclosingDeclaration;
+            const prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("type ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             emitTypeParameters(node.typeParameters);
             write(" = ");
             emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
@@ -795,7 +850,7 @@ namespace ts {
                 write("const ");
             }
             write("enum ");
-            writeTextOfNode(currentSourceFile, node.name);
+            writeTextOfNode(currentText, node.name);
             write(" {");
             writeLine();
             increaseIndent();
@@ -807,8 +862,8 @@ namespace ts {
 
         function emitEnumMemberDeclaration(node: EnumMember) {
             emitJsDocComments(node);
-            writeTextOfNode(currentSourceFile, node.name);
-            let enumMemberValue = resolver.getConstantValue(node);
+            writeTextOfNode(currentText, node.name);
+            const enumMemberValue = resolver.getConstantValue(node);
             if (enumMemberValue !== undefined) {
                 write(" = ");
                 write(enumMemberValue.toString());
@@ -826,7 +881,7 @@ namespace ts {
                 increaseIndent();
                 emitJsDocComments(node);
                 decreaseIndent();
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
@@ -957,11 +1012,11 @@ namespace ts {
             }
 
             write("class ");
-            writeTextOfNode(currentSourceFile, node.name);
-            let prevEnclosingDeclaration = enclosingDeclaration;
+            writeTextOfNode(currentText, node.name);
+            const prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
-            let baseTypeNode = getClassExtendsHeritageClauseElement(node);
+            const baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 emitHeritageClause([baseTypeNode], /*isImplementsList*/ false);
             }
@@ -981,8 +1036,8 @@ namespace ts {
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("interface ");
-            writeTextOfNode(currentSourceFile, node.name);
-            let prevEnclosingDeclaration = enclosingDeclaration;
+            writeTextOfNode(currentText, node.name);
+            const prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
             emitHeritageClause(getInterfaceBaseTypeNodes(node), /*isImplementsList*/ false);
@@ -1019,7 +1074,7 @@ namespace ts {
                     // If this node is a computed name, it can only be a symbol, because we've already skipped
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     // If optional property emit ?
                     if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && hasQuestionToken(node)) {
                         write("?");
@@ -1068,7 +1123,7 @@ namespace ts {
             }
 
             function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                let diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                const diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage,
                     errorNode: node,
@@ -1082,8 +1137,8 @@ namespace ts {
                 // For example:
                 //      original: var [, c,,] = [ 2,3,4]
                 //      emitted: declare var c: number; // instead of declare var c:number, ;
-                let elements: Node[] = [];
-                for (let element of bindingPattern.elements) {
+                const elements: Node[] = [];
+                for (const element of bindingPattern.elements) {
                     if (element.kind !== SyntaxKind.OmittedExpression) {
                         elements.push(element);
                     }
@@ -1093,7 +1148,7 @@ namespace ts {
 
             function emitBindingElement(bindingElement: BindingElement) {
                 function getBindingElementTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                    let diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                    const diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage,
                         errorNode: bindingElement,
@@ -1106,7 +1161,7 @@ namespace ts {
                         emitBindingPattern(<BindingPattern>bindingElement.name);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, bindingElement.name);
+                        writeTextOfNode(currentText, bindingElement.name);
                         writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError);
                     }
                 }
@@ -1149,20 +1204,20 @@ namespace ts {
                 return;
             }
 
-            let accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, node);
+            const accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, node);
             let accessorWithTypeAnnotation: AccessorDeclaration;
 
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
                 emitClassMemberDeclarationFlags(node);
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 if (!(node.flags & NodeFlags.Private)) {
                     accessorWithTypeAnnotation = node;
                     let type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
                         // couldn't get type for the first accessor, try the another one
-                        let anotherAccessor = node.kind === SyntaxKind.GetAccessor ? accessors.setAccessor : accessors.getAccessor;
+                        const anotherAccessor = node.kind === SyntaxKind.GetAccessor ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -1246,13 +1301,13 @@ namespace ts {
                 }
                 if (node.kind === SyntaxKind.FunctionDeclaration) {
                     write("function ");
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                 }
                 else if (node.kind === SyntaxKind.Constructor) {
                     write("constructor");
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node.name);
+                    writeTextOfNode(currentText, node.name);
                     if (hasQuestionToken(node)) {
                         write("?");
                     }
@@ -1279,7 +1334,7 @@ namespace ts {
                 write("(");
             }
 
-            let prevEnclosingDeclaration = enclosingDeclaration;
+            const prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
 
             // Parameters
@@ -1293,7 +1348,7 @@ namespace ts {
             }
 
             // If this is not a constructor and is not private, emit the return type
-            let isFunctionTypeOrConstructorType = node.kind === SyntaxKind.FunctionType || node.kind === SyntaxKind.ConstructorType;
+            const isFunctionTypeOrConstructorType = node.kind === SyntaxKind.FunctionType || node.kind === SyntaxKind.ConstructorType;
             if (isFunctionTypeOrConstructorType || node.parent.kind === SyntaxKind.TypeLiteral) {
                 // Emit type literal signature return type only if specified
                 if (node.type) {
@@ -1392,7 +1447,7 @@ namespace ts {
                 emitBindingPattern(<BindingPattern>node.name);
             }
             else {
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
             }
             if (resolver.isOptionalParameter(node)) {
                 write("?");
@@ -1409,7 +1464,7 @@ namespace ts {
             }
 
             function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                let diagnosticMessage: DiagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                const diagnosticMessage: DiagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage,
                     errorNode: node,
@@ -1482,7 +1537,7 @@ namespace ts {
                 }
                 else if (bindingPattern.kind === SyntaxKind.ArrayBindingPattern) {
                     write("[");
-                    let elements = bindingPattern.elements;
+                    const elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
                     if (elements && elements.hasTrailingComma) {
                         write(", ");
@@ -1493,7 +1548,7 @@ namespace ts {
 
             function emitBindingElement(bindingElement: BindingElement) {
                 function getBindingElementTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                    let diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                    const diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage,
                         errorNode: bindingElement,
@@ -1518,7 +1573,7 @@ namespace ts {
                         // Example:
                         //      original: function foo({y: [a,b,c]}) {}
                         //      emit    : declare function foo({y: [a, b, c]}: { y: [any, any, any] }) void;
-                        writeTextOfNode(currentSourceFile, bindingElement.propertyName);
+                        writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
                     }
                     if (bindingElement.name) {
@@ -1541,7 +1596,7 @@ namespace ts {
                             if (bindingElement.dotDotDotToken) {
                                 write("...");
                             }
-                            writeTextOfNode(currentSourceFile, bindingElement.name);
+                            writeTextOfNode(currentText, bindingElement.name);
                         }
                     }
                 }
@@ -1608,11 +1663,11 @@ namespace ts {
 
     /* @internal */
     export function writeDeclarationFile(jsFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) {
-        let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, jsFilePath, sourceFile);
+        const emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, jsFilePath, sourceFile);
         // TODO(shkamat): Should we not write any declaration file if any of them can produce error,
         // or should we just not write this file like we are doing now
         if (!emitDeclarationResult.reportedDeclarationError) {
-            let declarationOutput = emitDeclarationResult.referencePathsOutput
+            const declarationOutput = emitDeclarationResult.referencePathsOutput
                 + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo);
             writeFile(host, diagnostics, removeFileExtension(jsFilePath) + ".d.ts", declarationOutput, host.getCompilerOptions().emitBOM);
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index b2c1e6f0d5e..ad71d646b7b 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -627,7 +627,7 @@
         "category": "Error",
         "code": 1203
     },
-    "Cannot compile modules into 'es6' when targeting 'ES5' or lower.": {
+    "Cannot compile modules into 'es2015' when targeting 'ES5' or lower.": {
         "category": "Error",
         "code": 1204
     },
@@ -799,7 +799,11 @@
     "'=' can only be used in an object literal property inside a destructuring assignment.": {
         "category": "Error",
         "code": 1312
-    },    
+    },
+    "The body of an 'if' statement cannot be the empty statement.": {
+        "category": "Error",
+        "code": 1313
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -1008,7 +1012,7 @@
         "category": "Error",
         "code": 2354
     },
-    "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.": {
+    "A function whose declared type is neither 'void' nor 'any' must return a value.": {
         "category": "Error",
         "code": 2355
     },
@@ -1092,7 +1096,7 @@
         "category": "Error",
         "code": 2377
     },
-    "A 'get' accessor must return a value or consist of a single 'throw' statement.": {
+    "A 'get' accessor must return a value.": {
         "category": "Error",
         "code": 2378
     },
@@ -1712,14 +1716,14 @@
         "category": "Error",
         "code": 2654
     },
-    "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition.": {
-        "category": "Error",
-        "code": 2655
-    },
     "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition.": {
         "category": "Error",
         "code": 2656
     },
+    "JSX expressions must have one parent element": {
+        "category": "Error",
+        "code": 2657
+    },
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
         "code": 4000
@@ -2000,10 +2004,6 @@
         "category": "Error",
         "code": 4082
     },
-    "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.": {
-        "category": "Error",
-        "code": 4091
-    },
     "The current host does not support the '{0}' option.": {
         "category": "Error",
         "code": 5001
@@ -2040,7 +2040,7 @@
         "category": "Error",
         "code": 5042
     },
-    "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher.": {
+    "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.": {
         "category": "Error",
         "code": 5047
     },
@@ -2101,11 +2101,11 @@
         "category": "Message",
         "code": 6010
     },
-    "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)": {
-        "category": "Message",
-        "code": 6015
-    },
-    "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es6'": {
+  "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)": {
+    "category": "Message",
+    "code": 6015
+  },
+    "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'": {
         "category": "Message",
         "code": 6016
     },
@@ -2189,14 +2189,14 @@
         "category": "Error",
         "code": 6045
     },
-    "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es6'.": {
+    "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'.": {
         "category": "Error",
         "code": 6046
     },
-    "Argument for '--target' option must be 'ES3', 'ES5', or 'ES6'.": {
-        "category": "Error",
-        "code": 6047
-    },
+  "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'.": {
+    "category": "Error",
+    "code": 6047
+  },
     "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'.": {
         "category": "Error",
         "code": 6048
@@ -2258,14 +2258,6 @@
         "code": 6063
     },
 
-    "Specify JSX code generation: 'preserve' or 'react'": {
-        "category": "Message",
-        "code": 6080
-    },
-    "Argument for '--jsx' must be 'preserve' or 'react'.": {
-        "category": "Message",
-        "code": 6081
-    },
     "Enables experimental support for ES7 decorators.": {
         "category": "Message",
         "code": 6065
@@ -2294,7 +2286,42 @@
         "category": "Message",
         "code": 6072
     },
-
+    "Stylize errors and messages using color and context. (experimental)": {
+        "category": "Message",
+        "code": 6073
+    },
+    "Do not report errors on unused labels.": {
+        "category": "Message",
+        "code": 6074
+    },
+    "Report error when not all code paths in function return a value.": {
+        "category": "Message",
+        "code": 6075
+    },
+    "Report errors for fallthrough cases in switch statement.": {
+        "category": "Message",
+        "code": 6076
+    },
+    "Do not report errors on unreachable code.": {
+        "category": "Message",
+        "code": 6077
+    },
+    "Disallow inconsistently-cased references to the same file.": {
+        "category": "Message",
+        "code": 6078
+    },
+    "Specify JSX code generation: 'preserve' or 'react'": {
+        "category": "Message",
+        "code": 6080
+    },
+    "Argument for '--jsx' must be 'preserve' or 'react'.": {
+        "category": "Message",
+        "code": 6081
+    },
+    "Only 'amd' and 'system' modules are supported alongside --{0}.": {
+        "category": "Error",
+        "code": 6082
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005
@@ -2363,8 +2390,22 @@
         "category": "Error",
         "code": 7026
     },
-
-
+    "Unreachable code detected.": {
+        "category": "Error",
+        "code": 7027
+    },
+    "Unused label.": {
+        "category": "Error",
+        "code": 7028
+    },
+    "Fallthrough case in switch.": {
+        "category": "Error",
+        "code": 7029
+    },
+    "Not all code paths return a value.": {
+        "category": "Error",
+        "code": 7030
+    },    
     "You cannot rename this element.": {
         "category": "Error",
         "code": 8000
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f2468e7244d..bdeac582bbf 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -7,9 +7,27 @@ namespace ts {
         return isExternalModule(sourceFile) || isDeclarationFile(sourceFile);
     }
 
+    export function getResolvedExternalModuleName(host: EmitHost, file: SourceFile): string {
+        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
+    }
+
+    export function getExternalModuleNameFromDeclaration(host: EmitHost, resolver: EmitResolver, declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): string {
+        const file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+
     type DependencyGroup = Array<ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration>;
 
-    let entities: Map<number> = {
+    const enum Jump {
+        Break       = 1 << 1,
+        Continue    = 1 << 2,
+        Return      = 1 << 3
+    }
+
+    const entities: Map<number> = {
         "quot": 0x0022,
         "amp": 0x0026,
         "apos": 0x0027,
@@ -318,35 +336,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
     });
 };`;
 
-        let compilerOptions = host.getCompilerOptions();
-        let languageVersion = compilerOptions.target || ScriptTarget.ES3;
-        let modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None;
-        let sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
+        const compilerOptions = host.getCompilerOptions();
+        const languageVersion = compilerOptions.target || ScriptTarget.ES3;
+        const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None;
+        const sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
         let diagnostics: Diagnostic[] = [];
-        let newLine = host.getNewLine();
-        let jsxDesugaring = host.getCompilerOptions().jsx !== JsxEmit.Preserve;
-        let shouldEmitJsx = (s: SourceFile) => (s.languageVariant === LanguageVariant.JSX && !jsxDesugaring);
+        const newLine = host.getNewLine();
+        const jsxDesugaring = host.getCompilerOptions().jsx !== JsxEmit.Preserve;
+        const shouldEmitJsx = (s: SourceFile) => (s.languageVariant === LanguageVariant.JSX && !jsxDesugaring);
+        const outFile = compilerOptions.outFile || compilerOptions.out;
+
+        const emitJavaScript = createFileEmitter();
 
         if (targetSourceFile === undefined) {
-            forEach(host.getSourceFiles(), sourceFile => {
-                if (shouldEmitToOwnFile(sourceFile, compilerOptions)) {
-                    let jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
-                    emitFile(jsFilePath, sourceFile);
-                }
-            });
-
-            if (compilerOptions.outFile || compilerOptions.out) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            if (outFile) {
+                emitFile(outFile);
+            }
+            else {
+                forEach(host.getSourceFiles(), sourceFile => {
+                    if (shouldEmitToOwnFile(sourceFile, compilerOptions)) {
+                        const jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js");
+                        emitFile(jsFilePath, sourceFile);
+                    }
+                });
             }
         }
         else {
             // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service)
             if (shouldEmitToOwnFile(targetSourceFile, compilerOptions)) {
-                let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
+                const jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
                 emitFile(jsFilePath, targetSourceFile);
             }
-            else if (!isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) {
-                emitFile(compilerOptions.outFile || compilerOptions.out);
+            else if (!isDeclarationFile(targetSourceFile) && outFile) {
+                emitFile(outFile);
             }
         }
 
@@ -359,14 +381,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             sourceMaps: sourceMapDataList
         };
 
-        function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
-            while (node) {
-                if (node === ancestor) return true;
-                node = node.parent;
-            }
-            return false;
-        }
-
         function isUniqueLocalName(name: string, container: Node): boolean {
             for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
                 if (node.locals && hasProperty(node.locals, name)) {
@@ -379,11 +393,111 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             return true;
         }
 
-        function emitJavaScript(jsFilePath: string, root?: SourceFile) {
-            let writer = createTextWriter(newLine);
-            let { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer;
+        interface ConvertedLoopState {
+            /*
+             * set of labels that occured inside the converted loop
+             * used to determine if labeled jump can be emitted as is or it should be dispatched to calling code
+             */
+            labels?: Map<string>;
+            /*
+             * collection of labeled jumps that transfer control outside the converted loop.
+             * maps store association 'label -> labelMarker' where
+             * - label - value of label as it apprear in code
+             * - label marker - return value that should be interpreted by calling code as 'jump to <label>'
+             */
+            labeledNonLocalBreaks?: Map<string>;
+            labeledNonLocalContinues?: Map<string>;
+
+            /*
+             * set of non-labeled jumps that transfer control outside the converted loop
+             * used to emit dispatching logic in the caller of converted loop
+             */
+            nonLocalJumps?: Jump;
+
+            /*
+             * set of non-labeled jumps that should be interpreted as local
+             * i.e. if converted loop contains normal loop or switch statement then inside this loop break should be treated as local jump
+             */
+            allowedNonLabeledJumps?: Jump;
+
+            /*
+             * alias for 'arguments' object from the calling code stack frame
+             * i.e.
+             * for (let x;;) <statement that captures x in closure and uses 'arguments'>
+             * should be converted to
+             * var loop = function(x) { <code where 'arguments' is replaced witg 'arguments_1'> }
+             * var arguments_1 = arguments
+             * for (var x;;) loop(x);
+             * otherwise semantics of the code will be different since 'arguments' inside converted loop body 
+             * will refer to function that holds converted loop.
+             * This value is set on demand.
+             */
+            argumentsName?: string;
+
+            /*
+             * list of non-block scoped variable declarations that appear inside converted loop
+             * such variable declarations should be moved outside the loop body 
+             * for (let x;;) {
+             *     var y = 1;
+             *     ... 
+             * }
+             * should be converted to
+             * var loop = function(x) {
+             *    y = 1;
+             *    ...
+             * }
+             * var y;
+             * for (var x;;) loop(x);
+             */
+            hoistedLocalVariables?: Identifier[];
+        }
+
+        function setLabeledJump(state: ConvertedLoopState, isBreak: boolean, labelText: string, labelMarker: string): void {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = {};
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = {};
+                }
+                state.labeledNonLocalContinues[labelText] = labelMarker;
+            }
+        }
+
+        function hoistVariableDeclarationFromLoop(state: ConvertedLoopState, declaration: VariableDeclaration): void {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+
+            visit(declaration.name);
+
+            function visit(node: Identifier | BindingPattern) {
+                if (node.kind === SyntaxKind.Identifier) {
+                    state.hoistedLocalVariables.push((<Identifier>node));
+                }
+                else {
+                    for (const element of (<BindingPattern>node).elements) {
+                        visit(element.name);
+                    }
+                }
+            }
+        }
+
+        function createFileEmitter(): (jsFilePath: string, root?: SourceFile) => void {
+            const writer: EmitTextWriter = createTextWriter(newLine);
+            const { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer;
 
             let currentSourceFile: SourceFile;
+            let currentText: string;
+            let currentLineMap: number[];
+            let currentFileIdentifiers: Map<string>;
+            let renamedDependencies: Map<string>;
+            let isEs6Module: boolean;
+            let isCurrentFileExternalModule: boolean;
+
             // name of an exporter function if file is a System external module
             // System.register([...], function (<exporter>) {...})
             // exporting in System modules looks like:
@@ -392,15 +506,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             // var x;... exporter("x", x = 1)
             let exportFunctionForFile: string;
 
-            let generatedNameSet: Map<string> = {};
-            let nodeToGeneratedName: string[] = [];
+            let generatedNameSet: Map<string>;
+            let nodeToGeneratedName: string[];
             let computedPropertyNamesToGeneratedNames: string[];
 
-            let extendsEmitted = false;
-            let decorateEmitted = false;
-            let paramEmitted = false;
-            let awaiterEmitted = false;
-            let tempFlags = 0;
+            let convertedLoopState: ConvertedLoopState;
+
+            let extendsEmitted: boolean;
+            let decorateEmitted: boolean;
+            let paramEmitted: boolean;
+            let awaiterEmitted: boolean;
+            let tempFlags: TempFlags = 0;
             let tempVariables: Identifier[];
             let tempParameters: Identifier[];
             let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
@@ -443,10 +559,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             /** Sourcemap data that will get encoded */
             let sourceMapData: SourceMapData;
 
-            /** If removeComments is true, no leading-comments needed to be emitted **/
-            let emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos: number) { } : emitLeadingCommentsOfPositionWorker;
+            /** The root file passed to the emit function (if present) */
+            let root: SourceFile;
 
-            let moduleEmitDelegates: Map<(node: SourceFile) => void> = {
+            /** If removeComments is true, no leading-comments needed to be emitted **/
+            const emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos: number) { } : emitLeadingCommentsOfPositionWorker;
+
+            const moduleEmitDelegates: Map<(node: SourceFile, emitRelativePathAsModuleName?: boolean) => void> = {
                 [ModuleKind.ES6]: emitES6Module,
                 [ModuleKind.AMD]: emitAMDModule,
                 [ModuleKind.System]: emitSystemModule,
@@ -454,35 +573,89 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 [ModuleKind.CommonJS]: emitCommonJSModule,
             };
 
-            if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
-                initializeEmitterWithSourceMaps();
-            }
+            const bundleEmitDelegates: Map<(node: SourceFile, emitRelativePathAsModuleName?: boolean) => void> = {
+                [ModuleKind.ES6]() {},
+                [ModuleKind.AMD]: emitAMDModule,
+                [ModuleKind.System]: emitSystemModule,
+                [ModuleKind.UMD]() {},
+                [ModuleKind.CommonJS]() {},
+            };
 
-            if (root) {
-                // Do not call emit directly. It does not set the currentSourceFile.
-                emitSourceFile(root);
-            }
-            else {
-                forEach(host.getSourceFiles(), sourceFile => {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emitSourceFile(sourceFile);
+            return doEmit;
+
+            function doEmit(jsFilePath: string, rootFile?: SourceFile) {
+                generatedNameSet = {};
+                nodeToGeneratedName = [];
+                root = rootFile;
+
+                if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
+                    initializeEmitterWithSourceMaps(jsFilePath, root);
+                }
+
+                if (root) {
+                    // Do not call emit directly. It does not set the currentSourceFile.
+                    emitSourceFile(root);
+                }
+                else {
+                    if (modulekind) {
+                        forEach(host.getSourceFiles(), emitEmitHelpers);
                     }
-                });
-            }
+                    forEach(host.getSourceFiles(), sourceFile => {
+                        if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && isExternalModule(sourceFile))) {
+                            emitSourceFile(sourceFile);
+                        }
+                    });
+                }
 
-            writeLine();
-            writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM);
-            return;
+                writeLine();
+                writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
+
+                // reset the state
+                writer.reset();
+                currentSourceFile = undefined;
+                currentText = undefined;
+                currentLineMap = undefined;
+                exportFunctionForFile = undefined;
+                generatedNameSet = undefined;
+                nodeToGeneratedName = undefined;
+                computedPropertyNamesToGeneratedNames = undefined;
+                convertedLoopState = undefined;
+                extendsEmitted = false;
+                decorateEmitted = false;
+                paramEmitted = false;
+                awaiterEmitted = false;
+                tempFlags = 0;
+                tempVariables = undefined;
+                tempParameters = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStars = undefined;
+                detachedCommentsInfo = undefined;
+                sourceMapData = undefined;
+                isEs6Module = false;
+                renamedDependencies = undefined;
+                isCurrentFileExternalModule = false;
+                root = undefined;
+            }
 
             function emitSourceFile(sourceFile: SourceFile): void {
                 currentSourceFile = sourceFile;
+
+                currentText = sourceFile.text;
+                currentLineMap = getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
+                renamedDependencies = sourceFile.renamedDependencies;
+                currentFileIdentifiers = sourceFile.identifiers;
+                isCurrentFileExternalModule = isExternalModule(sourceFile);
+
                 emit(sourceFile);
             }
 
             function isUniqueName(name: string): boolean {
                 return !resolver.hasGlobalName(name) &&
-                    !hasProperty(currentSourceFile.identifiers, name) &&
+                    !hasProperty(currentFileIdentifiers, name) &&
                     !hasProperty(generatedNameSet, name);
             }
 
@@ -491,18 +664,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             // Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
             function makeTempVariableName(flags: TempFlags): string {
                 if (flags && !(tempFlags & flags)) {
-                    let name = flags === TempFlags._i ? "_i" : "_n";
+                    const name = flags === TempFlags._i ? "_i" : "_n";
                     if (isUniqueName(name)) {
                         tempFlags |= flags;
                         return name;
                     }
                 }
                 while (true) {
-                    let count = tempFlags & TempFlags.CountMask;
+                    const count = tempFlags & TempFlags.CountMask;
                     tempFlags++;
                     // Skip over 'i' and 'n'
                     if (count !== 8 && count !== 13) {
-                        let name = count < 26 ? "_" + String.fromCharCode(CharacterCodes.a + count) : "_" + (count - 26);
+                        const name = count < 26 ? "_" + String.fromCharCode(CharacterCodes.a + count) : "_" + (count - 26);
                         if (isUniqueName(name)) {
                             return name;
                         }
@@ -521,7 +694,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
                 let i = 1;
                 while (true) {
-                    let generatedName = baseName + i;
+                    const generatedName = baseName + i;
                     if (isUniqueName(generatedName)) {
                         return generatedNameSet[generatedName] = generatedName;
                     }
@@ -530,14 +703,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
-                let name = node.name.text;
+                const name = node.name.text;
                 // Use module/enum name itself if it is unique, otherwise make a unique variation
                 return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
             }
 
             function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
-                let expr = getExternalModuleName(node);
-                let baseName = expr.kind === SyntaxKind.StringLiteral ?
+                const expr = getExternalModuleName(node);
+                const baseName = expr.kind === SyntaxKind.StringLiteral ?
                     escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
                 return makeUniqueName(baseName);
             }
@@ -570,19 +743,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function getGeneratedNameForNode(node: Node) {
-                let id = getNodeId(node);
+                const id = getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = unescapeIdentifier(generateNameForNode(node)));
             }
 
-            function initializeEmitterWithSourceMaps() {
+            function initializeEmitterWithSourceMaps(jsFilePath: string, root?: SourceFile) {
                 let sourceMapDir: string; // The directory in which sourcemap will be
 
                 // Current source map file and its index in the sources list
                 let sourceMapSourceIndex = -1;
 
                 // Names and its index map
-                let sourceMapNameIndexMap: Map<number> = {};
-                let sourceMapNameIndices: number[] = [];
+                const sourceMapNameIndexMap: Map<number> = {};
+                const sourceMapNameIndices: number[] = [];
                 function getSourceMapNameIndex() {
                     return sourceMapNameIndices.length ? lastOrUndefined(sourceMapNameIndices) : -1;
                 }
@@ -678,14 +851,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function recordSourceMapSpan(pos: number) {
-                    let sourceLinePos = getLineAndCharacterOfPosition(currentSourceFile, pos);
+                    const sourceLinePos = computeLineAndCharacterOfPosition(currentLineMap, pos);
 
                     // Convert the location to be one-based.
                     sourceLinePos.line++;
                     sourceLinePos.character++;
 
-                    let emittedLine = writer.getLine();
-                    let emittedColumn = writer.getColumn();
+                    const emittedLine = writer.getLine();
+                    const emittedColumn = writer.getColumn();
 
                     // If this location wasn't recorded or the location in source is going backwards, record the span
                     if (!lastRecordedSourceMapSpan ||
@@ -717,7 +890,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 function recordEmitNodeStartSpan(node: Node) {
                     // Get the token pos after skipping to the token (ignoring the leading trivia)
-                    recordSourceMapSpan(skipTrivia(currentSourceFile.text, node.pos));
+                    recordSourceMapSpan(skipTrivia(currentText, node.pos));
                 }
 
                 function recordEmitNodeEndSpan(node: Node) {
@@ -725,9 +898,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function writeTextWithSpanRecord(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
-                    let tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
+                    const tokenStartPos = ts.skipTrivia(currentText, startPos);
                     recordSourceMapSpan(tokenStartPos);
-                    let tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
+                    const tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
                     recordSourceMapSpan(tokenEndPos);
                     return tokenEndPos;
                 }
@@ -736,7 +909,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     // Add the file to tsFilePaths
                     // If sourceroot option: Use the relative path corresponding to the common directory path
                     // otherwise source locations relative to map file location
-                    let sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
+                    const sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
 
                     sourceMapData.sourceMapSources.push(getRelativePathToDirectoryOrUrl(sourcesDirectoryPath,
                         node.fileName,
@@ -764,12 +937,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     function recordScopeNameStart(scopeName: string) {
                         let scopeNameIndex = -1;
                         if (scopeName) {
-                            let parentIndex = getSourceMapNameIndex();
+                            const parentIndex = getSourceMapNameIndex();
                             if (parentIndex !== -1) {
                                 // Child scopes are always shown with a dot (even if they have no name),
                                 // unless it is a computed property. Then it is shown with brackets,
                                 // but the brackets are included in the name.
-                                let name = (<Declaration>node).name;
+                                const name = (<Declaration>node).name;
                                 if (!name || name.kind !== SyntaxKind.ComputedPropertyName) {
                                     scopeName = "." + scopeName;
                                 }
@@ -801,7 +974,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         node.kind === SyntaxKind.EnumDeclaration) {
                         // Declaration and has associated name use it
                         if ((<Declaration>node).name) {
-                            let name = (<Declaration>node).name;
+                            const name = (<Declaration>node).name;
                             // For computed property names, the text will include the brackets
                             scopeName = name.kind === SyntaxKind.ComputedPropertyName
                                 ? getTextOfNode(name)
@@ -819,15 +992,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     sourceMapNameIndices.pop();
                 };
 
-                function writeCommentRangeWithMap(curentSourceFile: SourceFile, writer: EmitTextWriter, comment: CommentRange, newLine: string) {
+                function writeCommentRangeWithMap(currentText: string, currentLineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) {
                     recordSourceMapSpan(comment.pos);
-                    writeCommentRange(currentSourceFile, writer, comment, newLine);
+                    writeCommentRange(currentText, currentLineMap, writer, comment, newLine);
                     recordSourceMapSpan(comment.end);
                 }
 
                 function serializeSourceMapContents(version: number, file: string, sourceRoot: string, sources: string[], names: string[], mappings: string, sourcesContent?: string[]) {
                     if (typeof JSON !== "undefined") {
-                        let map: any = {
+                        const map: any = {
                             version,
                             file,
                             sourceRoot,
@@ -857,10 +1030,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
                 }
 
-                function writeJavaScriptAndSourceMapFile(emitOutput: string, writeByteOrderMark: boolean) {
+                function writeJavaScriptAndSourceMapFile(emitOutput: string, jsFilePath: string, writeByteOrderMark: boolean) {
                     encodeLastRecordedSourceMapSpan();
 
-                    let sourceMapText = serializeSourceMapContents(
+                    const sourceMapText = serializeSourceMapContents(
                         3,
                         sourceMapData.sourceMapFile,
                         sourceMapData.sourceMapSourceRoot,
@@ -874,7 +1047,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     let sourceMapUrl: string;
                     if (compilerOptions.inlineSourceMap) {
                         // Encode the sourceMap into the sourceMap url
-                        let base64SourceMapText = convertToBase64(sourceMapText);
+                        const base64SourceMapText = convertToBase64(sourceMapText);
                         sourceMapUrl = `//# sourceMappingURL=data:application/json;base64,${base64SourceMapText}`;
                     }
                     else {
@@ -884,11 +1057,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
 
                     // Write sourcemap url to the js file and write the js file
-                    writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark);
+                    writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark);
                 }
 
                 // Initialize source map data
-                let sourceMapJsFile = getBaseFileName(normalizeSlashes(jsFilePath));
+                const sourceMapJsFile = getBaseFileName(normalizeSlashes(jsFilePath));
                 sourceMapData = {
                     sourceMapFilePath: jsFilePath + ".map",
                     jsSourceMappingURL: sourceMapJsFile + ".map",
@@ -966,13 +1139,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 writeComment = writeCommentRangeWithMap;
             }
 
-            function writeJavaScriptFile(emitOutput: string, writeByteOrderMark: boolean) {
+            function writeJavaScriptFile(emitOutput: string, jsFilePath: string, writeByteOrderMark: boolean) {
                 writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
 
             // Create a temporary variable with a unique unused name.
             function createTempVariable(flags: TempFlags): Identifier {
-                let result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+                const result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
                 result.text = makeTempVariableName(flags);
                 return result;
             }
@@ -985,7 +1158,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function createAndRecordTempVariable(flags: TempFlags): Identifier {
-                let temp = createTempVariable(flags);
+                const temp = createTempVariable(flags);
                 recordTempDeclaration(temp);
 
                 return temp;
@@ -1006,7 +1179,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitTokenText(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
-                let tokenString = tokenToString(tokenKind);
+                const tokenString = tokenToString(tokenKind);
                 if (emitFn) {
                     emitFn();
                 }
@@ -1100,7 +1273,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             write(", ");
                         }
                     }
-                    let node = nodes[start + i];
+                    const node = nodes[start + i];
                     // This emitting is to make sure we emit following comment properly
                     //   ...(x, /*comment1*/ y)...
                     //         ^ => node.pos
@@ -1122,7 +1295,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitCommaList(nodes: Node[]) {
                 if (nodes) {
-                    emitList(nodes, 0, nodes.length, /*multiline*/ false, /*trailingComma*/ false);
+                    emitList(nodes, 0, nodes.length, /*multiLine*/ false, /*trailingComma*/ false);
                 }
             }
 
@@ -1152,7 +1325,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitLiteral(node: LiteralExpression) {
-                let text = getLiteralText(node);
+                const text = getLiteralText(node);
 
                 if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap) && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
                     writer.writeLiteral(text);
@@ -1176,7 +1349,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // If we don't need to downlevel and we can reach the original source text using
                 // the node's parent reference, then simply get the text as it was originally written.
                 if (node.parent) {
-                    return getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                    return getTextOfNodeFromSourceText(currentText, node);
                 }
 
                 // If we can't reach the original source text, use the canonical form if it's a number,
@@ -1207,13 +1380,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // Find original source text, since we need to emit the raw strings of the tagged template.
                 // The raw strings contain the (escaped) strings of what the user wrote.
                 // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-                let text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                let text = getTextOfNodeFromSourceText(currentText, node);
 
                 // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
                 // thus we need to remove those characters.
                 // First template piece starts with "`", others with "}"
                 // Last template piece ends with "`", others with "${"
-                let isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
+                const isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
                 text = text.substring(1, text.length - (isLast ? 1 : 2));
 
                 // Newline normalization:
@@ -1241,7 +1414,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitDownlevelTaggedTemplate(node: TaggedTemplateExpression) {
-                let tempVariable = createAndRecordTempVariable(TempFlags.Auto);
+                const tempVariable = createAndRecordTempVariable(TempFlags.Auto);
                 write("(");
                 emit(tempVariable);
                 write(" = ");
@@ -1261,7 +1434,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 if (node.template.kind === SyntaxKind.TemplateExpression) {
                     forEach((<TemplateExpression>node.template).templateSpans, templateSpan => {
                         write(", ");
-                        let needsParens = templateSpan.expression.kind === SyntaxKind.BinaryExpression
+                        const needsParens = templateSpan.expression.kind === SyntaxKind.BinaryExpression
                             && (<BinaryExpression>templateSpan.expression).operatorToken.kind === SyntaxKind.CommaToken;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
@@ -1277,7 +1450,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     return;
                 }
 
-                let emitOuterParens = isExpression(node.parent)
+                const emitOuterParens = isExpression(node.parent)
                     && templateNeedsParens(node, <Expression>node.parent);
 
                 if (emitOuterParens) {
@@ -1291,7 +1464,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 for (let i = 0, n = node.templateSpans.length; i < n; i++) {
-                    let templateSpan = node.templateSpans[i];
+                    const templateSpan = node.templateSpans[i];
 
                     // Check if the expression has operands and binds its operands less closely than binary '+'.
                     // If it does, we need to wrap the expression in parentheses. Otherwise, something like
@@ -1302,7 +1475,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     //    ("abc" + 1) << (2 + "")
                     // rather than
                     //    "abc" + (1 << 2) + ""
-                    let needsParens = templateSpan.expression.kind !== SyntaxKind.ParenthesizedExpression
+                    const needsParens = templateSpan.expression.kind !== SyntaxKind.ParenthesizedExpression
                         && comparePrecedenceToBinaryPlus(templateSpan.expression) !== Comparison.GreaterThan;
 
                     if (i > 0 || headEmitted) {
@@ -1404,10 +1577,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emit(span.literal);
             }
 
-            function jsxEmitReact(node: JsxElement|JsxSelfClosingElement) {
+            function jsxEmitReact(node: JsxElement | JsxSelfClosingElement) {
                 /// Emit a tag name, which is either '"div"' for lower-cased names, or
                 /// 'Div' for upper-cased or dotted names
-                function emitTagName(name: Identifier|QualifiedName) {
+                function emitTagName(name: Identifier | QualifiedName) {
                     if (name.kind === SyntaxKind.Identifier && isIntrinsicJsxName((<Identifier>name).text)) {
                         write("\"");
                         emit(name);
@@ -1422,13 +1595,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 /// these emit into an object literal property name, we don't need to be worried
                 /// about keywords, just non-identifier characters
                 function emitAttributeName(name: Identifier) {
-                    if (/[A-Za-z_]+[\w*]/.test(name.text)) {
-                        write("\"");
+                    if (/^[A-Za-z_]\w*$/.test(name.text)) {
                         emit(name);
-                        write("\"");
                     }
                     else {
+                        write("\"");
                         emit(name);
+                        write("\"");
                     }
                 }
 
@@ -1445,7 +1618,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function emitJsxElement(openingNode: JsxOpeningLikeElement, children?: JsxChild[]) {
-                    let syntheticReactRef = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+                    const syntheticReactRef = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
                     syntheticReactRef.text = "React";
                     syntheticReactRef.parent = openingNode;
 
@@ -1464,7 +1637,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     else {
                         // Either emit one big object literal (no spread attribs), or
                         // a call to React.__spread
-                        let attrs = openingNode.attributes;
+                        const attrs = openingNode.attributes;
                         if (forEach(attrs, attr => attr.kind === SyntaxKind.JsxSpreadAttribute)) {
                             emitExpressionIdentifier(syntheticReactRef);
                             write(".__spread(");
@@ -1528,7 +1701,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                             // Don't emit empty strings
                             if (children[i].kind === SyntaxKind.JsxText) {
-                                let text = getTextToEmit(<JsxText>children[i]);
+                                const text = getTextToEmit(<JsxText>children[i]);
                                 if (text !== undefined) {
                                     write(", \"");
                                     write(text);
@@ -1557,7 +1730,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
             }
 
-            function jsxEmitPreserve(node: JsxElement|JsxSelfClosingElement) {
+            function jsxEmitPreserve(node: JsxElement | JsxSelfClosingElement) {
                 function emitJsxAttribute(node: JsxAttribute) {
                     emit(node.name);
                     if (node.initializer) {
@@ -1572,7 +1745,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write("}");
                 }
 
-                function emitAttributes(attribs: NodeArray<JsxAttribute|JsxSpreadAttribute>) {
+                function emitAttributes(attribs: NodeArray<JsxAttribute | JsxSpreadAttribute>) {
                     for (let i = 0, n = attribs.length; i < n; i++) {
                         if (i > 0) {
                             write(" ");
@@ -1588,7 +1761,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
                 }
 
-                function emitJsxOpeningOrSelfClosingElement(node: JsxOpeningElement|JsxSelfClosingElement) {
+                function emitJsxOpeningOrSelfClosingElement(node: JsxOpeningElement | JsxSelfClosingElement) {
                     write("<");
                     emit(node.tagName);
                     if (node.attributes.length > 0 || (node.kind === SyntaxKind.JsxSelfClosingElement)) {
@@ -1679,7 +1852,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         write((<LiteralExpression>node).text);
                     }
                     else {
-                        writeTextOfNode(currentSourceFile, node);
+                        writeTextOfNode(currentText, node);
                     }
 
                     write("\"");
@@ -1687,7 +1860,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function isExpressionIdentifier(node: Node): boolean {
-                let parent = node.parent;
+                const parent = node.parent;
                 switch (parent.kind) {
                     case SyntaxKind.ArrayLiteralExpression:
                     case SyntaxKind.AsExpression:
@@ -1755,7 +1928,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     return;
                 }
 
-                let container = resolver.getReferencedExportContainer(node);
+                const container = resolver.getReferencedExportContainer(node);
                 if (container) {
                     if (container.kind === SyntaxKind.SourceFile) {
                         // Identifier references module export
@@ -1769,34 +1942,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         write(".");
                     }
                 }
-                else if (modulekind !== ModuleKind.ES6) {
-                    let declaration = resolver.getReferencedImportDeclaration(node);
-                    if (declaration) {
-                        if (declaration.kind === SyntaxKind.ImportClause) {
-                            // Identifier references default import
-                            write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent));
-                            write(languageVersion === ScriptTarget.ES3 ? "[\"default\"]" : ".default");
-                            return;
-                        }
-                        else if (declaration.kind === SyntaxKind.ImportSpecifier) {
-                            // Identifier references named import
-                            write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent.parent.parent));
-                            let name =  (<ImportSpecifier>declaration).propertyName || (<ImportSpecifier>declaration).name;
-                            let identifier = getSourceTextOfNodeFromSourceFile(currentSourceFile, name);
-                            if (languageVersion === ScriptTarget.ES3 && identifier === "default") {
-                                write(`["default"]`);
+                else {
+                    if (modulekind !== ModuleKind.ES6) {
+                        const declaration = resolver.getReferencedImportDeclaration(node);
+                        if (declaration) {
+                            if (declaration.kind === SyntaxKind.ImportClause) {
+                                // Identifier references default import
+                                write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent));
+                                write(languageVersion === ScriptTarget.ES3 ? "[\"default\"]" : ".default");
+                                return;
                             }
-                            else {
-                                write(".");
-                                write(identifier);
+                            else if (declaration.kind === SyntaxKind.ImportSpecifier) {
+                                // Identifier references named import
+                                write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent.parent.parent));
+                                const name =  (<ImportSpecifier>declaration).propertyName || (<ImportSpecifier>declaration).name;
+                                const identifier = getTextOfNodeFromSourceText(currentText, name);
+                                if (languageVersion === ScriptTarget.ES3 && identifier === "default") {
+                                    write(`["default"]`);
+                                }
+                                else {
+                                    write(".");
+                                    write(identifier);
+                                }
+                                return;
                             }
-                            return;
                         }
                     }
-                    declaration = resolver.getReferencedNestedRedeclaration(node);
-                    if (declaration) {
-                        write(getGeneratedNameForNode(declaration.name));
-                        return;
+
+                    if (languageVersion !== ScriptTarget.ES6) {
+                        const declaration = resolver.getReferencedNestedRedeclaration(node);
+                        if (declaration) {
+                            write(getGeneratedNameForNode(declaration.name));
+                            return;
+                        }
                     }
                 }
 
@@ -1804,13 +1982,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
 
             function isNameOfNestedRedeclaration(node: Identifier) {
                 if (languageVersion < ScriptTarget.ES6) {
-                    let parent = node.parent;
+                    const parent = node.parent;
                     switch (parent.kind) {
                         case SyntaxKind.BindingElement:
                         case SyntaxKind.ClassDeclaration:
@@ -1823,6 +2001,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitIdentifier(node: Identifier) {
+                if (convertedLoopState) {
+                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
+                        // in converted loop body arguments cannot be used directly.
+                        const name = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name);
+                        return;
+                    }
+                }
+
                 if (!node.parent) {
                     write(node.text);
                 }
@@ -1836,7 +2023,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write(node.text);
                 }
                 else {
-                    writeTextOfNode(currentSourceFile, node);
+                    writeTextOfNode(currentText, node);
                 }
             }
 
@@ -1854,7 +2041,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write("super");
                 }
                 else {
-                    let flags = resolver.getNodeCheckFlags(node);
+                    const flags = resolver.getNodeCheckFlags(node);
                     if (flags & NodeCheckFlags.SuperInstance) {
                         write("_super.prototype");
                     }
@@ -1866,14 +2053,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitObjectBindingPattern(node: BindingPattern) {
                 write("{ ");
-                let elements = node.elements;
+                const elements = node.elements;
                 emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
                 write(" }");
             }
 
             function emitArrayBindingPattern(node: BindingPattern) {
                 write("[");
-                let elements = node.elements;
+                const elements = node.elements;
                 emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
                 write("]");
             }
@@ -1912,7 +2099,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitAwaitExpression(node: AwaitExpression) {
-                let needsParenthesis = needsParenthesisForAwaitExpressionAsYield(node);
+                const needsParenthesis = needsParenthesisForAwaitExpressionAsYield(node);
                 if (needsParenthesis) {
                     write("(");
                 }
@@ -1953,7 +2140,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             function emitListWithSpread(elements: Expression[], needsUniqueCopy: boolean, multiLine: boolean, trailingComma: boolean, useConcat: boolean) {
                 let pos = 0;
                 let group = 0;
-                let length = elements.length;
+                const length = elements.length;
                 while (pos < length) {
                     // Emit using the pattern <group0>.concat(<group1>, <group2>, ...)
                     if (group === 1 && useConcat) {
@@ -2001,13 +2188,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitArrayLiteral(node: ArrayLiteralExpression) {
-                let elements = node.elements;
+                const elements = node.elements;
                 if (elements.length === 0) {
                     write("[]");
                 }
                 else if (languageVersion >= ScriptTarget.ES6 || !forEach(elements, isSpreadElementExpression)) {
                     write("[");
-                    emitLinePreservingList(node, node.elements, elements.hasTrailingComma, /*spacesBetweenBraces:*/ false);
+                    emitLinePreservingList(node, node.elements, elements.hasTrailingComma, /*spacesBetweenBraces*/ false);
                     write("]");
                 }
                 else {
@@ -2025,16 +2212,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write("{");
 
                 if (numElements > 0) {
-                    let properties = node.properties;
+                    const properties = node.properties;
 
                     // If we are not doing a downlevel transformation for object literals,
                     // then try to preserve the original shape of the object literal.
                     // Otherwise just try to preserve the formatting.
                     if (numElements === properties.length) {
-                        emitLinePreservingList(node, properties, /* allowTrailingComma */ languageVersion >= ScriptTarget.ES5, /* spacesBetweenBraces */ true);
+                        emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= ScriptTarget.ES5, /*spacesBetweenBraces*/ true);
                     }
                     else {
-                        let multiLine = (node.flags & NodeFlags.MultiLine) !== 0;
+                        const multiLine = (node.flags & NodeFlags.MultiLine) !== 0;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -2057,8 +2244,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitDownlevelObjectLiteralWithComputedProperties(node: ObjectLiteralExpression, firstComputedPropertyIndex: number) {
-                let multiLine = (node.flags & NodeFlags.MultiLine) !== 0;
-                let properties = node.properties;
+                const multiLine = (node.flags & NodeFlags.MultiLine) !== 0;
+                const properties = node.properties;
 
                 write("(");
 
@@ -2068,7 +2255,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 // For computed properties, we need to create a unique handle to the object
                 // literal so we can modify it without risking internal assignments tainting the object.
-                let tempVar = createAndRecordTempVariable(TempFlags.Auto);
+                const tempVar = createAndRecordTempVariable(TempFlags.Auto);
 
                 // Write out the first non-computed properties
                 // (or all properties if none of them are computed),
@@ -2080,12 +2267,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 for (let i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
                     writeComma();
 
-                    let property = properties[i];
+                    const property = properties[i];
 
                     emitStart(property);
                     if (property.kind === SyntaxKind.GetAccessor || property.kind === SyntaxKind.SetAccessor) {
                         // TODO (drosen): Reconcile with 'emitMemberFunctions'.
-                        let accessors = getAllAccessorDeclarations(node.properties, <AccessorDeclaration>property);
+                        const accessors = getAllAccessorDeclarations(node.properties, <AccessorDeclaration>property);
                         if (property !== accessors.firstAccessor) {
                             continue;
                         }
@@ -2176,10 +2363,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitObjectLiteral(node: ObjectLiteralExpression): void {
-                let properties = node.properties;
+                const properties = node.properties;
 
                 if (languageVersion < ScriptTarget.ES6) {
-                    let numProperties = properties.length;
+                    const numProperties = properties.length;
 
                     // Find the first computed property.
                     // Everything until that point can be emitted as part of the initial object literal.
@@ -2191,7 +2378,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         }
                     }
 
-                    let hasComputedProperty = numInitialNonComputedProperties !== properties.length;
+                    const hasComputedProperty = numInitialNonComputedProperties !== properties.length;
                     if (hasComputedProperty) {
                         emitDownlevelObjectLiteralWithComputedProperties(node, numInitialNonComputedProperties);
                         return;
@@ -2204,7 +2391,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function createBinaryExpression(left: Expression, operator: SyntaxKind, right: Expression, startsOnNewLine?: boolean): BinaryExpression {
-                let result = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression, startsOnNewLine);
+                const result = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression, startsOnNewLine);
                 result.operatorToken = createSynthesizedNode(operator);
                 result.left = left;
                 result.right = right;
@@ -2213,7 +2400,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function createPropertyAccessExpression(expression: Expression, name: Identifier): PropertyAccessExpression {
-                let result = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression);
+                const result = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression);
                 result.expression = parenthesizeForAccess(expression);
                 result.dotToken = createSynthesizedNode(SyntaxKind.DotToken);
                 result.name = name;
@@ -2222,7 +2409,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function createElementAccessExpression(expression: Expression, argumentExpression: Expression): ElementAccessExpression {
-                let result = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
+                const result = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
                 result.expression = parenthesizeForAccess(expression);
                 result.argumentExpression = argumentExpression;
 
@@ -2250,7 +2437,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                     return <LeftHandSideExpression>expr;
                 }
-                let node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
+                const node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
                 node.expression = expr;
                 return node;
             }
@@ -2289,14 +2476,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             // Return true if identifier resolves to an exported member of a namespace
             function isNamespaceExportReference(node: Identifier) {
-                let container = resolver.getReferencedExportContainer(node);
+                const container = resolver.getReferencedExportContainer(node);
                 return container && container.kind !== SyntaxKind.SourceFile;
             }
 
             function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
                 // The name property of a short-hand property assignment is considered an expression position, so here
                 // we manually emit the identifier to avoid rewriting.
-                writeTextOfNode(currentSourceFile, node.name);
+                writeTextOfNode(currentText, node.name);
                 // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier,
                 // we emit a normal property assignment. For example:
                 //   module m {
@@ -2306,7 +2493,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 //       let obj = { y };
                 //   }
                 // Here we need to emit obj = { y : m.y } regardless of the output target.
-                if (languageVersion < ScriptTarget.ES6 || isNamespaceExportReference(node.name)) {
+                if (modulekind !== ModuleKind.ES6 || isNamespaceExportReference(node.name)) {
                     // Emit identifier as an identifier
                     write(": ");
                     emit(node.name);
@@ -2319,11 +2506,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function tryEmitConstantValue(node: PropertyAccessExpression | ElementAccessExpression): boolean {
-                let constantValue = tryGetConstEnumValue(node);
+                const constantValue = tryGetConstEnumValue(node);
                 if (constantValue !== undefined) {
                     write(constantValue.toString());
                     if (!compilerOptions.removeComments) {
-                        let propertyName: string = node.kind === SyntaxKind.PropertyAccessExpression ? declarationNameToString((<PropertyAccessExpression>node).name) : getTextOfNode((<ElementAccessExpression>node).argumentExpression);
+                        const propertyName: string = node.kind === SyntaxKind.PropertyAccessExpression ? declarationNameToString((<PropertyAccessExpression>node).name) : getTextOfNode((<ElementAccessExpression>node).argumentExpression);
                         write(" /* " + propertyName + " */");
                     }
                     return true;
@@ -2345,10 +2532,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             // If the code is not indented, an optional valueToWriteWhenNotIndenting will be
             // emitted instead.
             function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node, valueToWriteWhenNotIndenting?: string): boolean {
-                let realNodesAreOnDifferentLines = !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
+                const realNodesAreOnDifferentLines = !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
 
                 // Always use a newline for synthesized code if the synthesizer desires it.
-                let synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
+                const synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
 
                 if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
                     increaseIndent();
@@ -2369,20 +2556,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 emit(node.expression);
-                let indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                const indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
 
                 // 1 .toString is a valid property access, emit a space after the literal
                 // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal
-                let shouldEmitSpace: boolean;
+                let shouldEmitSpace = false;
                 if (!indentedBeforeDot) {
                     if (node.expression.kind === SyntaxKind.NumericLiteral) {
                         // check if numeric literal was originally written with a dot
-                        let text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression);
+                        const text = getTextOfNodeFromSourceText(currentText, node.expression);
                         shouldEmitSpace = text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
                     }
                     else {
                         // check if constant enum value is integer
-                        let constantValue = tryGetConstEnumValue(node.expression);
+                        const constantValue = tryGetConstEnumValue(node.expression);
                         // isFinite handles cases when constantValue is undefined
                         shouldEmitSpace = isFinite(constantValue) && Math.floor(constantValue) === constantValue;
                     }
@@ -2395,7 +2582,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write(".");
                 }
 
-                let indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
+                const indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
                 decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
             }
@@ -2411,7 +2598,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emitEntityNameAsExpression(node.left, useFallback);
                 }
                 else if (useFallback) {
-                    let temp = createAndRecordTempVariable(TempFlags.Auto);
+                    const temp = createAndRecordTempVariable(TempFlags.Auto);
                     write("(");
                     emitNodeWithoutSourceMap(temp);
                     write(" = ");
@@ -2471,7 +2658,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emit(node);
                     return node;
                 }
-                let temp = createAndRecordTempVariable(TempFlags.Auto);
+                const temp = createAndRecordTempVariable(TempFlags.Auto);
 
                 write("(");
                 emit(temp);
@@ -2483,7 +2670,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitCallWithSpread(node: CallExpression) {
                 let target: Expression;
-                let expr = skipParentheses(node.expression);
+                const expr = skipParentheses(node.expression);
                 if (expr.kind === SyntaxKind.PropertyAccessExpression) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget((<PropertyAccessExpression>expr).expression);
@@ -2577,11 +2764,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     hasSpreadElement(node.arguments)) {
 
                     write("(");
-                    let target = emitCallTarget(node.expression);
+                    const target = emitCallTarget(node.expression);
                     write(".bind.apply(");
                     emit(target);
                     write(", [void 0].concat(");
-                    emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiline*/ false, /*trailingComma*/ false, /*useConcat*/ false);
+                    emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ false);
                     write(")))");
                     write("()");
                 }
@@ -2709,7 +2896,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // expression a prefix increment whose operand is a plus expression - (++(+x))
                 // The same is true of minus of course.
                 if (node.operand.kind === SyntaxKind.PrefixUnaryExpression) {
-                    let operand = <PrefixUnaryExpression>node.operand;
+                    const operand = <PrefixUnaryExpression>node.operand;
                     if (node.operator === SyntaxKind.PlusToken && (operand.operator === SyntaxKind.PlusToken || operand.operator === SyntaxKind.PlusPlusToken)) {
                         write(" ");
                     }
@@ -2765,7 +2952,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
              *   we we emit variable statement 'var' should be dropped.
              */
             function isSourceFileLevelDeclarationInSystemJsModule(node: Node, isExported: boolean): boolean {
-                if (!node || languageVersion >= ScriptTarget.ES6 || !isCurrentFileSystemExternalModule()) {
+                if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
 
@@ -2785,10 +2972,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             /**
              * Emit ES7 exponentiation operator downlevel using Math.pow
-             * @param node a binary expression node containing exponentiationOperator (**, **=) 
+             * @param node a binary expression node containing exponentiationOperator (**, **=)
              */
             function emitExponentiationOperator(node: BinaryExpression) {
-                let leftHandSideExpression = node.left;
+                const leftHandSideExpression = node.left;
                 if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken) {
                     let synthesizedLHS: ElementAccessExpression | PropertyAccessExpression;
                     let shouldEmitParentheses = false;
@@ -2798,12 +2985,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                         synthesizedLHS = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression, /*startsOnNewLine*/ false);
 
-                        let identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefinedTempVariablesInPlaces*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
+                        const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
                         synthesizedLHS.expression = identifier;
 
                         if (leftHandSideExpression.argumentExpression.kind !== SyntaxKind.NumericLiteral &&
                             leftHandSideExpression.argumentExpression.kind !== SyntaxKind.StringLiteral) {
-                            let tempArgumentExpression = createAndRecordTempVariable(TempFlags._i);
+                            const tempArgumentExpression = createAndRecordTempVariable(TempFlags._i);
                             (<ElementAccessExpression>synthesizedLHS).argumentExpression = tempArgumentExpression;
                             emitAssignment(tempArgumentExpression, leftHandSideExpression.argumentExpression, /*shouldEmitCommaBeforeAssignment*/ true);
                         }
@@ -2817,7 +3004,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         write("(");
                         synthesizedLHS = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression, /*startsOnNewLine*/ false);
 
-                        let identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefinedTempVariablesInPlaces*/ false, /*shouldemitCommaBeforeAssignment*/ false);
+                        const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
                         synthesizedLHS.expression = identifier;
 
                         (<PropertyAccessExpression>synthesizedLHS).dotToken = leftHandSideExpression.dotToken;
@@ -2876,9 +3063,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         //   emitted as
                         //      3
                         //          + 2;
-                        let indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
+                        const indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
                         write(tokenToString(node.operatorToken.kind));
-                        let indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
+                        const indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
                         emit(node.right);
                         decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
                     }
@@ -2895,14 +3082,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitConditionalExpression(node: ConditionalExpression) {
                 emit(node.condition);
-                let indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
+                const indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
                 write("?");
-                let indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
+                const indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
                 emit(node.whenTrue);
                 decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
-                let indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
+                const indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
                 write(":");
-                let indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
+                const indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
                 emit(node.whenFalse);
                 decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
             }
@@ -2922,7 +3109,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function isSingleLineEmptyBlock(node: Node) {
                 if (node && node.kind === SyntaxKind.Block) {
-                    let block = <Block>node;
+                    const block = <Block>node;
                     return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
                 }
             }
@@ -2991,8 +3178,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitDoStatement(node: DoStatement) {
+                emitLoop(node, emitDoStatementWorker);
+            }
+
+            function emitDoStatementWorker(node: DoStatement, loop: ConvertedLoop) {
                 write("do");
-                emitEmbeddedStatement(node.statement);
+                if (loop) {
+                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
+                }
                 if (node.statement.kind === SyntaxKind.Block) {
                     write(" ");
                 }
@@ -3005,10 +3201,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitWhileStatement(node: WhileStatement) {
+                emitLoop(node, emitWhileStatementWorker);
+            }
+
+            function emitWhileStatementWorker(node: WhileStatement, loop: ConvertedLoop) {
                 write("while (");
                 emit(node.expression);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+
+                if (loop) {
+                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
+                }
             }
 
             /**
@@ -3022,6 +3228,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     return false;
                 }
 
+                if (convertedLoopState && (getCombinedNodeFlags(decl) & NodeFlags.BlockScoped) === 0) {
+                    // we are inside a converted loop - this can only happen in downlevel scenarios 
+                    // record names for all variable declarations
+                    for (const varDecl of decl.declarations) {
+                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
+                    }
+                    return false;
+                }
+
                 let tokenKind = SyntaxKind.VarKeyword;
                 if (decl && languageVersion >= ScriptTarget.ES6) {
                     if (isLet(decl)) {
@@ -3055,7 +3270,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitVariableDeclarationListSkippingUninitializedEntries(list: VariableDeclarationList): boolean {
                 let started = false;
-                for (let decl of list.declarations) {
+                for (const decl of list.declarations) {
                     if (!decl.initializer) {
                         continue;
                     }
@@ -3073,13 +3288,301 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 return started;
             }
 
+            interface ConvertedLoop {
+                functionName: string;
+                paramList: string;
+                state: ConvertedLoopState;
+            }
+
+            function shouldConvertLoopBody(node: IterationStatement): boolean {
+                return languageVersion < ScriptTarget.ES6 &&
+                    (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LoopWithBlockScopedBindingCapturedInFunction) !== 0;
+            }
+
+            function emitLoop(node: IterationStatement, loopEmitter: (n: IterationStatement, convertedLoop: ConvertedLoop) => void): void {
+                const shouldConvert = shouldConvertLoopBody(node);
+                if (!shouldConvert) {
+                    loopEmitter(node, /* convertedLoop*/ undefined);
+                }
+                else {
+                    const loop = convertLoopBody(node);
+                    if (node.parent.kind === SyntaxKind.LabeledStatement) {
+                        // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
+                        emitLabelAndColon(<LabeledStatement>node.parent);
+                    }
+                    loopEmitter(node, loop);
+                }
+            }
+
+            function convertLoopBody(node: IterationStatement): ConvertedLoop {
+                const functionName = makeUniqueName("_loop");
+
+                let loopInitializer: VariableDeclarationList;
+                switch (node.kind) {
+                    case SyntaxKind.ForStatement:
+                    case SyntaxKind.ForInStatement:
+                    case SyntaxKind.ForOfStatement:
+                        if ((<ForStatement | ForInStatement | ForOfStatement>node).initializer.kind === SyntaxKind.VariableDeclarationList) {
+                            loopInitializer = <VariableDeclarationList>(<ForStatement | ForInStatement | ForOfStatement>node).initializer;
+                        }
+                        break;
+                }
+
+                let loopParameters: string[];
+                if (loopInitializer && (getCombinedNodeFlags(loopInitializer) & NodeFlags.BlockScoped)) {
+                    // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
+                    loopParameters = [];
+                    for (const varDeclaration of loopInitializer.declarations) {
+                        collectNames(varDeclaration.name);
+                    }
+                }
+
+                const bodyIsBlock = node.statement.kind === SyntaxKind.Block;
+                const paramList = loopParameters ? loopParameters.join(", ") : "";
+
+                writeLine();
+                write(`var ${functionName} = function(${paramList})`);
+
+                if (!bodyIsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+
+                const convertedOuterLoopState = convertedLoopState;
+                convertedLoopState = {};
+
+                if (convertedOuterLoopState) {
+                    // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
+                    // if outer converted loop has already accumulated some state - pass it through
+                    if (convertedOuterLoopState.argumentsName) {
+                        // outer loop has already used 'arguments' so we've already have some name to alias it
+                        // use the same name in all nested loops
+                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
+                    }
+
+                    if (convertedOuterLoopState.hoistedLocalVariables) {
+                        // we've already collected some non-block scoped variable declarations in enclosing loop
+                        // use the same storage in nested loop
+                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
+                    }
+                }
+
+                emitEmbeddedStatement(node.statement);
+
+                if (!bodyIsBlock) {
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+                write(";");
+                writeLine();
+
+                if (convertedLoopState.argumentsName) {
+                    // if alias for arguments is set
+                    if (convertedOuterLoopState) {
+                        // pass it to outer converted loop
+                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
+                    }
+                    else {
+                        // this is top level converted loop and we need to create an alias for 'arguments' object
+                        write(`var ${convertedLoopState.argumentsName} = arguments;`);
+                        writeLine();
+                    }
+                }
+
+                if (convertedLoopState.hoistedLocalVariables) {
+                    // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
+                    if (convertedOuterLoopState) {
+                        // pass them to outer converted loop
+                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
+                    }
+                    else {
+                        // deduplicate and hoist collected variable declarations
+                        write("var ");
+                        let seen: Map<string>;
+                        for (const id of convertedLoopState.hoistedLocalVariables) {
+                           // Don't initialize seen unless we have at least one element.
+                           // Emit a comma to separate for all but the first element.
+                           if (!seen) {
+                               seen = {};
+                           }
+                           else {
+                               write(", ");
+                           }
+
+                           if (!hasProperty(seen, id.text)) {
+                               emit(id);
+                               seen[id.text] = id.text;
+                           }
+                        }
+                        write(";");
+                        writeLine();
+                    }
+                }
+
+                const currentLoopState = convertedLoopState;
+                convertedLoopState = convertedOuterLoopState;
+
+                return { functionName, paramList, state: currentLoopState };
+
+                function collectNames(name: Identifier | BindingPattern): void {
+                    if (name.kind === SyntaxKind.Identifier) {
+                        const nameText = isNameOfNestedRedeclaration(<Identifier>name) ? getGeneratedNameForNode(name) : (<Identifier>name).text;
+                        loopParameters.push(nameText);
+                    }
+                    else {
+                        for (const element of (<BindingPattern>name).elements) {
+                            collectNames(element.name);
+                        }
+                    }
+                }
+            }
+
+            function emitNormalLoopBody(node: IterationStatement, emitAsEmbeddedStatement: boolean): void {
+                let saveAllowedNonLabeledJumps: Jump;
+                if (convertedLoopState) {
+                    // we get here if we are trying to emit normal loop loop inside converted loop
+                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = Jump.Break | Jump.Continue;
+                }
+
+                if (emitAsEmbeddedStatement) {
+                    emitEmbeddedStatement(node.statement);
+                }
+                else if (node.statement.kind === SyntaxKind.Block) {
+                    emitLines((<Block>node.statement).statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+            }
+
+            function emitConvertedLoopCall(loop: ConvertedLoop, emitAsBlock: boolean): void {
+                if (emitAsBlock) {
+                    write(" {");
+                    writeLine();
+                    increaseIndent();
+                }
+
+                // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
+                // simple loops are emitted as just 'loop()';
+                const isSimpleLoop =
+                    !loop.state.nonLocalJumps &&
+                    !loop.state.labeledNonLocalBreaks &&
+                    !loop.state.labeledNonLocalContinues;
+
+                const loopResult = makeUniqueName("state");
+                if (!isSimpleLoop) {
+                    write(`var ${loopResult} = `);
+                }
+
+                write(`${loop.functionName}(${loop.paramList});`);
+
+                if (!isSimpleLoop) {
+                    // for non simple loops we need to store result returned from converted loop function and use it to do dispatching
+                    // converted loop function can return:
+                    // - object - used when body of the converted loop contains return statement. Property "value" of this object stores retuned value
+                    // - string - used to dispatch jumps. "break" and "continue" are used to non-labeled jumps, other values are used to transfer control to
+                    //   different labels
+                    writeLine();
+                    if (loop.state.nonLocalJumps & Jump.Return) {
+                        write(`if (typeof ${loopResult} === "object") `);
+                        if (convertedLoopState) {
+                            // we are currently nested in another converted loop - return unwrapped result
+                            write(`return ${loopResult};`);
+                            // propagate 'hasReturn' flag to outer loop
+                            convertedLoopState.nonLocalJumps |= Jump.Return;
+                        }
+                        else {
+                            // top level converted loop - return unwrapped value
+                            write(`return ${loopResult}.value`);
+                        }
+                        writeLine();
+                    }
+
+                    if (loop.state.nonLocalJumps & Jump.Break) {
+                        write(`if (${loopResult} === "break") break;`);
+                        writeLine();
+                    }
+
+                    if (loop.state.nonLocalJumps & Jump.Continue) {
+                        write(`if (${loopResult} === "continue") continue;`);
+                        writeLine();
+                    }
+
+                    // in case of labeled breaks emit code that either breaks to some known label inside outer loop or delegates jump decision to outer loop
+                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
+                }
+
+                if (emitAsBlock) {
+                    writeLine();
+                    decreaseIndent();
+                    write("}");
+                }
+
+                function emitDispatchTableForLabeledJumps(loopResultVariable: string, currentLoop: ConvertedLoopState, outerLoop: ConvertedLoopState) {
+                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
+                        return;
+                    }
+
+                    write(`switch(${loopResultVariable}) {`);
+                    increaseIndent();
+
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /*isBreak*/ true, loopResultVariable, outerLoop);
+                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /*isBreak*/ false, loopResultVariable, outerLoop);
+
+                    decreaseIndent();
+                    writeLine();
+                    write("}");
+                }
+
+                function emitDispatchEntriesForLabeledJumps(table: Map<string>, isBreak: boolean, loopResultVariable: string, outerLoop: ConvertedLoopState): void {
+                    if (!table) {
+                        return;
+                    }
+
+                    for (const labelText in table) {
+                        const labelMarker = table[labelText];
+                        writeLine();
+                        write(`case "${labelMarker}": `);
+                        // if there are no outer converted loop or outer label in question is located inside outer converted loop
+                        // then emit labeled break\continue
+                        // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do  
+                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
+                            if (isBreak) {
+                                write("break ");
+                            }
+                            else {
+                                write("continue ");
+                            }
+                            write(`${labelText};`);
+                        }
+                        else {
+                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                            write(`return ${loopResultVariable};`);
+                        }
+                    }
+                }
+            }
+
             function emitForStatement(node: ForStatement) {
+                emitLoop(node, emitForStatementWorker);
+            }
+
+            function emitForStatementWorker(node: ForStatement, loop: ConvertedLoop) {
                 let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
                 write(" ");
                 endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
                 if (node.initializer && node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    let variableDeclarationList = <VariableDeclarationList>node.initializer;
-                    let startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList, endPos);
+                    const variableDeclarationList = <VariableDeclarationList>node.initializer;
+                    const startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList, endPos);
                     if (startIsEmitted) {
                         emitCommaList(variableDeclarationList.declarations);
                     }
@@ -3095,19 +3598,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write(";");
                 emitOptional(" ", node.incrementor);
                 write(")");
-                emitEmbeddedStatement(node.statement);
+
+                if (loop) {
+                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
+                }
             }
 
             function emitForInOrForOfStatement(node: ForInStatement | ForOfStatement) {
                 if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.ForOfStatement) {
-                    return emitDownLevelForOfStatement(node);
+                    emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
+                else {
+                    emitLoop(node, emitForInOrForOfStatementWorker);
+                }
+            }
 
+            function emitForInOrForOfStatementWorker(node: ForInStatement | ForOfStatement, loop: ConvertedLoop) {
                 let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
                 write(" ");
                 endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
                 if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    let variableDeclarationList = <VariableDeclarationList>node.initializer;
+                    const variableDeclarationList = <VariableDeclarationList>node.initializer;
                     if (variableDeclarationList.declarations.length >= 1) {
                         tryEmitStartOfVariableDeclarationList(variableDeclarationList, endPos);
                         emit(variableDeclarationList.declarations[0]);
@@ -3125,10 +3639,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
                 emit(node.expression);
                 emitToken(SyntaxKind.CloseParenToken, node.expression.end);
-                emitEmbeddedStatement(node.statement);
+
+                if (loop) {
+                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
+                }
+                else {
+                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
+                }
             }
 
             function emitDownLevelForOfStatement(node: ForOfStatement) {
+                emitLoop(node, emitDownLevelForOfStatementWorker);
+            }
+
+            function emitDownLevelForOfStatementWorker(node: ForOfStatement, loop: ConvertedLoop) {
                 // The following ES6 code:
                 //
                 //    for (let v of expr) { }
@@ -3162,10 +3686,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 //
                 //     for (let v of arr) { }
                 //
-                // we don't want to emit a temporary variable for the RHS, just use it directly.
-                let rhsIsIdentifier = node.expression.kind === SyntaxKind.Identifier;
-                let counter = createTempVariable(TempFlags._i);
-                let rhsReference = rhsIsIdentifier ? <Identifier>node.expression : createTempVariable(TempFlags.Auto);
+                // we can't reuse 'arr' because it might be modified within the body of the loop.
+                const counter = createTempVariable(TempFlags._i);
+                const rhsReference = createSynthesizedNode(SyntaxKind.Identifier) as Identifier;
+                rhsReference.text = node.expression.kind === SyntaxKind.Identifier ?
+                    makeUniqueName((<Identifier>node.expression).text) :
+                    makeTempVariableName(TempFlags.Auto);
 
                 // This is the let keyword for the counter and rhsReference. The let keyword for
                 // the LHS will be emitted inside the body.
@@ -3177,15 +3703,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write(" = 0");
                 emitEnd(node.expression);
 
-                if (!rhsIsIdentifier) {
-                    // , _a = expr
-                    write(", ");
-                    emitStart(node.expression);
-                    emitNodeWithoutSourceMap(rhsReference);
-                    write(" = ");
-                    emitNodeWithoutSourceMap(node.expression);
-                    emitEnd(node.expression);
-                }
+                // , _a = expr
+                write(", ");
+                emitStart(node.expression);
+                emitNodeWithoutSourceMap(rhsReference);
+                write(" = ");
+                emitNodeWithoutSourceMap(node.expression);
+                emitEnd(node.expression);
 
                 write("; ");
 
@@ -3214,13 +3738,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 // Initialize LHS
                 // let v = _a[_i];
-                let rhsIterationValue = createElementAccessExpression(rhsReference, counter);
+                const rhsIterationValue = createElementAccessExpression(rhsReference, counter);
                 emitStart(node.initializer);
                 if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
                     write("var ");
-                    let variableDeclarationList = <VariableDeclarationList>node.initializer;
+                    const variableDeclarationList = <VariableDeclarationList>node.initializer;
                     if (variableDeclarationList.declarations.length > 0) {
-                        let declaration = variableDeclarationList.declarations[0];
+                        const declaration = variableDeclarationList.declarations[0];
                         if (isBindingPattern(declaration.name)) {
                             // This works whether the declaration is a var, let, or const.
                             // It will use rhsIterationValue _a[_i] as the initializer.
@@ -3245,7 +3769,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 else {
                     // Initializer is an expression. Emit the expression in the body, so that it's
                     // evaluated on every iteration.
-                    let assignmentExpression = createBinaryExpression(<Expression>node.initializer, SyntaxKind.EqualsToken, rhsIterationValue, /*startsOnNewLine*/ false);
+                    const assignmentExpression = createBinaryExpression(<Expression>node.initializer, SyntaxKind.EqualsToken, rhsIterationValue, /*startsOnNewLine*/ false);
                     if (node.initializer.kind === SyntaxKind.ArrayLiteralExpression || node.initializer.kind === SyntaxKind.ObjectLiteralExpression) {
                         // This is a destructuring pattern, so call emitDestructuring instead of emit. Calling emit will not work, because it will cause
                         // the BinaryExpression to be passed in instead of the expression statement, which will cause emitDestructuring to crash.
@@ -3258,12 +3782,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitEnd(node.initializer);
                 write(";");
 
-                if (node.statement.kind === SyntaxKind.Block) {
-                    emitLines((<Block>node.statement).statements);
+                if (loop) {
+                    writeLine();
+                    emitConvertedLoopCall(loop, /*emitAsBlock*/ false);
                 }
                 else {
-                    writeLine();
-                    emit(node.statement);
+                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ false);
                 }
 
                 writeLine();
@@ -3272,12 +3796,63 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitBreakOrContinueStatement(node: BreakOrContinueStatement) {
+                if (convertedLoopState) {
+                    // check if we can emit break\continue as is
+                    // it is possible if either
+                    //   - break\continue is statement labeled and label is located inside the converted loop
+                    //   - break\continue is non-labeled and located in non-converted loop\switch statement
+                    const jump = node.kind === SyntaxKind.BreakStatement ? Jump.Break : Jump.Continue;
+                    const canUseBreakOrContinue =
+                        (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
+                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+
+                    if (!canUseBreakOrContinue) {
+                        if (!node.label) {
+                            if (node.kind === SyntaxKind.BreakStatement) {
+                                convertedLoopState.nonLocalJumps |= Jump.Break;
+                                write(`return "break";`);
+                            }
+                            else {
+                                convertedLoopState.nonLocalJumps |= Jump.Continue;
+                                write(`return "continue";`);
+                            }
+                        }
+                        else {
+                            let labelMarker: string;
+                            if (node.kind === SyntaxKind.BreakStatement) {
+                                labelMarker = `break-${node.label.text}`;
+                                setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
+                            }
+                            else {
+                                labelMarker = `continue-${node.label.text}`;
+                                setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
+                            }
+                            write(`return "${labelMarker}";`);
+                        }
+
+                        return;
+                    }
+                }
+
                 emitToken(node.kind === SyntaxKind.BreakStatement ? SyntaxKind.BreakKeyword : SyntaxKind.ContinueKeyword, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
 
             function emitReturnStatement(node: ReturnStatement) {
+                if (convertedLoopState) {
+                    convertedLoopState.nonLocalJumps |= Jump.Return;
+                    write("return { value: ");
+                    if (node.expression) {
+                        emit(node.expression);
+                    }
+                    else {
+                        write("void 0");
+                    }
+                    write(" };");
+                    return;
+                }
+
                 emitToken(SyntaxKind.ReturnKeyword, node.pos);
                 emitOptional(" ", node.expression);
                 write(";");
@@ -3297,7 +3872,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emit(node.expression);
                 endPos = emitToken(SyntaxKind.CloseParenToken, node.expression.end);
                 write(" ");
+
+                let saveAllowedNonLabeledJumps: Jump;
+                if (convertedLoopState) {
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    // for switch statement allow only non-labeled break
+                    convertedLoopState.allowedNonLabeledJumps |= Jump.Break;
+                }
                 emitCaseBlock(node.caseBlock, endPos);
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
             }
 
             function emitCaseBlock(node: CaseBlock, startPos: number): void {
@@ -3310,18 +3895,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function nodeStartPositionsAreOnSameLine(node1: Node, node2: Node) {
-                return getLineOfLocalPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    getLineOfLocalPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPositionFromLineMap(currentLineMap, skipTrivia(currentText, node1.pos)) ===
+                    getLineOfLocalPositionFromLineMap(currentLineMap, skipTrivia(currentText, node2.pos));
             }
 
             function nodeEndPositionsAreOnSameLine(node1: Node, node2: Node) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, node2.end);
+                return getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
             }
 
             function nodeEndIsOnSameLineAsNodeStart(node1: Node, node2: Node) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
+                    getLineOfLocalPositionFromLineMap(currentLineMap, skipTrivia(currentText, node2.pos));
             }
 
             function emitCaseOrDefaultClause(node: CaseOrDefaultClause) {
@@ -3364,7 +3949,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitCatchClause(node: CatchClause) {
                 writeLine();
-                let endPos = emitToken(SyntaxKind.CatchKeyword, node.pos);
+                const endPos = emitToken(SyntaxKind.CatchKeyword, node.pos);
                 write(" ");
                 emitToken(SyntaxKind.OpenParenToken, endPos);
                 emit(node.variableDeclaration);
@@ -3378,10 +3963,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write(";");
             }
 
-            function emitLabelledStatement(node: LabeledStatement) {
+            function emitLabelAndColon(node: LabeledStatement): void {
                 emit(node.label);
                 write(": ");
+            }
+
+            function emitLabeledStatement(node: LabeledStatement) {
+                if (!isIterationStatement(node.statement, /* lookInLabeledStatements */ false) || !shouldConvertLoopBody(<IterationStatement>node.statement)) {
+                    emitLabelAndColon(node);
+                }
+
+                if (convertedLoopState) {
+                    if (!convertedLoopState.labels) {
+                        convertedLoopState.labels = {};
+                    }
+                    convertedLoopState.labels[node.label.text] = node.label.text;
+                }
+
                 emit(node.statement);
+
+                if (convertedLoopState) {
+                    convertedLoopState.labels[node.label.text] = undefined;
+                }
             }
 
             function getContainingModule(node: Node): ModuleDeclaration {
@@ -3392,14 +3995,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitContainingModuleName(node: Node) {
-                let container = getContainingModule(node);
+                const container = getContainingModule(node);
                 write(container ? getGeneratedNameForNode(container) : "exports");
             }
 
             function emitModuleMemberName(node: Declaration) {
                 emitStart(node.name);
                 if (getCombinedNodeFlags(node) & NodeFlags.Export) {
-                    let container = getContainingModule(node);
+                    const container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
                         write(".");
@@ -3413,9 +4016,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function createVoidZero(): Expression {
-                let zero = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
+                const zero = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
                 zero.text = "0";
-                let result = <VoidExpression>createSynthesizedNode(SyntaxKind.VoidExpression);
+                const result = <VoidExpression>createSynthesizedNode(SyntaxKind.VoidExpression);
                 result.expression = zero;
                 return result;
             }
@@ -3425,7 +4028,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     Debug.assert(!!(node.flags & NodeFlags.Default) || node.kind === SyntaxKind.ExportAssignment);
                     // only allow export default at a source file level
                     if (modulekind === ModuleKind.CommonJS || modulekind === ModuleKind.AMD || modulekind === ModuleKind.UMD) {
-                        if (!currentSourceFile.symbol.exports["___esModule"]) {
+                        if (!isEs6Module) {
                             if (languageVersion === ScriptTarget.ES5) {
                                 // default value of configurable, enumerable, writable are `false`.
                                 write("Object.defineProperty(exports, \"__esModule\", { value: true });");
@@ -3487,7 +4090,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 if (!exportEquals && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) {
-                    for (let specifier of exportSpecifiers[name.text]) {
+                    for (const specifier of exportSpecifiers[name.text]) {
                         writeLine();
                         emitStart(specifier.name);
                         emitContainingModuleName(specifier);
@@ -3530,7 +4133,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write(", ");
                 }
 
-                let exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(name);
+                const exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(name);
 
                 if (exportChanged) {
                     write(`${exportFunctionForFile}("`);
@@ -3563,7 +4166,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
              * @param shouldEmitCommaBeforeAssignment a boolean indicating whether an assignment should prefix with comma
              */
             function emitTempVariableAssignment(expression: Expression, canDefineTempVariablesInPlace: boolean, shouldEmitCommaBeforeAssignment: boolean): Identifier {
-                let identifier = createTempVariable(TempFlags.Auto);
+                const identifier = createTempVariable(TempFlags.Auto);
                 if (!canDefineTempVariablesInPlace) {
                     recordTempDeclaration(identifier);
                 }
@@ -3580,8 +4183,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // because actual variable declarations are hoisted
                 let canDefineTempVariablesInPlace = false;
                 if (root.kind === SyntaxKind.VariableDeclaration) {
-                    let isExported = getCombinedNodeFlags(root) & NodeFlags.Export;
-                    let isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
+                    const isExported = getCombinedNodeFlags(root) & NodeFlags.Export;
+                    const isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
                 else if (root.kind === SyntaxKind.Parameter) {
@@ -3611,7 +4214,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         return expr;
                     }
 
-                    let identifier = emitTempVariableAssignment(expr, canDefineTempVariablesInPlace, emitCount > 0);
+                    const identifier = emitTempVariableAssignment(expr, canDefineTempVariablesInPlace, emitCount > 0);
                     emitCount++;
                     return identifier;
                 }
@@ -3621,7 +4224,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     // we need to generate a temporary variable
                     value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true);
                     // Return the expression 'value === void 0 ? defaultValue : value'
-                    let equals = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression);
+                    const equals = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression);
                     equals.left = value;
                     equals.operatorToken = createSynthesizedNode(SyntaxKind.EqualsEqualsEqualsToken);
                     equals.right = createVoidZero();
@@ -3629,7 +4232,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function createConditionalExpression(condition: Expression, whenTrue: Expression, whenFalse: Expression) {
-                    let cond = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
+                    const cond = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
                     cond.condition = condition;
                     cond.questionToken = createSynthesizedNode(SyntaxKind.QuestionToken);
                     cond.whenTrue = whenTrue;
@@ -3639,25 +4242,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function createNumericLiteral(value: number) {
-                    let node = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
+                    const node = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
                     node.text = "" + value;
                     return node;
                 }
 
-                function createPropertyAccessForDestructuringProperty(object: Expression, propName: Identifier | LiteralExpression): Expression {
-                    // We create a synthetic copy of the identifier in order to avoid the rewriting that might
-                    // otherwise occur when the identifier is emitted.
-                    let syntheticName = <Identifier | LiteralExpression>createSynthesizedNode(propName.kind);
-                    syntheticName.text = propName.text;
-                    if (syntheticName.kind !== SyntaxKind.Identifier) {
-                        return createElementAccessExpression(object, syntheticName);
+                function createPropertyAccessForDestructuringProperty(object: Expression, propName: PropertyName): Expression {
+                    let index: Expression;
+                    const nameIsComputed = propName.kind === SyntaxKind.ComputedPropertyName;
+                    if (nameIsComputed) {
+                        index = ensureIdentifier((<ComputedPropertyName>propName).expression, /*reuseIdentifierExpressions*/ false);
                     }
-                    return createPropertyAccessExpression(object, syntheticName);
+                    else {
+                        // We create a synthetic copy of the identifier in order to avoid the rewriting that might
+                        // otherwise occur when the identifier is emitted.
+                        index = <Identifier | LiteralExpression>createSynthesizedNode(propName.kind);
+                        (<Identifier | LiteralExpression>index).text = (<Identifier | LiteralExpression>propName).text;
+                    }
+
+                    return !nameIsComputed && index.kind === SyntaxKind.Identifier
+                        ? createPropertyAccessExpression(object, <Identifier>index)
+                        : createElementAccessExpression(object, index);
                 }
 
                 function createSliceCall(value: Expression, sliceIndex: number): CallExpression {
-                    let call = <CallExpression>createSynthesizedNode(SyntaxKind.CallExpression);
-                    let sliceIdentifier = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+                    const call = <CallExpression>createSynthesizedNode(SyntaxKind.CallExpression);
+                    const sliceIdentifier = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
                     sliceIdentifier.text = "slice";
                     call.expression = createPropertyAccessExpression(value, sliceIdentifier);
                     call.arguments = <NodeArray<LiteralExpression>>createSynthesizedNodeArray();
@@ -3666,30 +4276,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function emitObjectLiteralAssignment(target: ObjectLiteralExpression, value: Expression) {
-                    let properties = target.properties;
+                    const properties = target.properties;
                     if (properties.length !== 1) {
                         // For anything but a single element destructuring we need to generate a temporary
                         // to ensure value is evaluated exactly once.
                         value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true);
                     }
-                    for (let p of properties) {
+                    for (const p of properties) {
                         if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                            let propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
-                            let target = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
+                            const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
+                            const target = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
                             emitDestructuringAssignment(target, createPropertyAccessForDestructuringProperty(value, propName));
                         }
                     }
                 }
 
                 function emitArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression) {
-                    let elements = target.elements;
+                    const elements = target.elements;
                     if (elements.length !== 1) {
                         // For anything but a single element destructuring we need to generate a temporary
                         // to ensure value is evaluated exactly once.
                         value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true);
                     }
                     for (let i = 0; i < elements.length; i++) {
-                        let e = elements[i];
+                        const e = elements[i];
                         if (e.kind !== SyntaxKind.OmittedExpression) {
                             if (e.kind !== SyntaxKind.SpreadElementExpression) {
                                 emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)));
@@ -3725,7 +4335,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 function emitAssignmentExpression(root: BinaryExpression) {
-                    let target = root.left;
+                    const target = root.left;
                     let value = root.right;
 
                     if (isEmptyObjectLiteralOrArrayLiteral(target)) {
@@ -3771,10 +4381,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         }
 
                         for (let i = 0; i < numElements; i++) {
-                            let element = elements[i];
+                            const element = elements[i];
                             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                                 // Rewrite element to a declaration with an initializer that fetches property
-                                let propName = element.propertyName || <Identifier>element.name;
+                                const propName = element.propertyName || <Identifier>element.name;
                                 emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
                             }
                             else if (element.kind !== SyntaxKind.OmittedExpression) {
@@ -3815,19 +4425,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         // for (...) { var <some-uniqie-name> = void 0; }
                         // this is necessary to preserve ES6 semantic in scenarios like
                         // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations
-                        let isUninitializedLet =
+                        const isLetDefinedInLoop =
                             (resolver.getNodeCheckFlags(node) & NodeCheckFlags.BlockScopedBindingInLoop) &&
                             (getCombinedFlagsForIdentifier(<Identifier>node.name) & NodeFlags.Let);
 
                         // NOTE: default initialization should not be added to let bindings in for-in\for-of statements
-                        if (isUninitializedLet &&
+                        if (isLetDefinedInLoop &&
                             node.parent.parent.kind !== SyntaxKind.ForInStatement &&
                             node.parent.parent.kind !== SyntaxKind.ForOfStatement) {
                             initializer = createVoidZero();
                         }
                     }
 
-                    let exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.name);
+                    const exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.name);
 
                     if (exportChanged) {
                         write(`${exportFunctionForFile}("`);
@@ -3848,7 +4458,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 if (node.kind === SyntaxKind.OmittedExpression) {
                     return;
                 }
-                let name = node.name;
+                const name = node.name;
                 if (name.kind === SyntaxKind.Identifier) {
                     emitExportMemberAssignments(<Identifier>name);
                 }
@@ -3890,7 +4500,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write(";");
                 }
                 else {
-                    let atLeastOneItem = emitVariableDeclarationListSkippingUninitializedEntries(node.declarationList);
+                    const atLeastOneItem = emitVariableDeclarationListSkippingUninitializedEntries(node.declarationList);
                     if (atLeastOneItem) {
                         write(";");
                     }
@@ -3914,7 +4524,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 // Otherwise, only emit if we have at least one initializer present.
-                for (let declaration of node.declarationList.declarations) {
+                for (const declaration of node.declarationList.declarations) {
                     if (declaration.initializer) {
                         return true;
                     }
@@ -3925,7 +4535,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             function emitParameter(node: ParameterDeclaration) {
                 if (languageVersion < ScriptTarget.ES6) {
                     if (isBindingPattern(node.name)) {
-                        let name = createTempVariable(TempFlags.Auto);
+                        const name = createTempVariable(TempFlags.Auto);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
@@ -3955,12 +4565,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             return;
                         }
 
-                        let { name: paramName, initializer } = parameter;
+                        const { name: paramName, initializer } = parameter;
                         if (isBindingPattern(paramName)) {
                             // In cases where a binding pattern is simply '[]' or '{}',
                             // we usually don't want to emit a var declaration; however, in the presence
                             // of an initializer, we must emit that expression to preserve side effects.
-                            let hasBindingElements = paramName.elements.length > 0;
+                            const hasBindingElements = paramName.elements.length > 0;
                             if (hasBindingElements || initializer) {
                                 writeLine();
                                 write("var ");
@@ -3999,15 +4609,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitRestParameter(node: FunctionLikeDeclaration) {
                 if (languageVersion < ScriptTarget.ES6 && hasRestParameter(node)) {
-                    let restIndex = node.parameters.length - 1;
-                    let restParam = node.parameters[restIndex];
+                    const restIndex = node.parameters.length - 1;
+                    const restParam = node.parameters[restIndex];
 
                     // A rest parameter cannot have a binding pattern, so let's just ignore it if it does.
                     if (isBindingPattern(restParam.name)) {
                         return;
                     }
 
-                    let tempName = createTempVariable(TempFlags._i).text;
+                    const tempName = createTempVariable(TempFlags._i).text;
                     writeLine();
                     emitLeadingComments(restParam);
                     emitStart(restParam);
@@ -4144,8 +4754,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 increaseIndent();
                 write("(");
                 if (node) {
-                    let parameters = node.parameters;
-                    let omitCount = languageVersion < ScriptTarget.ES6 && hasRestParameter(node) ? 1 : 0;
+                    const parameters = node.parameters;
+                    const omitCount = languageVersion < ScriptTarget.ES6 && hasRestParameter(node) ? 1 : 0;
                     emitList(parameters, 0, parameters.length - omitCount, /*multiLine*/ false, /*trailingComma*/ false);
                 }
                 write(")");
@@ -4163,10 +4773,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitAsyncFunctionBodyForES6(node: FunctionLikeDeclaration) {
-                let promiseConstructor = getEntityNameFromTypeNode(node.type);
-                let isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
-                let hasLexicalArguments = (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureArguments) !== 0;
-                let args: string;
+                const promiseConstructor = getEntityNameFromTypeNode(node.type);
+                const isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
+                const hasLexicalArguments = (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureArguments) !== 0;
 
                 // An async function is emit as an outer function that calls an inner
                 // generator function. To preserve lexical bindings, we pass the current
@@ -4303,9 +4912,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitSignatureAndBody(node: FunctionLikeDeclaration) {
-                let saveTempFlags = tempFlags;
-                let saveTempVariables = tempVariables;
-                let saveTempParameters = tempParameters;
+                const saveConvertedLoopState = convertedLoopState;
+                const saveTempFlags = tempFlags;
+                const saveTempVariables = tempVariables;
+                const saveTempParameters = tempParameters;
+
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -4319,7 +4931,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emitSignatureParameters(node);
                 }
 
-                let isAsync = isAsyncFunctionLike(node);
+                const isAsync = isAsyncFunctionLike(node);
                 if (isAsync && languageVersion === ScriptTarget.ES6) {
                     emitAsyncFunctionBodyForES6(node);
                 }
@@ -4331,6 +4943,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emitExportMemberAssignment(node);
                 }
 
+                Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
+
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -4369,10 +4984,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 scopeEmitStart(node);
 
                 increaseIndent();
-                let outPos = writer.getTextPos();
-                emitDetachedComments(node.body);
+                const outPos = writer.getTextPos();
+                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
                 emitFunctionBodyPreamble(node);
-                let preambleEmitted = writer.getTextPos() !== outPos;
+                const preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
 
                 // If we didn't have to emit any preamble code, then attempt to keep the arrow
@@ -4391,8 +5006,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     increaseIndent();
                     writeLine();
                     emitLeadingComments(node.body);
+                    emitStart(body);
                     write("return ");
                     emit(body);
+                    emitEnd(body);
                     write(";");
                     emitTrailingComments(node.body);
 
@@ -4412,21 +5029,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write(" {");
                 scopeEmitStart(node);
 
-                let initialTextPos = writer.getTextPos();
+                const initialTextPos = writer.getTextPos();
 
                 increaseIndent();
-                emitDetachedComments(body.statements);
+                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
 
                 // Emit all the directive prologues (like "use strict").  These have to come before
                 // any other preamble code we write (like parameter initializers).
-                let startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
+                const startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
 
-                let preambleEmitted = writer.getTextPos() !== initialTextPos;
+                const preambleEmitted = writer.getTextPos() !== initialTextPos;
 
                 if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
-                    for (let statement of body.statements) {
+                    for (const statement of body.statements) {
                         write(" ");
                         emit(statement);
                     }
@@ -4450,11 +5067,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement {
                 if (ctor.body) {
-                    let statement = (<Block>ctor.body).statements[0];
+                    const statement = (<Block>ctor.body).statements[0];
                     if (statement && statement.kind === SyntaxKind.ExpressionStatement) {
-                        let expr = (<ExpressionStatement>statement).expression;
+                        const expr = (<ExpressionStatement>statement).expression;
                         if (expr && expr.kind === SyntaxKind.CallExpression) {
-                            let func = (<CallExpression>expr).expression;
+                            const func = (<CallExpression>expr).expression;
                             if (func && func.kind === SyntaxKind.SuperKeyword) {
                                 return <ExpressionStatement>statement;
                             }
@@ -4499,8 +5116,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function getInitializedProperties(node: ClassLikeDeclaration, isStatic: boolean) {
-                let properties: PropertyDeclaration[] = [];
-                for (let member of node.members) {
+                const properties: PropertyDeclaration[] = [];
+                for (const member of node.members) {
                     if (member.kind === SyntaxKind.PropertyDeclaration && isStatic === ((member.flags & NodeFlags.Static) !== 0) && (<PropertyDeclaration>member).initializer) {
                         properties.push(<PropertyDeclaration>member);
                     }
@@ -4510,7 +5127,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitPropertyDeclarations(node: ClassLikeDeclaration, properties: PropertyDeclaration[]) {
-                for (let property of properties) {
+                for (const property of properties) {
                     emitPropertyDeclaration(node, property);
                 }
             }
@@ -4568,7 +5185,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         emitTrailingComments(member);
                     }
                     else if (member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
-                        let accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
+                        const accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
                         if (member === accessors.firstAccessor) {
                             writeLine();
                             emitStart(member);
@@ -4616,7 +5233,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitMemberFunctionsForES6AndHigher(node: ClassLikeDeclaration) {
-                for (let member of node.members) {
+                for (const member of node.members) {
                     if ((member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) && !(<MethodDeclaration>member).body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
@@ -4652,15 +5269,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitConstructor(node: ClassLikeDeclaration, baseTypeElement: ExpressionWithTypeArguments) {
-                let saveTempFlags = tempFlags;
-                let saveTempVariables = tempVariables;
-                let saveTempParameters = tempParameters;
+                const saveConvertedLoopState = convertedLoopState;
+                const saveTempFlags = tempFlags;
+                const saveTempVariables = tempVariables;
+                const saveTempParameters = tempParameters;
+
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
 
                 emitConstructorWorker(node, baseTypeElement);
 
+                Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
+
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -4683,7 +5306,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
                 });
 
-                let ctor = getFirstConstructorWithBody(node);
+                const ctor = getFirstConstructorWithBody(node);
 
                 // For target ES6 and above, if there is no user-defined constructor and there is no property assignment
                 // do not emit constructor in class declaration.
@@ -4731,7 +5354,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     // Emit all the directive prologues (like "use strict").  These have to come before
                     // any other preamble code we write (like parameter initializers).
                     startIndex = emitDirectivePrologues(ctor.body.statements, /*startWithNewLine*/ true);
-                    emitDetachedComments(ctor.body.statements);
+                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
                 }
                 emitCaptureThisForNodeIfNecessary(node);
                 let superCall: ExpressionStatement;
@@ -4760,7 +5383,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         emitEnd(baseTypeElement);
                     }
                 }
-                emitPropertyDeclarations(node, getInitializedProperties(node, /*static:*/ false));
+                emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ false));
                 if (ctor) {
                     let statements: Node[] = (<Block>ctor.body).statements;
                     if (superCall) {
@@ -4803,7 +5426,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitClassLikeDeclarationForES6AndHigher(node: ClassLikeDeclaration) {
-                let thisNodeIsDecorated = nodeIsDecorated(node);
+                const thisNodeIsDecorated = nodeIsDecorated(node);
                 if (node.kind === SyntaxKind.ClassDeclaration) {
                     if (thisNodeIsDecorated) {
                         // To preserve the correct runtime semantics when decorators are applied to the class,
@@ -4882,8 +5505,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 //
                 // This keeps the expression as an expression, while ensuring that the static parts
                 // of it have been initialized by the time it is used.
-                let staticProperties = getInitializedProperties(node, /*static:*/ true);
-                let isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === SyntaxKind.ClassExpression;
+                const staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+                const isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === SyntaxKind.ClassExpression;
                 let tempVariable: Identifier;
 
                 if (isClassExpressionWithStaticProperties) {
@@ -4904,7 +5527,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emitDeclarationName(node);
                 }
 
-                let baseTypeNode = getClassExtendsHeritageClauseElement(node);
+                const baseTypeNode = getClassExtendsHeritageClauseElement(node);
                 if (baseTypeNode) {
                     write(" extends ");
                     emit(baseTypeNode.expression);
@@ -4944,7 +5567,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     for (var property of staticProperties) {
                         write(",");
                         writeLine();
-                        emitPropertyDeclaration(node, property, /*receiver:*/ tempVariable, /*isExpression:*/ true);
+                        emitPropertyDeclaration(node, property, /*receiver*/ tempVariable, /*isExpression*/ true);
                     }
                     write(",");
                     writeLine();
@@ -4989,15 +5612,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 write("(function (");
-                let baseTypeNode = getClassExtendsHeritageClauseElement(node);
+                const baseTypeNode = getClassExtendsHeritageClauseElement(node);
                 if (baseTypeNode) {
                     write("_super");
                 }
                 write(") {");
-                let saveTempFlags = tempFlags;
-                let saveTempVariables = tempVariables;
-                let saveTempParameters = tempParameters;
-                let saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                const saveTempFlags = tempFlags;
+                const saveTempVariables = tempVariables;
+                const saveTempParameters = tempParameters;
+                const saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                const saveConvertedLoopState = convertedLoopState;
+
+                convertedLoopState = undefined;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -5015,7 +5641,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 writeLine();
                 emitConstructor(node, baseTypeNode);
                 emitMemberFunctionsForES5AndLower(node);
-                emitPropertyDeclarations(node, getInitializedProperties(node, /*static:*/ true));
+                emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true));
                 writeLine();
                 emitDecoratorsOfClass(node);
                 writeLine();
@@ -5025,6 +5651,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 });
                 write(";");
                 emitTempDeclarations(/*newLine*/ true);
+
+                Debug.assert(convertedLoopState === undefined);
+                convertedLoopState = saveConvertedLoopState;
+
                 tempFlags = saveTempFlags;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -5063,9 +5693,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitDecoratorsOfConstructor(node: ClassLikeDeclaration) {
-                let decorators = node.decorators;
-                let constructor = getFirstConstructorWithBody(node);
-                let hasDecoratedParameters = constructor && forEach(constructor.parameters, nodeIsDecorated);
+                const decorators = node.decorators;
+                const constructor = getFirstConstructorWithBody(node);
+                const hasDecoratedParameters = constructor && forEach(constructor.parameters, nodeIsDecorated);
 
                 // skip decoration of the constructor if neither it nor its parameters are decorated
                 if (!decorators && !hasDecoratedParameters) {
@@ -5090,7 +5720,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 increaseIndent();
                 writeLine();
 
-                let decoratorCount = decorators ? decorators.length : 0;
+                const decoratorCount = decorators ? decorators.length : 0;
                 let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, decorator => {
                     emitStart(decorator);
                     emit(decorator.expression);
@@ -5110,7 +5740,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitDecoratorsOfMembers(node: ClassLikeDeclaration, staticFlag: NodeFlags) {
-                for (let member of node.members) {
+                for (const member of node.members) {
                     // only emit members in the correct group
                     if ((member.flags & NodeFlags.Static) !== staticFlag) {
                         continue;
@@ -5130,7 +5760,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     let decorators: NodeArray<Decorator>;
                     let functionLikeMember: FunctionLikeDeclaration;
                     if (isAccessor(member)) {
-                        let accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
+                        const accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
                         if (member !== accessors.firstAccessor) {
                             continue;
                         }
@@ -5190,7 +5820,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     increaseIndent();
                     writeLine();
 
-                    let decoratorCount = decorators ? decorators.length : 0;
+                    const decoratorCount = decorators ? decorators.length : 0;
                     let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, decorator => {
                         emitStart(decorator);
                         emit(decorator.expression);
@@ -5232,9 +5862,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 let argumentsWritten = 0;
                 if (node) {
                     let parameterIndex = 0;
-                    for (let parameter of node.parameters) {
+                    for (const parameter of node.parameters) {
                         if (nodeIsDecorated(parameter)) {
-                            let decorators = parameter.decorators;
+                            const decorators = parameter.decorators;
                             argumentsWritten += emitList(decorators, 0, decorators.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ leadingComma, /*noTrailingNewLine*/ true, decorator => {
                                 emitStart(decorator);
                                 write(`__param(${parameterIndex}, `);
@@ -5399,10 +6029,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 // Clone the type name and parent it to a location outside of the current declaration.
-                let typeName = cloneEntityName(node.typeName);
+                const typeName = cloneEntityName(node.typeName);
                 typeName.parent = location;
 
-                let result = resolver.getTypeReferenceSerializationKind(typeName);
+                const result = resolver.getTypeReferenceSerializationKind(typeName);
                 switch (result) {
                     case TypeReferenceSerializationKind.Unknown:
                         let temp = createAndRecordTempVariable(TempFlags.Auto);
@@ -5564,7 +6194,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function shouldEmitEnumDeclaration(node: EnumDeclaration) {
-                let isConstEnum = isConst(node);
+                const isConstEnum = isConst(node);
                 return !isConstEnum || compilerOptions.preserveConstEnums || compilerOptions.isolatedModules;
             }
 
@@ -5633,7 +6263,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitEnumMember(node: EnumMember) {
-                let enumParent = <EnumDeclaration>node.parent;
+                const enumParent = <EnumDeclaration>node.parent;
                 emitStart(node);
                 write(getGeneratedNameForNode(enumParent));
                 write("[");
@@ -5649,7 +6279,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function writeEnumMemberDeclarationValue(member: EnumMember) {
-                let value = resolver.getConstantValue(member);
+                const value = resolver.getConstantValue(member);
                 if (value !== undefined) {
                     write(value.toString());
                     return;
@@ -5664,7 +6294,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration: ModuleDeclaration): ModuleDeclaration {
                 if (moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
-                    let recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(<ModuleDeclaration>moduleDeclaration.body);
+                    const recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(<ModuleDeclaration>moduleDeclaration.body);
                     return recursiveInnerModule || <ModuleDeclaration>moduleDeclaration.body;
                 }
             }
@@ -5679,13 +6309,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitModuleDeclaration(node: ModuleDeclaration) {
                 // Emit only if this module is non-ambient.
-                let shouldEmit = shouldEmitModuleDeclaration(node);
+                const shouldEmit = shouldEmitModuleDeclaration(node);
 
                 if (!shouldEmit) {
                     return emitCommentsOnNotEmittedNode(node);
                 }
-                let hoistedInDeclarationScope = shouldHoistDeclarationInSystemJsModule(node);
-                let emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
+                const hoistedInDeclarationScope = shouldHoistDeclarationInSystemJsModule(node);
+                const emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
 
                 if (emitVarForModule) {
                     emitStart(node);
@@ -5706,13 +6336,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === SyntaxKind.ModuleBlock) {
-                    let saveTempFlags = tempFlags;
-                    let saveTempVariables = tempVariables;
+                    const saveConvertedLoopState = convertedLoopState;
+                    const saveTempFlags = tempFlags;
+                    const saveTempVariables = tempVariables;
+                    convertedLoopState = undefined;
                     tempFlags = 0;
                     tempVariables = undefined;
 
                     emit(node.body);
 
+                    Debug.assert(convertedLoopState === undefined);
+                    convertedLoopState = saveConvertedLoopState;
+
                     tempFlags = saveTempFlags;
                     tempVariables = saveTempVariables;
                 }
@@ -5725,7 +6360,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emit(node.body);
                     decreaseIndent();
                     writeLine();
-                    let moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
+                    const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
                     emitToken(SyntaxKind.CloseBraceToken, moduleBlock.statements.end);
                     scopeEmitEnd();
                 }
@@ -5758,8 +6393,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
              * Here we check if alternative name was provided for a given moduleName and return it if possible.
              */
             function tryRenameExternalModule(moduleName: LiteralExpression): string {
-                if (currentSourceFile.renamedDependencies && hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                    return `"${currentSourceFile.renamedDependencies[moduleName.text]}"`;
+                if (renamedDependencies && hasProperty(renamedDependencies, moduleName.text)) {
+                    return `"${renamedDependencies[moduleName.text]}"`;
                 }
                 return undefined;
             }
@@ -5767,7 +6402,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             function emitRequire(moduleName: Expression) {
                 if (moduleName.kind === SyntaxKind.StringLiteral) {
                     write("require(");
-                    let text = tryRenameExternalModule(<LiteralExpression>moduleName);
+                    const text = tryRenameExternalModule(<LiteralExpression>moduleName);
                     if (text) {
                         write(text);
                     }
@@ -5787,7 +6422,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 if (node.kind === SyntaxKind.ImportEqualsDeclaration) {
                     return <ImportEqualsDeclaration>node;
                 }
-                let importClause = (<ImportDeclaration>node).importClause;
+                const importClause = (<ImportDeclaration>node).importClause;
                 if (importClause && importClause.namedBindings && importClause.namedBindings.kind === SyntaxKind.NamespaceImport) {
                     return <NamespaceImport>importClause.namedBindings;
                 }
@@ -5811,8 +6446,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 // ES6 import
                 if (node.importClause) {
-                    let shouldEmitDefaultBindings = resolver.isReferencedAliasDeclaration(node.importClause);
-                    let shouldEmitNamedBindings = node.importClause.namedBindings && resolver.isReferencedAliasDeclaration(node.importClause.namedBindings, /* checkChildren */ true);
+                    const shouldEmitDefaultBindings = resolver.isReferencedAliasDeclaration(node.importClause);
+                    const shouldEmitNamedBindings = node.importClause.namedBindings && resolver.isReferencedAliasDeclaration(node.importClause.namedBindings, /* checkChildren */ true);
                     if (shouldEmitDefaultBindings || shouldEmitNamedBindings) {
                         write("import ");
                         emitStart(node.importClause);
@@ -5853,8 +6488,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitExternalImportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration) {
                 if (contains(externalImports, node)) {
-                    let isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && (node.flags & NodeFlags.Export) !== 0;
-                    let namespaceDeclaration = getNamespaceDeclarationNode(node);
+                    const isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && (node.flags & NodeFlags.Export) !== 0;
+                    const namespaceDeclaration = getNamespaceDeclarationNode(node);
 
                     if (modulekind !== ModuleKind.AMD) {
                         emitLeadingComments(node);
@@ -5872,7 +6507,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            let isNakedImport = SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
+                            const isNakedImport = SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
                             if (!isNakedImport) {
                                 write("var ");
                                 write(getGeneratedNameForNode(<ImportDeclaration>node));
@@ -5921,17 +6556,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // - current file is not external module
                 // - import declaration is top level and target is value imported by entity name
                 if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
 
                     // variable declaration for import-equals declaration can be hoisted in system modules
                     // in this case 'var' should be omitted and emit should contain only initialization
-                    let variableDeclarationIsHoisted = shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ true);
+                    const variableDeclarationIsHoisted = shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ true);
 
                     // is it top level export import v = a.b.c in system module?
                     // if yes - it needs to be rewritten as exporter('v', v = a.b.c)
-                    let isExported = isSourceFileLevelDeclarationInSystemJsModule(node, /*isExported*/ true);
+                    const isExported = isSourceFileLevelDeclarationInSystemJsModule(node, /*isExported*/ true);
 
                     if (!variableDeclarationIsHoisted) {
                         Debug.assert(!isExported);
@@ -5973,7 +6608,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 if (modulekind !== ModuleKind.ES6) {
                     if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
                         emitStart(node);
-                        let generatedName = getGeneratedNameForNode(node);
+                        const generatedName = getGeneratedNameForNode(node);
                         if (node.exportClause) {
                             // export { x, y, ... } from "foo"
                             if (modulekind !== ModuleKind.AMD) {
@@ -5983,7 +6618,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                                 emitRequire(getExternalModuleName(node));
                                 write(";");
                             }
-                            for (let specifier of node.exportClause.elements) {
+                            for (const specifier of node.exportClause.elements) {
                                 if (resolver.isValueAliasDeclaration(specifier)) {
                                     writeLine();
                                     emitStart(specifier);
@@ -6039,7 +6674,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 Debug.assert(modulekind === ModuleKind.ES6);
 
                 let needsComma = false;
-                for (let specifier of specifiers) {
+                for (const specifier of specifiers) {
                     if (shouldEmit(specifier)) {
                         if (needsComma) {
                             write(", ");
@@ -6060,7 +6695,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         writeLine();
                         emitStart(node);
                         write("export default ");
-                        let expression = node.expression;
+                        const expression = node.expression;
                         emit(expression);
                         if (expression.kind !== SyntaxKind.FunctionDeclaration &&
                             expression.kind !== SyntaxKind.ClassDeclaration) {
@@ -6098,7 +6733,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 exportSpecifiers = {};
                 exportEquals = undefined;
                 hasExportStars = false;
-                for (let node of sourceFile.statements) {
+                for (const node of sourceFile.statements) {
                     switch (node.kind) {
                         case SyntaxKind.ImportDeclaration:
                             if (!(<ImportDeclaration>node).importClause ||
@@ -6130,8 +6765,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             }
                             else {
                                 // export { x, y }
-                                for (let specifier of (<ExportDeclaration>node).exportClause.elements) {
-                                    let name = (specifier.propertyName || specifier.name).text;
+                                for (const specifier of (<ExportDeclaration>node).exportClause.elements) {
+                                    const name = (specifier.propertyName || specifier.name).text;
                                     (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
                                 }
                             }
@@ -6160,9 +6795,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function getLocalNameForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): string {
-                let namespaceDeclaration = getNamespaceDeclarationNode(node);
+                const namespaceDeclaration = getNamespaceDeclarationNode(node);
                 if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
+                    return getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
                 if (node.kind === SyntaxKind.ImportDeclaration && (<ImportDeclaration>node).importClause) {
                     return getGeneratedNameForNode(node);
@@ -6173,7 +6808,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function getExternalModuleNameText(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): string {
-                let moduleName = getExternalModuleName(importNode);
+                const moduleName = getExternalModuleName(importNode);
                 if (moduleName.kind === SyntaxKind.StringLiteral) {
                     return tryRenameExternalModule(<LiteralExpression>moduleName) || getLiteralText(<LiteralExpression>moduleName);
                 }
@@ -6188,9 +6823,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 writeLine();
                 let started = false;
-                for (let importNode of externalImports) {
+                for (const importNode of externalImports) {
                     // do not create variable declaration for exports and imports that lack import clause
-                    let skipNode =
+                    const skipNode =
                         importNode.kind === SyntaxKind.ExportDeclaration ||
                         (importNode.kind === SyntaxKind.ImportDeclaration && !(<ImportDeclaration>importNode).importClause);
 
@@ -6229,7 +6864,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     // no exported declarations (export var ...) or export specifiers (export {x})
                     // check if we have any non star export declarations.
                     let hasExportDeclarationWithExportClause = false;
-                    for (let externalImport of externalImports) {
+                    for (const externalImport of externalImports) {
                         if (externalImport.kind === SyntaxKind.ExportDeclaration && (<ExportDeclaration>externalImport).exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
@@ -6257,26 +6892,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 if (exportSpecifiers) {
-                    for (let n in exportSpecifiers) {
-                        for (let specifier of exportSpecifiers[n]) {
+                    for (const n in exportSpecifiers) {
+                        for (const specifier of exportSpecifiers[n]) {
                             // write name of export specified, i.e. 'export {x}'
                             writeExportedName(specifier.name);
                         }
                     }
                 }
 
-                for (let externalImport of externalImports) {
+                for (const externalImport of externalImports) {
                     if (externalImport.kind !== SyntaxKind.ExportDeclaration) {
                         continue;
                     }
 
-                    let exportDecl = <ExportDeclaration>externalImport;
+                    const exportDecl = <ExportDeclaration>externalImport;
                     if (!exportDecl.exportClause) {
                         // export * from ...
                         continue;
                     }
 
-                    for (let element of exportDecl.exportClause.elements) {
+                    for (const element of exportDecl.exportClause.elements) {
                         // write name of indirectly exported entry, i.e. 'export {x} from ...'
                         writeExportedName(element.name || element.propertyName);
                     }
@@ -6365,16 +7000,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 if (hoistedVars) {
                     writeLine();
                     write("var ");
-                    let seen: Map<string> = {};
+                    const seen: Map<string> = {};
                     for (let i = 0; i < hoistedVars.length; ++i) {
-                        let local = hoistedVars[i];
-                        let name = local.kind === SyntaxKind.Identifier
+                        const local = hoistedVars[i];
+                        const name = local.kind === SyntaxKind.Identifier
                             ? <Identifier>local
                             : <Identifier>(<ClassDeclaration | ModuleDeclaration | EnumDeclaration>local).name;
 
                         if (name) {
                             // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            let text = unescapeIdentifier(name.text);
+                            const text = unescapeIdentifier(name.text);
                             if (hasProperty(seen, text)) {
                                 continue;
                             }
@@ -6394,7 +7029,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             emit(local);
                         }
 
-                        let flags = getCombinedNodeFlags(local.kind === SyntaxKind.Identifier ? local.parent : local);
+                        const flags = getCombinedNodeFlags(local.kind === SyntaxKind.Identifier ? local.parent : local);
                         if (flags & NodeFlags.Export) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
@@ -6406,7 +7041,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 if (hoistedFunctionDeclarations) {
-                    for (let f of hoistedFunctionDeclarations) {
+                    for (const f of hoistedFunctionDeclarations) {
                         writeLine();
                         emit(f);
 
@@ -6469,7 +7104,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                     if (node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement) {
                         if (shouldHoistVariable(<VariableDeclaration | BindingElement>node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            let name = (<VariableDeclaration | BindingElement>node).name;
+                            const name = (<VariableDeclaration | BindingElement>node).name;
                             if (name.kind === SyntaxKind.Identifier) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
@@ -6518,7 +7153,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function isCurrentFileSystemExternalModule() {
-                return modulekind === ModuleKind.System && isExternalModule(currentSourceFile);
+                return modulekind === ModuleKind.System && isCurrentFileExternalModule;
             }
 
             function emitSystemModuleBody(node: SourceFile, dependencyGroups: DependencyGroup[], startIndex: number): void {
@@ -6560,8 +7195,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // }
                 emitVariableDeclarationsForImports();
                 writeLine();
-                let exportedDeclarations = processTopLevelVariableAndFunctionDeclarations(node);
-                let exportStarFunction = emitLocalStorageForExportedNamesIfNecessary(exportedDeclarations);
+                const exportedDeclarations = processTopLevelVariableAndFunctionDeclarations(node);
+                const exportStarFunction = emitLocalStorageForExportedNamesIfNecessary(exportedDeclarations);
                 writeLine();
                 write("return {");
                 increaseIndent();
@@ -6586,15 +7221,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     writeLine();
                     increaseIndent();
 
-                    let group = dependencyGroups[i];
+                    const group = dependencyGroups[i];
 
                     // derive a unique name for parameter from the first named entry in the group
-                    let parameterName = makeUniqueName(forEach(group, getLocalNameForExternalImport) || "");
+                    const parameterName = makeUniqueName(forEach(group, getLocalNameForExternalImport) || "");
                     write(`function (${parameterName}) {`);
                     increaseIndent();
 
-                    for (let entry of group) {
-                        let importVariableName = getLocalNameForExternalImport(entry) || "";
+                    for (const entry of group) {
+                        const importVariableName = getLocalNameForExternalImport(entry) || "";
 
                         switch (entry.kind) {
                             case SyntaxKind.ImportDeclaration:
@@ -6632,7 +7267,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                                             writeLine();
                                         }
 
-                                        let e = (<ExportDeclaration>entry).exportClause.elements[i];
+                                        const e = (<ExportDeclaration>entry).exportClause.elements[i];
                                         write(`"`);
                                         emitNodeWithCommentsAndWithoutSourcemap(e.name);
                                         write(`": ${parameterName}["`);
@@ -6670,7 +7305,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 increaseIndent();
                 writeLine();
                 for (let i = startIndex; i < node.statements.length; ++i) {
-                    let statement = node.statements[i];
+                    const statement = node.statements[i];
                     switch (statement.kind) {
                         // - function declarations are not emitted because they were already hoisted
                         // - import declarations are not emitted since they are already handled in setters
@@ -6681,7 +7316,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             continue;
                         case SyntaxKind.ExportDeclaration:
                             if (!(<ExportDeclaration>statement).moduleSpecifier) {
-                                for (let element of (<ExportDeclaration>statement).exportClause.elements) {
+                                for (const element of (<ExportDeclaration>statement).exportClause.elements) {
                                     // write call to exporter function for every export specifier in exports list
                                     emitExportSpecifierInSystemModule(element);
                                 }
@@ -6703,7 +7338,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write("}"); // execute
             }
 
-            function emitSystemModule(node: SourceFile): void {
+            function writeModuleName(node: SourceFile, emitRelativePathAsModuleName?: boolean): void {
+                let moduleName = node.moduleName;
+                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
+                    write(`"${moduleName}", `);
+                }
+            }
+
+            function emitSystemModule(node: SourceFile,  emitRelativePathAsModuleName?: boolean): void {
                 collectExternalModuleInfo(node);
                 // System modules has the following shape
                 // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
@@ -6718,19 +7360,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 exportFunctionForFile = makeUniqueName("exports");
                 writeLine();
                 write("System.register(");
-                if (node.moduleName) {
-                    write(`"${node.moduleName}", `);
-                }
+                writeModuleName(node, emitRelativePathAsModuleName);
                 write("[");
 
-                let groupIndices: Map<number> = {};
-                let dependencyGroups: DependencyGroup[] = [];
+                const groupIndices: Map<number> = {};
+                const dependencyGroups: DependencyGroup[] = [];
 
                 for (let i = 0; i < externalImports.length; ++i) {
                     let text = getExternalModuleNameText(externalImports[i]);
                     if (hasProperty(groupIndices, text)) {
                         // deduplicate/group entries in dependency list by the dependency name
-                        let groupIndex = groupIndices[text];
+                        const groupIndex = groupIndices[text];
                         dependencyGroups[groupIndex].push(externalImports[i]);
                         continue;
                     }
@@ -6743,12 +7383,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         write(", ");
                     }
 
+                    if (emitRelativePathAsModuleName) {
+                        const name = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]);
+                        if (name) {
+                            text = `"${name}"`;
+                        }
+                    }
                     write(text);
                 }
                 write(`], function(${exportFunctionForFile}) {`);
                 writeLine();
                 increaseIndent();
-                let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
                 emitEmitHelpers(node);
                 emitCaptureThisForNodeIfNecessary(node);
                 emitSystemModuleBody(node, dependencyGroups, startIndex);
@@ -6763,17 +7409,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 importAliasNames: string[];
             }
 
-            function getAMDDependencyNames(node: SourceFile, includeNonAmdDependencies: boolean): AMDDependencyNames {
+            function getAMDDependencyNames(node: SourceFile, includeNonAmdDependencies: boolean, emitRelativePathAsModuleName?: boolean): AMDDependencyNames {
                 // names of modules with corresponding parameter in the factory function
-                let aliasedModuleNames: string[] = [];
+                const aliasedModuleNames: string[] = [];
                 // names of modules with no corresponding parameters in factory function
-                let unaliasedModuleNames: string[] = [];
-                let importAliasNames: string[] = [];     // names of the parameters in the factory function; these
+                const unaliasedModuleNames: string[] = [];
+                const importAliasNames: string[] = [];     // names of the parameters in the factory function; these
                 // parameters need to match the indexes of the corresponding
                 // module names in aliasedModuleNames.
 
                 // Fill in amd-dependency tags
-                for (let amdDependency of node.amdDependencies) {
+                for (const amdDependency of node.amdDependencies) {
                     if (amdDependency.name) {
                         aliasedModuleNames.push("\"" + amdDependency.path + "\"");
                         importAliasNames.push(amdDependency.name);
@@ -6783,12 +7429,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
                 }
 
-                for (let importNode of externalImports) {
+                for (const importNode of externalImports) {
                     // Find the name of the external module
                     let externalModuleName = getExternalModuleNameText(importNode);
 
+                    if (emitRelativePathAsModuleName) {
+                        const name = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                        if (name) {
+                            externalModuleName = `"${name}"`;
+                        }
+                    }
+
                     // Find the name of the module alias, if there is one
-                    let importAliasName = getLocalNameForExternalImport(importNode);
+                    const importAliasName = getLocalNameForExternalImport(importNode);
                     if (includeNonAmdDependencies && importAliasName) {
                         aliasedModuleNames.push(externalModuleName);
                         importAliasNames.push(importAliasName);
@@ -6801,7 +7454,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 return { aliasedModuleNames, unaliasedModuleNames, importAliasNames };
             }
 
-            function emitAMDDependencies(node: SourceFile, includeNonAmdDependencies: boolean) {
+            function emitAMDDependencies(node: SourceFile, includeNonAmdDependencies: boolean, emitRelativePathAsModuleName?: boolean) {
                 // An AMD define function has the following shape:
                 //     define(id?, dependencies?, factory);
                 //
@@ -6814,7 +7467,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // `import "module"` or `<amd-dependency path= "a.css" />`
                 // we need to add modules without alias names to the end of the dependencies list
 
-                let dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies);
+                const dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
                 emitAMDDependencyList(dependencyNames);
                 write(", ");
                 emitAMDFactoryHeader(dependencyNames);
@@ -6842,18 +7495,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write(") {");
             }
 
-            function emitAMDModule(node: SourceFile) {
+            function emitAMDModule(node: SourceFile, emitRelativePathAsModuleName?: boolean) {
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
 
                 writeLine();
                 write("define(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
-                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true);
+                writeModuleName(node, emitRelativePathAsModuleName);
+                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
-                let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
@@ -6865,7 +7516,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitCommonJSModule(node: SourceFile) {
-                let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
@@ -6879,7 +7530,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
 
-                let dependencyNames = getAMDDependencyNames(node, /*includeNonAmdDependencies*/ false);
+                const dependencyNames = getAMDDependencyNames(node, /*includeNonAmdDependencies*/ false);
 
                 // Module is detected first to support Browserify users that load into a browser with an AMD loader
                 writeLines(`(function (factory) {
@@ -6894,7 +7545,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 })(`);
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
@@ -6910,7 +7561,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 exportSpecifiers = undefined;
                 exportEquals = undefined;
                 hasExportStars = false;
-                let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
                 emitEmitHelpers(node);
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
@@ -6945,7 +7596,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function trimReactWhitespaceAndApplyEntities(node: JsxText): string {
                 let result: string = undefined;
-                let text = getTextOfNode(node, /*includeTrivia*/ true);
+                const text = getTextOfNode(node, /*includeTrivia*/ true);
                 let firstNonWhitespace = 0;
                 let lastNonWhitespace = -1;
 
@@ -6953,10 +7604,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // start/end of a tag is considered a start/end of a line only if that line is
                 // on the same line as the closing tag. See examples in tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
                 for (let i = 0; i < text.length; i++) {
-                    let c = text.charCodeAt(i);
+                    const c = text.charCodeAt(i);
                     if (isLineBreak(c)) {
                         if (firstNonWhitespace !== -1 && (lastNonWhitespace - firstNonWhitespace + 1 > 0)) {
-                            let part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
+                            const part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
                             result = (result ? result + "\" + ' ' + \"" : "") + escapeString(part);
                         }
                         firstNonWhitespace = -1;
@@ -6970,7 +7621,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 if (firstNonWhitespace !== -1) {
-                    let part = text.substr(firstNonWhitespace);
+                    const part = text.substr(firstNonWhitespace);
                     result = (result ? result + "\" + ' ' + \"" : "") + escapeString(part);
                 }
 
@@ -7053,9 +7704,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function writeLines(text: string): void {
-                let lines = text.split(/\r\n|\r|\n/g);
+                const lines = text.split(/\r\n|\r|\n/g);
                 for (let i = 0; i < lines.length; ++i) {
-                    let line = lines[i];
+                    const line = lines[i];
                     if (line.length) {
                         writeLine();
                         write(line);
@@ -7097,15 +7748,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // Start new file on new line
                 writeLine();
                 emitShebang();
-                emitDetachedComments(node);
+                emitDetachedCommentsAndUpdateCommentsInfo(node);
 
                 if (isExternalModule(node) || compilerOptions.isolatedModules) {
-                    let emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ModuleKind.CommonJS];
-                    emitModule(node);
+                    if (root || (!isExternalModule(node) && compilerOptions.isolatedModules)) {
+                        const emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ModuleKind.CommonJS];
+                        emitModule(node);
+                    }
+                    else {
+                        bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/true);
+                    }
                 }
                 else {
                     // emit prologue directives prior to __extends
-                    let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
+                    const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
                     externalImports = undefined;
                     exportSpecifiers = undefined;
                     exportEquals = undefined;
@@ -7134,7 +7790,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         return emitNodeWithoutSourceMap(node);
                     }
 
-                    let emitComments = shouldEmitLeadingAndTrailingComments(node);
+                    const emitComments = shouldEmitLeadingAndTrailingComments(node);
                     if (emitComments) {
                         emitLeadingComments(node);
                     }
@@ -7241,7 +7897,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         return emitTemplateSpan(<TemplateSpan>node);
                     case SyntaxKind.JsxElement:
                     case SyntaxKind.JsxSelfClosingElement:
-                        return emitJsxElement(<JsxElement|JsxSelfClosingElement>node);
+                        return emitJsxElement(<JsxElement | JsxSelfClosingElement>node);
                     case SyntaxKind.JsxText:
                         return emitJsxText(<JsxText>node);
                     case SyntaxKind.JsxExpression:
@@ -7339,7 +7995,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     case SyntaxKind.DefaultClause:
                         return emitCaseOrDefaultClause(<CaseOrDefaultClause>node);
                     case SyntaxKind.LabeledStatement:
-                        return emitLabelledStatement(<LabeledStatement>node);
+                        return emitLabeledStatement(<LabeledStatement>node);
                     case SyntaxKind.ThrowStatement:
                         return emitThrowStatement(<ThrowStatement>node);
                     case SyntaxKind.TryStatement:
@@ -7381,7 +8037,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function getLeadingCommentsWithoutDetachedComments() {
                 // get the leading comments from detachedPos
-                let leadingComments = getLeadingCommentRanges(currentSourceFile.text,
+                const leadingComments = getLeadingCommentRanges(currentText,
                     lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
                 if (detachedCommentsInfo.length - 1) {
                     detachedCommentsInfo.pop();
@@ -7393,11 +8049,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 return leadingComments;
             }
 
-            function isPinnedComments(comment: CommentRange) {
-                return currentSourceFile.text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === CharacterCodes.exclamation;
-            }
-
             /**
              * Determine if the given comment is a triple-slash
              *
@@ -7406,10 +8057,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             function isTripleSlashComment(comment: CommentRange) {
                 // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
                 // so that we don't end up computing comment string and doing match for all // comments
-                if (currentSourceFile.text.charCodeAt(comment.pos + 1) === CharacterCodes.slash &&
+                if (currentText.charCodeAt(comment.pos + 1) === CharacterCodes.slash &&
                     comment.pos + 2 < comment.end &&
-                    currentSourceFile.text.charCodeAt(comment.pos + 2) === CharacterCodes.slash) {
-                    let textSubStr = currentSourceFile.text.substring(comment.pos, comment.end);
+                    currentText.charCodeAt(comment.pos + 2) === CharacterCodes.slash) {
+                    const textSubStr = currentText.substring(comment.pos, comment.end);
                     return textSubStr.match(fullTripleSlashReferencePathRegEx) ||
                         textSubStr.match(fullTripleSlashAMDReferencePathRegEx) ?
                         true : false;
@@ -7427,7 +8078,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         }
                         else {
                             // get the leading comments from the node
-                            return getLeadingCommentRangesOfNode(node, currentSourceFile);
+                            return getLeadingCommentRangesOfNodeFromText(node, currentText);
                         }
                     }
                 }
@@ -7437,7 +8088,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments
                 if (node.parent) {
                     if (node.parent.kind === SyntaxKind.SourceFile || node.end !== node.parent.end) {
-                        return getTrailingCommentRanges(currentSourceFile.text, node.end);
+                        return getTrailingCommentRanges(currentText, node.end);
                     }
                 }
             }
@@ -7446,11 +8097,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
              * Emit comments associated with node that will not be emitted into JS file
              */
             function emitCommentsOnNotEmittedNode(node: Node) {
-                emitLeadingCommentsWorker(node, /*isEmittedNode:*/ false);
+                emitLeadingCommentsWorker(node, /*isEmittedNode*/ false);
             }
 
             function emitLeadingComments(node: Node) {
-                return emitLeadingCommentsWorker(node, /*isEmittedNode:*/ true);
+                return emitLeadingCommentsWorker(node, /*isEmittedNode*/ true);
             }
 
             function emitLeadingCommentsWorker(node: Node, isEmittedNode: boolean) {
@@ -7476,10 +8127,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
                 }
 
-                emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
+                emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
 
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment);
+                emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
 
             function emitTrailingComments(node: Node) {
@@ -7488,10 +8139,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 // Emit the trailing comments only if the parent's end doesn't match
-                let trailingComments = getTrailingCommentsToEmit(node);
+                const trailingComments = getTrailingCommentsToEmit(node);
 
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
+                emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
             }
 
             /**
@@ -7504,10 +8155,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     return;
                 }
 
-                let trailingComments = getTrailingCommentRanges(currentSourceFile.text, pos);
+                const trailingComments = getTrailingCommentRanges(currentText, pos);
 
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
+                emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
 
             function emitLeadingCommentsOfPositionWorker(pos: number) {
@@ -7522,77 +8173,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
                 else {
                     // get the leading comments from the node
-                    leadingComments = getLeadingCommentRanges(currentSourceFile.text, pos);
+                    leadingComments = getLeadingCommentRanges(currentText, pos);
                 }
 
-                emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
+                emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
 
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
+                emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
             }
 
-            function emitDetachedComments(node: TextRange) {
-                let leadingComments: CommentRange[];
-                if (compilerOptions.removeComments) {
-                    // removeComments is true, only reserve pinned comment at the top of file
-                    // For example:
-                    //      /*! Pinned Comment */
-                    //
-                    //      var x = 10;
-                    if (node.pos === 0) {
-                        leadingComments = filter(getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComments);
+            function emitDetachedCommentsAndUpdateCommentsInfo(node: TextRange) {
+                const currentDetachedCommentInfo = emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
+
+                if (currentDetachedCommentInfo) {
+                    if (detachedCommentsInfo) {
+                        detachedCommentsInfo.push(currentDetachedCommentInfo);
                     }
-                }
-                else {
-                    // removeComments is false, just get detached as normal and bypass the process to filter comment
-                    leadingComments = getLeadingCommentRanges(currentSourceFile.text, node.pos);
-                }
-
-                if (leadingComments) {
-                    let detachedComments: CommentRange[] = [];
-                    let lastComment: CommentRange;
-
-                    forEach(leadingComments, comment => {
-                        if (lastComment) {
-                            let lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end);
-                            let commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos);
-
-                            if (commentLine >= lastCommentLine + 2) {
-                                // There was a blank line between the last comment and this comment.  This
-                                // comment is not part of the copyright comments.  Return what we have so
-                                // far.
-                                return detachedComments;
-                            }
-                        }
-
-                        detachedComments.push(comment);
-                        lastComment = comment;
-                    });
-
-                    if (detachedComments.length) {
-                        // All comments look like they could have been part of the copyright header.  Make
-                        // sure there is at least one blank line between it and the node.  If not, it's not
-                        // a copyright header.
-                        let lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastOrUndefined(detachedComments).end);
-                        let nodeLine = getLineOfLocalPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node.pos));
-                        if (nodeLine >= lastCommentLine + 2) {
-                            // Valid detachedComments
-                            emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
-                            emitComments(currentSourceFile, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
-                            let currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: lastOrUndefined(detachedComments).end };
-                            if (detachedCommentsInfo) {
-                                detachedCommentsInfo.push(currentDetachedCommentInfo);
-                            }
-                            else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
-                            }
-                        }
+                    else {
+                        detachedCommentsInfo = [currentDetachedCommentInfo];
                     }
                 }
             }
 
             function emitShebang() {
-                let shebang = getShebang(currentSourceFile.text);
+                const shebang = getShebang(currentText);
                 if (shebang) {
                     write(shebang);
                 }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 1551706a337..1ffea764bfa 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1,16 +1,19 @@
-/// <reference path="scanner.ts"/>
 /// <reference path="utilities.ts"/>
+/// <reference path="scanner.ts"/>
 
 namespace ts {
-    let nodeConstructors = new Array<new () => Node>(SyntaxKind.Count);
     /* @internal */ export let parseTime = 0;
 
-    export function getNodeConstructor(kind: SyntaxKind): new () => Node {
-        return nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind));
-    }
+    let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
+    let SourceFileConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
 
-    export function createNode(kind: SyntaxKind): Node {
-        return new (getNodeConstructor(kind))();
+    export function createNode(kind: SyntaxKind, pos?: number, end?: number): Node {
+        if (kind === SyntaxKind.SourceFile) {
+            return new (SourceFileConstructor || (SourceFileConstructor = objectAllocator.getSourceFileConstructor()))(kind, pos, end);
+        }
+        else {
+            return new (NodeConstructor || (NodeConstructor = objectAllocator.getNodeConstructor()))(kind, pos, end);
+        }
     }
 
     function visitNode<T>(cbNode: (node: Node) => T, node: Node): T {
@@ -27,8 +30,8 @@ namespace ts {
 
     function visitEachNode<T>(cbNode: (node: Node) => T, nodes: Node[]) {
         if (nodes) {
-            for (let node of nodes) {
-                let result = cbNode(node);
+            for (const node of nodes) {
+                const result = cbNode(node);
                 if (result) {
                     return result;
                 }
@@ -47,8 +50,8 @@ namespace ts {
         // The visitXXX functions could be written as local functions that close over the cbNode and cbNodeArray
         // callback parameters, but that causes a closure allocation for each invocation with noticeable effects
         // on performance.
-        let visitNodes: (cb: (node: Node | Node[]) => T, nodes: Node[]) => T = cbNodeArray ? visitNodeArray : visitEachNode;
-        let cbNodes = cbNodeArray || cbNode;
+        const visitNodes: (cb: (node: Node | Node[]) => T, nodes: Node[]) => T = cbNodeArray ? visitNodeArray : visitEachNode;
+        const cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
             case SyntaxKind.QualifiedName:
                 return visitNode(cbNode, (<QualifiedName>node).left) ||
@@ -397,8 +400,8 @@ namespace ts {
     }
 
     export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false): SourceFile {
-        let start = new Date().getTime();
-        let result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
+        const start = new Date().getTime();
+        const result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
 
         parseTime += new Date().getTime() - start;
         return result;
@@ -437,6 +440,10 @@ namespace ts {
         const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
         const disallowInAndDecoratorContext = ParserContextFlags.DisallowIn | ParserContextFlags.Decorator;
 
+        // capture constructors in 'initializeState' to avoid null checks
+        let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
+        let SourceFileConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
+
         let sourceFile: SourceFile;
         let parseDiagnostics: Diagnostic[];
         let syntaxCursor: IncrementalParser.SyntaxCursor;
@@ -527,16 +534,20 @@ namespace ts {
         let parseErrorBeforeNextFinishedNode = false;
 
         export function parseSourceFile(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor, setParentNodes?: boolean): SourceFile {
-            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor);
+            const isJavaScriptFile = hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
+            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
 
-            let result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
+            const result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
 
             clearState();
 
             return result;
         }
 
-        function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor) {
+        function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) {
+            NodeConstructor = objectAllocator.getNodeConstructor();
+            SourceFileConstructor = objectAllocator.getSourceFileConstructor();
+
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
 
@@ -546,14 +557,14 @@ namespace ts {
             identifierCount = 0;
             nodeCount = 0;
 
-            contextFlags = isJavaScript(fileName) ? ParserContextFlags.JavaScriptFile : ParserContextFlags.None;
+            contextFlags = isJavaScriptFile ? ParserContextFlags.JavaScriptFile : ParserContextFlags.None;
             parseErrorBeforeNextFinishedNode = false;
 
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(isTsx(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard);
+            scanner.setLanguageVariant(allowsJsxExpressions(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard);
         }
 
         function clearState() {
@@ -572,6 +583,10 @@ namespace ts {
         function parseSourceFileWorker(fileName: string, languageVersion: ScriptTarget, setParentNodes: boolean): SourceFile {
             sourceFile = createSourceFile(fileName, languageVersion);
 
+            if (contextFlags & ParserContextFlags.JavaScriptFile) {
+                sourceFile.parserContextFlags = ParserContextFlags.JavaScriptFile;
+            }
+
             // Prime the scanner.
             token = nextToken();
             processReferenceComments(sourceFile);
@@ -594,7 +609,7 @@ namespace ts {
             // If this is a javascript file, proactively see if we can get JSDoc comments for
             // relevant nodes in the file.  We'll use these to provide typing informaion if they're
             // available.
-            if (isJavaScript(fileName)) {
+            if (isSourceFileJavaScript(sourceFile)) {
                 addJSDocComments();
             }
 
@@ -620,10 +635,10 @@ namespace ts {
         }
 
         function addJSDocComment(node: Node) {
-            let comments = getLeadingCommentRangesOfNode(node, sourceFile);
+            const comments = getLeadingCommentRangesOfNode(node, sourceFile);
             if (comments) {
-                for (let comment of comments) {
-                    let jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
+                for (const comment of comments) {
+                    const jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
                     if (jsDocComment) {
                         node.jsDocComment = jsDocComment;
                     }
@@ -648,7 +663,7 @@ namespace ts {
                 if (n.parent !== parent) {
                     n.parent = parent;
 
-                    let saveParent = parent;
+                    const saveParent = parent;
                     parent = n;
                     forEachChild(n, visitNode);
                     parent = saveParent;
@@ -657,21 +672,22 @@ namespace ts {
         }
 
         function createSourceFile(fileName: string, languageVersion: ScriptTarget): SourceFile {
-            let sourceFile = <SourceFile>createNode(SyntaxKind.SourceFile, /*pos*/ 0);
+            // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
+            // this is quite rare comparing to other nodes and createNode should be as fast as possible
+            const sourceFile = <SourceFile>new SourceFileConstructor(SyntaxKind.SourceFile, /*pos*/ 0, /* end */ sourceText.length);
+            nodeCount++;
 
-            sourceFile.pos = 0;
-            sourceFile.end = sourceText.length;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = normalizePath(fileName);
             sourceFile.flags = fileExtensionIs(sourceFile.fileName, ".d.ts") ? NodeFlags.DeclarationFile : 0;
-            sourceFile.languageVariant = isTsx(sourceFile.fileName) ? LanguageVariant.JSX : LanguageVariant.Standard;
+            sourceFile.languageVariant = allowsJsxExpressions(sourceFile.fileName) ? LanguageVariant.JSX : LanguageVariant.Standard;
 
             return sourceFile;
         }
 
-        function setContextFlag(val: Boolean, flag: ParserContextFlags) {
+        function setContextFlag(val: boolean, flag: ParserContextFlags) {
             if (val) {
                 contextFlags |= flag;
             }
@@ -703,13 +719,13 @@ namespace ts {
             // that we do not mutate cached flags for the incremental
             // parser (ThisNodeHasError, ThisNodeOrAnySubNodesHasError, and
             // HasAggregatedChildData).
-            let contextFlagsToClear = context & contextFlags;
+            const contextFlagsToClear = context & contextFlags;
             if (contextFlagsToClear) {
                 // clear the requested context flags
-                setContextFlag(false, contextFlagsToClear);
-                let result = func();
+                setContextFlag(/*val*/ false, contextFlagsToClear);
+                const result = func();
                 // restore the context flags we just cleared
-                setContextFlag(true, contextFlagsToClear);
+                setContextFlag(/*val*/ true, contextFlagsToClear);
                 return result;
             }
 
@@ -724,13 +740,13 @@ namespace ts {
             // that we do not mutate cached flags for the incremental
             // parser (ThisNodeHasError, ThisNodeOrAnySubNodesHasError, and
             // HasAggregatedChildData).
-            let contextFlagsToSet = context & ~contextFlags;
+            const contextFlagsToSet = context & ~contextFlags;
             if (contextFlagsToSet) {
                 // set the requested context flags
-                setContextFlag(true, contextFlagsToSet);
-                let result = func();
+                setContextFlag(/*val*/ true, contextFlagsToSet);
+                const result = func();
                 // reset the context flags we just set
-                setContextFlag(false, contextFlagsToSet);
+                setContextFlag(/*val*/ false, contextFlagsToSet);
                 return result;
             }
 
@@ -795,15 +811,15 @@ namespace ts {
         }
 
         function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void {
-            let start = scanner.getTokenPos();
-            let length = scanner.getTextPos() - start;
+            const start = scanner.getTokenPos();
+            const length = scanner.getTextPos() - start;
 
             parseErrorAtPosition(start, length, message, arg0);
         }
 
         function parseErrorAtPosition(start: number, length: number, message: DiagnosticMessage, arg0?: any): void {
             // Don't report another error if it would just be at the same position as the last error.
-            let lastError = lastOrUndefined(parseDiagnostics);
+            const lastError = lastOrUndefined(parseDiagnostics);
             if (!lastError || start !== lastError.start) {
                 parseDiagnostics.push(createFileDiagnostic(sourceFile, start, length, message, arg0));
             }
@@ -814,7 +830,7 @@ namespace ts {
         }
 
         function scanError(message: DiagnosticMessage, length?: number) {
-            let pos = scanner.getTextPos();
+            const pos = scanner.getTextPos();
             parseErrorAtPosition(pos, length || 0, message);
         }
 
@@ -857,20 +873,20 @@ namespace ts {
         function speculationHelper<T>(callback: () => T, isLookAhead: boolean): T {
             // Keep track of the state we'll need to rollback to if lookahead fails (or if the
             // caller asked us to always reset our state).
-            let saveToken = token;
-            let saveParseDiagnosticsLength = parseDiagnostics.length;
-            let saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
+            const saveToken = token;
+            const saveParseDiagnosticsLength = parseDiagnostics.length;
+            const saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
 
             // Note: it is not actually necessary to save/restore the context flags here.  That's
             // because the saving/restoring of these flags happens naturally through the recursive
             // descent nature of our parser.  However, we still store this here just so we can
             // assert that that invariant holds.
-            let saveContextFlags = contextFlags;
+            const saveContextFlags = contextFlags;
 
             // If we're only looking ahead, then tell the scanner to only lookahead as well.
             // Otherwise, if we're actually speculatively parsing, then tell the scanner to do the
             // same.
-            let result = isLookAhead
+            const result = isLookAhead
                 ? scanner.lookAhead(callback)
                 : scanner.tryScan(callback);
 
@@ -962,7 +978,7 @@ namespace ts {
         }
 
         function parseTokenNode<T extends Node>(): T {
-            let node = <T>createNode(token);
+            const node = <T>createNode(token);
             nextToken();
             return finishNode(node);
         }
@@ -991,16 +1007,14 @@ namespace ts {
             }
         }
 
+        // note: this function creates only node
         function createNode(kind: SyntaxKind, pos?: number): Node {
             nodeCount++;
-            let node = new (nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind)))();
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
 
-            node.pos = pos;
-            node.end = pos;
-            return node;
+            return new NodeConstructor(kind, pos, pos);
         }
 
         function finishNode<T extends Node>(node: T, end?: number): T {
@@ -1029,7 +1043,7 @@ namespace ts {
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
 
-            let result = createNode(kind, scanner.getStartPos());
+            const result = createNode(kind, scanner.getStartPos());
             (<Identifier>result).text = "";
             return finishNode(result);
         }
@@ -1045,7 +1059,7 @@ namespace ts {
         function createIdentifier(isIdentifier: boolean, diagnosticMessage?: DiagnosticMessage): Identifier {
             identifierCount++;
             if (isIdentifier) {
-                let node = <Identifier>createNode(SyntaxKind.Identifier);
+                const node = <Identifier>createNode(SyntaxKind.Identifier);
 
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
                 if (token !== SyntaxKind.Identifier) {
@@ -1073,7 +1087,7 @@ namespace ts {
                 token === SyntaxKind.NumericLiteral;
         }
 
-        function parsePropertyNameWorker(allowComputedPropertyNames: boolean): DeclarationName {
+        function parsePropertyNameWorker(allowComputedPropertyNames: boolean): PropertyName {
             if (token === SyntaxKind.StringLiteral || token === SyntaxKind.NumericLiteral) {
                 return parseLiteralNode(/*internName*/ true);
             }
@@ -1083,12 +1097,12 @@ namespace ts {
             return parseIdentifierName();
         }
 
-        function parsePropertyName(): DeclarationName {
-            return parsePropertyNameWorker(/*allowComputedPropertyNames:*/ true);
+        function parsePropertyName(): PropertyName {
+            return parsePropertyNameWorker(/*allowComputedPropertyNames*/ true);
         }
 
         function parseSimplePropertyName(): Identifier | LiteralExpression {
-            return <Identifier | LiteralExpression>parsePropertyNameWorker(/*allowComputedPropertyNames:*/ false);
+            return <Identifier | LiteralExpression>parsePropertyNameWorker(/*allowComputedPropertyNames*/ false);
         }
 
         function isSimplePropertyName() {
@@ -1099,7 +1113,7 @@ namespace ts {
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            let node = <ComputedPropertyName>createNode(SyntaxKind.ComputedPropertyName);
+            const node = <ComputedPropertyName>createNode(SyntaxKind.ComputedPropertyName);
             parseExpected(SyntaxKind.OpenBracketToken);
 
             // We parse any expression (including a comma expression). But the grammar
@@ -1143,7 +1157,7 @@ namespace ts {
         }
 
         function parseAnyContextualModifier(): boolean {
-            return isModifier(token) && tryParse(nextTokenCanFollowModifier);
+            return isModifierKind(token) && tryParse(nextTokenCanFollowModifier);
         }
 
         function canFollowModifier(): boolean {
@@ -1160,7 +1174,7 @@ namespace ts {
 
         // True if positioned at the start of a list element
         function isListElement(parsingContext: ParsingContext, inErrorRecovery: boolean): boolean {
-            let node = currentNode(parsingContext);
+            const node = currentNode(parsingContext);
             if (node) {
                 return true;
             }
@@ -1193,7 +1207,7 @@ namespace ts {
                 case ParsingContext.ObjectLiteralMembers:
                     return token === SyntaxKind.OpenBracketToken || token === SyntaxKind.AsteriskToken || isLiteralPropertyName();
                 case ParsingContext.ObjectBindingElements:
-                    return isLiteralPropertyName();
+                    return token === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
                 case ParsingContext.HeritageClauseElement:
                     // If we see { } then only consume it as an expression if it is followed by , or {
                     // That way we won't consume the body of a class in its heritage clause.
@@ -1254,7 +1268,7 @@ namespace ts {
                 //      extends {} extends
                 //      extends {} implements
 
-                let next = nextToken();
+                const next = nextToken();
                 return next === SyntaxKind.CommaToken || next === SyntaxKind.OpenBraceToken || next === SyntaxKind.ExtendsKeyword || next === SyntaxKind.ImplementsKeyword;
             }
 
@@ -1371,7 +1385,7 @@ namespace ts {
         function isInSomeParsingContext(): boolean {
             for (let kind = 0; kind < ParsingContext.Count; kind++) {
                 if (parsingContext & (1 << kind)) {
-                    if (isListElement(kind, /* inErrorRecovery */ true) || isListTerminator(kind)) {
+                    if (isListElement(kind, /*inErrorRecovery*/ true) || isListTerminator(kind)) {
                         return true;
                     }
                 }
@@ -1382,14 +1396,14 @@ namespace ts {
 
         // Parses a list of elements
         function parseList<T extends Node>(kind: ParsingContext, parseElement: () => T): NodeArray<T> {
-            let saveParsingContext = parsingContext;
+            const saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
-            let result = <NodeArray<T>>[];
+            const result = <NodeArray<T>>[];
             result.pos = getNodePos();
 
             while (!isListTerminator(kind)) {
-                if (isListElement(kind, /* inErrorRecovery */ false)) {
-                    let element = parseListElement(kind, parseElement);
+                if (isListElement(kind, /*inErrorRecovery*/ false)) {
+                    const element = parseListElement(kind, parseElement);
                     result.push(element);
 
                     continue;
@@ -1406,7 +1420,7 @@ namespace ts {
         }
 
         function parseListElement<T extends Node>(parsingContext: ParsingContext, parseElement: () => T): T {
-            let node = currentNode(parsingContext);
+            const node = currentNode(parsingContext);
             if (node) {
                 return <T>consumeNode(node);
             }
@@ -1431,7 +1445,7 @@ namespace ts {
                 return undefined;
             }
 
-            let node = syntaxCursor.currentNode(scanner.getStartPos());
+            const node = syntaxCursor.currentNode(scanner.getStartPos());
 
             // Can't reuse a missing node.
             if (nodeIsMissing(node)) {
@@ -1460,7 +1474,7 @@ namespace ts {
             // differently depending on what mode it is in.
             //
             // This also applies to all our other context flags as well.
-            let nodeContextFlags = node.parserContextFlags & ParserContextFlags.ParserGeneratedFlags;
+            const nodeContextFlags = node.parserContextFlags & ParserContextFlags.ParserGeneratedFlags;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -1672,7 +1686,7 @@ namespace ts {
             //
             // In order to prevent this, we do not allow a variable declarator to be reused if it
             // has an initializer.
-            let variableDeclarator = <VariableDeclaration>node;
+            const variableDeclarator = <VariableDeclaration>node;
             return variableDeclarator.initializer === undefined;
         }
 
@@ -1682,7 +1696,7 @@ namespace ts {
             }
 
             // See the comment in isReusableVariableDeclaration for why we do this.
-            let parameter = <ParameterDeclaration>node;
+            const parameter = <ParameterDeclaration>node;
             return parameter.initializer === undefined;
         }
 
@@ -1730,14 +1744,14 @@ namespace ts {
 
         // Parses a comma-delimited list of elements
         function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, considerSemicolonAsDelimeter?: boolean): NodeArray<T> {
-            let saveParsingContext = parsingContext;
+            const saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
-            let result = <NodeArray<T>>[];
+            const result = <NodeArray<T>>[];
             result.pos = getNodePos();
 
             let commaStart = -1; // Meaning the previous token was not a comma
             while (true) {
-                if (isListElement(kind, /* inErrorRecovery */ false)) {
+                if (isListElement(kind, /*inErrorRecovery*/ false)) {
                     result.push(parseListElement(kind, parseElement));
                     commaStart = scanner.getTokenPos();
                     if (parseOptional(SyntaxKind.CommaToken)) {
@@ -1789,8 +1803,8 @@ namespace ts {
         }
 
         function createMissingList<T>(): NodeArray<T> {
-            let pos = getNodePos();
-            let result = <NodeArray<T>>[];
+            const pos = getNodePos();
+            const result = <NodeArray<T>>[];
             result.pos = pos;
             result.end = pos;
             return result;
@@ -1798,7 +1812,7 @@ namespace ts {
 
         function parseBracketedList<T extends Node>(kind: ParsingContext, parseElement: () => T, open: SyntaxKind, close: SyntaxKind): NodeArray<T> {
             if (parseExpected(open)) {
-                let result = parseDelimitedList(kind, parseElement);
+                const result = parseDelimitedList(kind, parseElement);
                 parseExpected(close);
                 return result;
             }
@@ -1810,7 +1824,7 @@ namespace ts {
         function parseEntityName(allowReservedWords: boolean, diagnosticMessage?: DiagnosticMessage): EntityName {
             let entity: EntityName = parseIdentifier(diagnosticMessage);
             while (parseOptional(SyntaxKind.DotToken)) {
-                let node = <QualifiedName>createNode(SyntaxKind.QualifiedName, entity.pos);
+                const node = <QualifiedName>createNode(SyntaxKind.QualifiedName, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -1839,13 +1853,13 @@ namespace ts {
             // In the first case though, ASI will not take effect because there is not a
             // line terminator after the identifier or keyword.
             if (scanner.hasPrecedingLineBreak() && tokenIsIdentifierOrKeyword(token)) {
-                let matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
+                const matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
 
                 if (matchesPattern) {
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return <Identifier>createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentToken*/ true, Diagnostics.Identifier_expected);
+                    return <Identifier>createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ true, Diagnostics.Identifier_expected);
                 }
             }
 
@@ -1853,12 +1867,12 @@ namespace ts {
         }
 
         function parseTemplateExpression(): TemplateExpression {
-            let template = <TemplateExpression>createNode(SyntaxKind.TemplateExpression);
+            const template = <TemplateExpression>createNode(SyntaxKind.TemplateExpression);
 
             template.head = parseLiteralNode();
             Debug.assert(template.head.kind === SyntaxKind.TemplateHead, "Template head has wrong token kind");
 
-            let templateSpans = <NodeArray<TemplateSpan>>[];
+            const templateSpans = <NodeArray<TemplateSpan>>[];
             templateSpans.pos = getNodePos();
 
             do {
@@ -1873,7 +1887,7 @@ namespace ts {
         }
 
         function parseTemplateSpan(): TemplateSpan {
-            let span = <TemplateSpan>createNode(SyntaxKind.TemplateSpan);
+            const span = <TemplateSpan>createNode(SyntaxKind.TemplateSpan);
             span.expression = allowInAnd(parseExpression);
 
             let literal: LiteralExpression;
@@ -1891,8 +1905,8 @@ namespace ts {
         }
 
         function parseLiteralNode(internName?: boolean): LiteralExpression {
-            let node = <LiteralExpression>createNode(token);
-            let text = scanner.getTokenValue();
+            const node = <LiteralExpression>createNode(token);
+            const text = scanner.getTokenValue();
             node.text = internName ? internIdentifier(text) : text;
 
             if (scanner.hasExtendedUnicodeEscape()) {
@@ -1903,7 +1917,7 @@ namespace ts {
                 node.isUnterminated = true;
             }
 
-            let tokenPos = scanner.getTokenPos();
+            const tokenPos = scanner.getTokenPos();
             nextToken();
             finishNode(node);
 
@@ -1926,15 +1940,15 @@ namespace ts {
         // TYPES
 
         function parseTypeReferenceOrTypePredicate(): TypeReferenceNode | TypePredicateNode {
-            let typeName = parseEntityName(/*allowReservedWords*/ false, Diagnostics.Type_expected);
+            const typeName = parseEntityName(/*allowReservedWords*/ false, Diagnostics.Type_expected);
             if (typeName.kind === SyntaxKind.Identifier && token === SyntaxKind.IsKeyword && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
-                let node = <TypePredicateNode>createNode(SyntaxKind.TypePredicate, typeName.pos);
+                const node = <TypePredicateNode>createNode(SyntaxKind.TypePredicate, typeName.pos);
                 node.parameterName = <Identifier>typeName;
                 node.type = parseType();
                 return finishNode(node);
             }
-            let node = <TypeReferenceNode>createNode(SyntaxKind.TypeReference, typeName.pos);
+            const node = <TypeReferenceNode>createNode(SyntaxKind.TypeReference, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token === SyntaxKind.LessThanToken) {
                 node.typeArguments = parseBracketedList(ParsingContext.TypeArguments, parseType, SyntaxKind.LessThanToken, SyntaxKind.GreaterThanToken);
@@ -1943,14 +1957,14 @@ namespace ts {
         }
 
         function parseTypeQuery(): TypeQueryNode {
-            let node = <TypeQueryNode>createNode(SyntaxKind.TypeQuery);
+            const node = <TypeQueryNode>createNode(SyntaxKind.TypeQuery);
             parseExpected(SyntaxKind.TypeOfKeyword);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
 
         function parseTypeParameter(): TypeParameterDeclaration {
-            let node = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
+            const node = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
             node.name = parseIdentifier();
             if (parseOptional(SyntaxKind.ExtendsKeyword)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
@@ -1983,16 +1997,14 @@ namespace ts {
 
         function parseParameterType(): TypeNode {
             if (parseOptional(SyntaxKind.ColonToken)) {
-                return token === SyntaxKind.StringLiteral
-                    ? <StringLiteral>parseLiteralNode(/*internName*/ true)
-                    : parseType();
+                return parseType();
             }
 
             return undefined;
         }
 
         function isStartOfParameter(): boolean {
-            return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifier(token) || token === SyntaxKind.AtToken;
+            return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifierKind(token) || token === SyntaxKind.AtToken;
         }
 
         function setModifiers(node: Node, modifiers: ModifiersArray) {
@@ -2003,7 +2015,7 @@ namespace ts {
         }
 
         function parseParameter(): ParameterDeclaration {
-            let node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
+            const node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
             node.decorators = parseDecorators();
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
@@ -2013,7 +2025,7 @@ namespace ts {
 
             node.name = parseIdentifierOrPattern();
 
-            if (getFullWidth(node.name) === 0 && node.flags === 0 && isModifier(token)) {
+            if (getFullWidth(node.name) === 0 && node.flags === 0 && isModifierKind(token)) {
                 // in cases like
                 // 'use strict'
                 // function foo(static)
@@ -2055,7 +2067,7 @@ namespace ts {
                 requireCompleteParameterList: boolean,
                 signature: SignatureDeclaration): void {
 
-            let returnTokenRequired = returnToken === SyntaxKind.EqualsGreaterThanToken;
+            const returnTokenRequired = returnToken === SyntaxKind.EqualsGreaterThanToken;
             signature.typeParameters = parseTypeParameters();
             signature.parameters = parseParameterList(yieldContext, awaitContext, requireCompleteParameterList);
 
@@ -2083,13 +2095,13 @@ namespace ts {
             // SingleNameBinding [Yield,Await]:
             //      BindingIdentifier[?Yield,?Await]Initializer [In, ?Yield,?Await] opt
             if (parseExpected(SyntaxKind.OpenParenToken)) {
-                let savedYieldContext = inYieldContext();
-                let savedAwaitContext = inAwaitContext();
+                const savedYieldContext = inYieldContext();
+                const savedAwaitContext = inAwaitContext();
 
                 setYieldContext(yieldContext);
                 setAwaitContext(awaitContext);
 
-                let result = parseDelimitedList(ParsingContext.Parameters, parseParameter);
+                const result = parseDelimitedList(ParsingContext.Parameters, parseParameter);
 
                 setYieldContext(savedYieldContext);
                 setAwaitContext(savedAwaitContext);
@@ -2120,8 +2132,8 @@ namespace ts {
             parseSemicolon();
         }
 
-        function parseSignatureMember(kind: SyntaxKind): SignatureDeclaration {
-            let node = <SignatureDeclaration>createNode(kind);
+        function parseSignatureMember(kind: SyntaxKind): CallSignatureDeclaration | ConstructSignatureDeclaration {
+            const node = <CallSignatureDeclaration | ConstructSignatureDeclaration>createNode(kind);
             if (kind === SyntaxKind.ConstructSignature) {
                 parseExpected(SyntaxKind.NewKeyword);
             }
@@ -2160,7 +2172,7 @@ namespace ts {
                 return true;
             }
 
-            if (isModifier(token)) {
+            if (isModifierKind(token)) {
                 nextToken();
                 if (isIdentifier()) {
                     return true;
@@ -2194,7 +2206,7 @@ namespace ts {
         }
 
         function parseIndexSignatureDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): IndexSignatureDeclaration {
-            let node = <IndexSignatureDeclaration>createNode(SyntaxKind.IndexSignature, fullStart);
+            const node = <IndexSignatureDeclaration>createNode(SyntaxKind.IndexSignature, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(ParsingContext.Parameters, parseParameter, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
@@ -2203,13 +2215,13 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parsePropertyOrMethodSignature(): Declaration {
-            let fullStart = scanner.getStartPos();
-            let name = parsePropertyName();
-            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+        function parsePropertyOrMethodSignature(): PropertySignature | MethodSignature {
+            const fullStart = scanner.getStartPos();
+            const name = parsePropertyName();
+            const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
 
             if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
-                let method = <MethodDeclaration>createNode(SyntaxKind.MethodSignature, fullStart);
+                const method = <MethodSignature>createNode(SyntaxKind.MethodSignature, fullStart);
                 method.name = name;
                 method.questionToken = questionToken;
 
@@ -2220,7 +2232,7 @@ namespace ts {
                 return finishNode(method);
             }
             else {
-                let property = <PropertyDeclaration>createNode(SyntaxKind.PropertySignature, fullStart);
+                const property = <PropertySignature>createNode(SyntaxKind.PropertySignature, fullStart);
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -2236,8 +2248,8 @@ namespace ts {
                 case SyntaxKind.OpenBracketToken: // Both for indexers and computed properties
                     return true;
                 default:
-                    if (isModifier(token)) {
-                        let result = lookAhead(isStartOfIndexSignatureDeclaration);
+                    if (isModifierKind(token)) {
+                        const result = lookAhead(isStartOfIndexSignatureDeclaration);
                         if (result) {
                             return result;
                         }
@@ -2248,7 +2260,7 @@ namespace ts {
         }
 
         function isStartOfIndexSignatureDeclaration() {
-            while (isModifier(token)) {
+            while (isModifierKind(token)) {
                 nextToken();
             }
 
@@ -2264,7 +2276,7 @@ namespace ts {
                 canParseSemicolon();
         }
 
-        function parseTypeMember(): Declaration {
+        function parseTypeMember(): TypeElement {
             switch (token) {
                 case SyntaxKind.OpenParenToken:
                 case SyntaxKind.LessThanToken:
@@ -2289,8 +2301,8 @@ namespace ts {
                     // when incrementally parsing as the parser will produce the Index declaration
                     // if it has the same text regardless of whether it is inside a class or an
                     // object type.
-                    if (isModifier(token)) {
-                        let result = tryParse(parseIndexSignatureWithModifiers);
+                    if (isModifierKind(token)) {
+                        const result = tryParse(parseIndexSignatureWithModifiers);
                         if (result) {
                             return result;
                         }
@@ -2303,9 +2315,9 @@ namespace ts {
         }
 
         function parseIndexSignatureWithModifiers() {
-            let fullStart = scanner.getStartPos();
-            let decorators = parseDecorators();
-            let modifiers = parseModifiers();
+            const fullStart = scanner.getStartPos();
+            const decorators = parseDecorators();
+            const modifiers = parseModifiers();
             return isIndexSignature()
                 ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers)
                 : undefined;
@@ -2317,32 +2329,32 @@ namespace ts {
         }
 
         function parseTypeLiteral(): TypeLiteralNode {
-            let node = <TypeLiteralNode>createNode(SyntaxKind.TypeLiteral);
+            const node = <TypeLiteralNode>createNode(SyntaxKind.TypeLiteral);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
 
-        function parseObjectTypeMembers(): NodeArray<Declaration> {
-            let members: NodeArray<Declaration>;
+        function parseObjectTypeMembers(): NodeArray<TypeElement> {
+            let members: NodeArray<TypeElement>;
             if (parseExpected(SyntaxKind.OpenBraceToken)) {
                 members = parseList(ParsingContext.TypeMembers, parseTypeMember);
                 parseExpected(SyntaxKind.CloseBraceToken);
             }
             else {
-                members = createMissingList<Declaration>();
+                members = createMissingList<TypeElement>();
             }
 
             return members;
         }
 
         function parseTupleType(): TupleTypeNode {
-            let node = <TupleTypeNode>createNode(SyntaxKind.TupleType);
+            const node = <TupleTypeNode>createNode(SyntaxKind.TupleType);
             node.elementTypes = parseBracketedList(ParsingContext.TupleElementTypes, parseType, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
             return finishNode(node);
         }
 
         function parseParenthesizedType(): ParenthesizedTypeNode {
-            let node = <ParenthesizedTypeNode>createNode(SyntaxKind.ParenthesizedType);
+            const node = <ParenthesizedTypeNode>createNode(SyntaxKind.ParenthesizedType);
             parseExpected(SyntaxKind.OpenParenToken);
             node.type = parseType();
             parseExpected(SyntaxKind.CloseParenToken);
@@ -2350,7 +2362,7 @@ namespace ts {
         }
 
         function parseFunctionOrConstructorType(kind: SyntaxKind): FunctionOrConstructorTypeNode {
-            let node = <FunctionOrConstructorTypeNode>createNode(kind);
+            const node = <FunctionOrConstructorTypeNode>createNode(kind);
             if (kind === SyntaxKind.ConstructorType) {
                 parseExpected(SyntaxKind.NewKeyword);
             }
@@ -2359,7 +2371,7 @@ namespace ts {
         }
 
         function parseKeywordAndNoDot(): TypeNode {
-            let node = parseTokenNode<TypeNode>();
+            const node = parseTokenNode<TypeNode>();
             return token === SyntaxKind.DotToken ? undefined : node;
         }
 
@@ -2371,8 +2383,10 @@ namespace ts {
                 case SyntaxKind.BooleanKeyword:
                 case SyntaxKind.SymbolKeyword:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
-                    let node = tryParse(parseKeywordAndNoDot);
+                    const node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReferenceOrTypePredicate();
+                case SyntaxKind.StringLiteral:
+                    return <StringLiteral>parseLiteralNode(/*internName*/ true);
                 case SyntaxKind.VoidKeyword:
                 case SyntaxKind.ThisKeyword:
                     return parseTokenNode<TypeNode>();
@@ -2403,6 +2417,7 @@ namespace ts {
                 case SyntaxKind.OpenBracketToken:
                 case SyntaxKind.LessThanToken:
                 case SyntaxKind.NewKeyword:
+                case SyntaxKind.StringLiteral:
                     return true;
                 case SyntaxKind.OpenParenToken:
                     // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier,
@@ -2422,7 +2437,7 @@ namespace ts {
             let type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(SyntaxKind.OpenBracketToken)) {
                 parseExpected(SyntaxKind.CloseBracketToken);
-                let node = <ArrayTypeNode>createNode(SyntaxKind.ArrayType, type.pos);
+                const node = <ArrayTypeNode>createNode(SyntaxKind.ArrayType, type.pos);
                 node.elementType = type;
                 type = finishNode(node);
             }
@@ -2432,13 +2447,13 @@ namespace ts {
         function parseUnionOrIntersectionType(kind: SyntaxKind, parseConstituentType: () => TypeNode, operator: SyntaxKind): TypeNode {
             let type = parseConstituentType();
             if (token === operator) {
-                let types = <NodeArray<TypeNode>>[type];
+                const types = <NodeArray<TypeNode>>[type];
                 types.pos = type.pos;
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
                 types.end = getNodeEnd();
-                let node = <UnionOrIntersectionTypeNode>createNode(kind, type.pos);
+                const node = <UnionOrIntersectionTypeNode>createNode(kind, type.pos);
                 node.types = types;
                 type = finishNode(node);
             }
@@ -2468,11 +2483,11 @@ namespace ts {
                 // ( ...
                 return true;
             }
-            if (isIdentifier() || isModifier(token)) {
+            if (isIdentifier() || isModifierKind(token)) {
                 nextToken();
                 if (token === SyntaxKind.ColonToken || token === SyntaxKind.CommaToken ||
                     token === SyntaxKind.QuestionToken || token === SyntaxKind.EqualsToken ||
-                    isIdentifier() || isModifier(token)) {
+                    isIdentifier() || isModifierKind(token)) {
                     // ( id :
                     // ( id ,
                     // ( id ?
@@ -2592,9 +2607,9 @@ namespace ts {
             //      Expression[in] , AssignmentExpression[in]
 
             // clear the decorator context when parsing Expression, as it should be unambiguous when parsing a decorator
-            let saveDecoratorContext = inDecoratorContext();
+            const saveDecoratorContext = inDecoratorContext();
             if (saveDecoratorContext) {
-                setDecoratorContext(false);
+                setDecoratorContext(/*val*/ false);
             }
 
             let expr = parseAssignmentExpressionOrHigher();
@@ -2604,7 +2619,7 @@ namespace ts {
             }
 
             if (saveDecoratorContext) {
-                setDecoratorContext(true);
+                setDecoratorContext(/*val*/ true);
             }
             return expr;
         }
@@ -2653,7 +2668,7 @@ namespace ts {
             // parameter list. If we do, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
             // not a  LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
             // with AssignmentExpression if we see one.
-            let arrowExpression = tryParseParenthesizedArrowFunctionExpression();
+            const arrowExpression = tryParseParenthesizedArrowFunctionExpression();
             if (arrowExpression) {
                 return arrowExpression;
             }
@@ -2667,7 +2682,7 @@ namespace ts {
             // Otherwise, we try to parse out the conditional expression bit.  We want to allow any
             // binary expression here, so we pass in the 'lowest' precedence here so that it matches
             // and consumes anything.
-            let expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
+            const expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
 
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
@@ -2724,7 +2739,7 @@ namespace ts {
         }
 
         function parseYieldExpression(): YieldExpression {
-            let node = <YieldExpression>createNode(SyntaxKind.YieldExpression);
+            const node = <YieldExpression>createNode(SyntaxKind.YieldExpression);
 
             // YieldExpression[In] :
             //      yield
@@ -2748,9 +2763,9 @@ namespace ts {
         function parseSimpleArrowFunctionExpression(identifier: Identifier): Expression {
             Debug.assert(token === SyntaxKind.EqualsGreaterThanToken, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
 
-            let node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction, identifier.pos);
+            const node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction, identifier.pos);
 
-            let parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter, identifier.pos);
+            const parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
 
@@ -2758,14 +2773,14 @@ namespace ts {
             node.parameters.pos = parameter.pos;
             node.parameters.end = parameter.end;
 
-            node.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, false, Diagnostics._0_expected, "=>");
+            node.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, /*reportAtCurrentPosition*/ false, Diagnostics._0_expected, "=>");
             node.body = parseArrowFunctionExpressionBody(/*isAsync*/ false);
 
             return finishNode(node);
         }
 
         function tryParseParenthesizedArrowFunctionExpression(): Expression {
-            let triState = isParenthesizedArrowFunctionExpression();
+            const triState = isParenthesizedArrowFunctionExpression();
             if (triState === Tristate.False) {
                 // It's definitely not a parenthesized arrow function expression.
                 return undefined;
@@ -2775,7 +2790,7 @@ namespace ts {
             // following => or { token. Otherwise, we *might* have an arrow function.  Try to parse
             // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
             // expression instead.
-            let arrowFunction = triState === Tristate.True
+            const arrowFunction = triState === Tristate.True
                 ? parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ true)
                 : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
 
@@ -2784,11 +2799,11 @@ namespace ts {
                 return undefined;
             }
 
-            let isAsync = !!(arrowFunction.flags & NodeFlags.Async);
+            const isAsync = !!(arrowFunction.flags & NodeFlags.Async);
 
             // If we have an arrow, then try to parse the body. Even if not, try to parse if we
             // have an opening brace, just in case we're in an error state.
-            let lastToken = token;
+            const lastToken = token;
             arrowFunction.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, /*reportAtCurrentPosition*/false, Diagnostics._0_expected, "=>");
             arrowFunction.body = (lastToken === SyntaxKind.EqualsGreaterThanToken || lastToken === SyntaxKind.OpenBraceToken)
                 ? parseArrowFunctionExpressionBody(isAsync)
@@ -2827,8 +2842,8 @@ namespace ts {
                 }
             }
 
-            let first = token;
-            let second = nextToken();
+            const first = token;
+            const second = nextToken();
 
             if (first === SyntaxKind.OpenParenToken) {
                 if (second === SyntaxKind.CloseParenToken) {
@@ -2836,7 +2851,7 @@ namespace ts {
                     // This is an arrow function with no parameters.
                     // The last one is not actually an arrow function,
                     // but this is probably what the user intended.
-                    let third = nextToken();
+                    const third = nextToken();
                     switch (third) {
                         case SyntaxKind.EqualsGreaterThanToken:
                         case SyntaxKind.ColonToken:
@@ -2893,10 +2908,10 @@ namespace ts {
 
                 // JSX overrides
                 if (sourceFile.languageVariant === LanguageVariant.JSX) {
-                    let isArrowFunctionInJsx = lookAhead(() => {
-                        let third = nextToken();
+                    const isArrowFunctionInJsx = lookAhead(() => {
+                        const third = nextToken();
                         if (third === SyntaxKind.ExtendsKeyword) {
-                            let fourth = nextToken();
+                            const fourth = nextToken();
                             switch (fourth) {
                                 case SyntaxKind.EqualsToken:
                                 case SyntaxKind.GreaterThanToken:
@@ -2928,9 +2943,9 @@ namespace ts {
         }
 
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity: boolean): ArrowFunction {
-            let node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction);
+            const node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction);
             setModifiers(node, parseModifiersForArrowFunction());
-            let isAsync = !!(node.flags & NodeFlags.Async);
+            const isAsync = !!(node.flags & NodeFlags.Async);
 
             // Arrow functions are never generators.
             //
@@ -2996,14 +3011,14 @@ namespace ts {
 
         function parseConditionalExpressionRest(leftOperand: Expression): Expression {
             // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher.
-            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (!questionToken) {
                 return leftOperand;
             }
 
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            let node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, leftOperand.pos);
+            const node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -3014,7 +3029,7 @@ namespace ts {
         }
 
         function parseBinaryExpressionOrHigher(precedence: number): Expression {
-            let leftOperand = parseUnaryExpressionOrHigher();
+            const leftOperand = parseUnaryExpressionOrHigher();
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
 
@@ -3028,7 +3043,7 @@ namespace ts {
                 // reScanGreaterToken so that we merge token sequences like > and = into >=
 
                 reScanGreaterToken();
-                let newPrecedence = getBinaryOperatorPrecedence();
+                const newPrecedence = getBinaryOperatorPrecedence();
 
                 // Check the precedence to see if we should "take" this operator
                 // - For left associative operator (all operator but **), consume the operator,
@@ -3139,7 +3154,7 @@ namespace ts {
         }
 
         function makeBinaryExpression(left: Expression, operatorToken: Node, right: Expression): BinaryExpression {
-            let node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, left.pos);
+            const node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
@@ -3147,14 +3162,14 @@ namespace ts {
         }
 
         function makeAsExpression(left: Expression, right: TypeNode): AsExpression {
-            let node = <AsExpression>createNode(SyntaxKind.AsExpression, left.pos);
+            const node = <AsExpression>createNode(SyntaxKind.AsExpression, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
 
         function parsePrefixUnaryExpression() {
-            let node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression);
+            const node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression);
             node.operator = token;
             nextToken();
             node.operand = parseSimpleUnaryExpression();
@@ -3163,21 +3178,21 @@ namespace ts {
         }
 
         function parseDeleteExpression() {
-            let node = <DeleteExpression>createNode(SyntaxKind.DeleteExpression);
+            const node = <DeleteExpression>createNode(SyntaxKind.DeleteExpression);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
 
         function parseTypeOfExpression() {
-            let node = <TypeOfExpression>createNode(SyntaxKind.TypeOfExpression);
+            const node = <TypeOfExpression>createNode(SyntaxKind.TypeOfExpression);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
 
         function parseVoidExpression() {
-            let node = <VoidExpression>createNode(SyntaxKind.VoidExpression);
+            const node = <VoidExpression>createNode(SyntaxKind.VoidExpression);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -3205,7 +3220,7 @@ namespace ts {
 
         /**
          * Parse ES7 unary expression and await expression
-         * 
+         *
          * ES7 UnaryExpression:
          *      1) SimpleUnaryExpression[?yield]
          *      2) IncrementExpression[?yield] ** UnaryExpression[?yield]
@@ -3216,17 +3231,16 @@ namespace ts {
             }
 
             if (isIncrementExpression()) {
-                let incrementExpression = parseIncrementExpression();
+                const incrementExpression = parseIncrementExpression();
                 return token === SyntaxKind.AsteriskAsteriskToken ?
                     <BinaryExpression>parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) :
                     incrementExpression;
             }
 
-            let unaryOperator = token;
-            let simpleUnaryExpression = parseSimpleUnaryExpression();
+            const unaryOperator = token;
+            const simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === SyntaxKind.AsteriskAsteriskToken) {
-                let diagnostic: Diagnostic;
-                let start = skipTrivia(sourceText, simpleUnaryExpression.pos);
+                const start = skipTrivia(sourceText, simpleUnaryExpression.pos);
                 if (simpleUnaryExpression.kind === SyntaxKind.TypeAssertionExpression) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
@@ -3320,7 +3334,7 @@ namespace ts {
          */
         function parseIncrementExpression(): IncrementExpression {
             if (token === SyntaxKind.PlusPlusToken || token === SyntaxKind.MinusMinusToken) {
-                let node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression);
+                const node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression);
                 node.operator = token;
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -3331,11 +3345,11 @@ namespace ts {
                 return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true);
             }
 
-            let expression = parseLeftHandSideExpressionOrHigher();
+            const expression = parseLeftHandSideExpressionOrHigher();
 
             Debug.assert(isLeftHandSideExpression(expression));
             if ((token === SyntaxKind.PlusPlusToken || token === SyntaxKind.MinusMinusToken) && !scanner.hasPrecedingLineBreak()) {
-                let node = <PostfixUnaryExpression>createNode(SyntaxKind.PostfixUnaryExpression, expression.pos);
+                const node = <PostfixUnaryExpression>createNode(SyntaxKind.PostfixUnaryExpression, expression.pos);
                 node.operand = expression;
                 node.operator = token;
                 nextToken();
@@ -3376,7 +3390,7 @@ namespace ts {
             // the last two CallExpression productions.  Or we have a MemberExpression which either
             // completes the LeftHandSideExpression, or starts the beginning of the first four
             // CallExpression productions.
-            let expression = token === SyntaxKind.SuperKeyword
+            const expression = token === SyntaxKind.SuperKeyword
                 ? parseSuperExpression()
                 : parseMemberExpressionOrHigher();
 
@@ -3433,19 +3447,19 @@ namespace ts {
             //
             // Because CallExpression and MemberExpression are left recursive, we need to bottom out
             // of the recursion immediately.  So we parse out a primary expression to start with.
-            let expression = parsePrimaryExpression();
+            const expression = parsePrimaryExpression();
             return parseMemberExpressionRest(expression);
         }
 
         function parseSuperExpression(): MemberExpression {
-            let expression = parseTokenNode<PrimaryExpression>();
+            const expression = parseTokenNode<PrimaryExpression>();
             if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.DotToken || token === SyntaxKind.OpenBracketToken) {
                 return expression;
             }
 
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            let node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
+            const node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
             node.expression = expression;
             node.dotToken = parseExpectedToken(SyntaxKind.DotToken, /*reportAtCurrentPosition*/ false, Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -3453,24 +3467,48 @@ namespace ts {
         }
 
         function parseJsxElementOrSelfClosingElement(inExpressionContext: boolean): JsxElement | JsxSelfClosingElement {
-            let opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
+            const opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
+            let result: JsxElement | JsxSelfClosingElement;
             if (opening.kind === SyntaxKind.JsxOpeningElement) {
-                let node = <JsxElement>createNode(SyntaxKind.JsxElement, opening.pos);
+                const node = <JsxElement>createNode(SyntaxKind.JsxElement, opening.pos);
                 node.openingElement = opening;
 
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
-                return finishNode(node);
+                result = finishNode(node);
             }
             else {
                 Debug.assert(opening.kind === SyntaxKind.JsxSelfClosingElement);
                 // Nothing else to do for self-closing elements
-                return <JsxSelfClosingElement>opening;
+                result = <JsxSelfClosingElement>opening;
             }
+
+            // If the user writes the invalid code '<div></div><div></div>' in an expression context (i.e. not wrapped in
+            // an enclosing tag), we'll naively try to parse   ^ this as a 'less than' operator and the remainder of the tag
+            // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX
+            // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter
+            // does less damage and we can report a better error.
+            // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios
+            // of one sort or another.
+            if (inExpressionContext && token === SyntaxKind.LessThanToken) {
+                const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElement(/*inExpressionContext*/true));
+                if (invalidElement) {
+                    parseErrorAtCurrentToken(Diagnostics.JSX_expressions_must_have_one_parent_element);
+                    const badNode = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, result.pos);
+                    badNode.end = invalidElement.end;
+                    badNode.left = result;
+                    badNode.right = invalidElement;
+                    badNode.operatorToken = createMissingNode(SyntaxKind.CommaToken, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined);
+                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
+                    return <JsxElement><Node>badNode;
+                }
+            }
+
+            return result;
         }
 
         function parseJsxText(): JsxText {
-            let node = <JsxText>createNode(SyntaxKind.JsxText, scanner.getStartPos());
+            const node = <JsxText>createNode(SyntaxKind.JsxText, scanner.getStartPos());
             token = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -3488,9 +3526,9 @@ namespace ts {
         }
 
         function parseJsxChildren(openingTagName: EntityName): NodeArray<JsxChild> {
-            let result = <NodeArray<JsxChild>>[];
+            const result = <NodeArray<JsxChild>>[];
             result.pos = scanner.getStartPos();
-            let saveParsingContext = parsingContext;
+            const saveParsingContext = parsingContext;
             parsingContext |= 1 << ParsingContext.JsxChildren;
 
             while (true) {
@@ -3512,14 +3550,14 @@ namespace ts {
             return result;
         }
 
-        function parseJsxOpeningOrSelfClosingElement(inExpressionContext: boolean): JsxOpeningElement|JsxSelfClosingElement {
-            let fullStart = scanner.getStartPos();
+        function parseJsxOpeningOrSelfClosingElement(inExpressionContext: boolean): JsxOpeningElement | JsxSelfClosingElement {
+            const fullStart = scanner.getStartPos();
 
             parseExpected(SyntaxKind.LessThanToken);
 
-            let tagName = parseJsxElementName();
+            const tagName = parseJsxElementName();
 
-            let attributes = parseList(ParsingContext.JsxAttributes, parseJsxAttribute);
+            const attributes = parseList(ParsingContext.JsxAttributes, parseJsxAttribute);
             let node: JsxOpeningLikeElement;
 
             if (token === SyntaxKind.GreaterThanToken) {
@@ -3535,7 +3573,7 @@ namespace ts {
                     parseExpected(SyntaxKind.GreaterThanToken);
                 }
                 else {
-                    parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*advance*/ false);
+                    parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
                 node = <JsxSelfClosingElement>createNode(SyntaxKind.JsxSelfClosingElement, fullStart);
@@ -3552,7 +3590,7 @@ namespace ts {
             let elementName: EntityName = parseIdentifierName();
             while (parseOptional(SyntaxKind.DotToken)) {
                 scanJsxIdentifier();
-                let node = <QualifiedName>createNode(SyntaxKind.QualifiedName, elementName.pos);
+                const node = <QualifiedName>createNode(SyntaxKind.QualifiedName, elementName.pos);
                 node.left = elementName;
                 node.right = parseIdentifierName();
                 elementName = finishNode(node);
@@ -3561,7 +3599,7 @@ namespace ts {
         }
 
         function parseJsxExpression(inExpressionContext: boolean): JsxExpression {
-            let node = <JsxExpression>createNode(SyntaxKind.JsxExpression);
+            const node = <JsxExpression>createNode(SyntaxKind.JsxExpression);
 
             parseExpected(SyntaxKind.OpenBraceToken);
             if (token !== SyntaxKind.CloseBraceToken) {
@@ -3571,7 +3609,7 @@ namespace ts {
                 parseExpected(SyntaxKind.CloseBraceToken);
             }
             else {
-                parseExpected(SyntaxKind.CloseBraceToken, /*message*/ undefined, /*advance*/ false);
+                parseExpected(SyntaxKind.CloseBraceToken, /*message*/ undefined, /*shouldAdvance*/ false);
                 scanJsxText();
             }
 
@@ -3584,7 +3622,7 @@ namespace ts {
             }
 
             scanJsxIdentifier();
-            let node = <JsxAttribute>createNode(SyntaxKind.JsxAttribute);
+            const node = <JsxAttribute>createNode(SyntaxKind.JsxAttribute);
             node.name = parseIdentifierName();
             if (parseOptional(SyntaxKind.EqualsToken)) {
                 switch (token) {
@@ -3600,7 +3638,7 @@ namespace ts {
         }
 
         function parseJsxSpreadAttribute(): JsxSpreadAttribute {
-            let node = <JsxSpreadAttribute>createNode(SyntaxKind.JsxSpreadAttribute);
+            const node = <JsxSpreadAttribute>createNode(SyntaxKind.JsxSpreadAttribute);
             parseExpected(SyntaxKind.OpenBraceToken);
             parseExpected(SyntaxKind.DotDotDotToken);
             node.expression = parseExpression();
@@ -3609,21 +3647,21 @@ namespace ts {
         }
 
         function parseJsxClosingElement(inExpressionContext: boolean): JsxClosingElement {
-            let node = <JsxClosingElement>createNode(SyntaxKind.JsxClosingElement);
+            const node = <JsxClosingElement>createNode(SyntaxKind.JsxClosingElement);
             parseExpected(SyntaxKind.LessThanSlashToken);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
                 parseExpected(SyntaxKind.GreaterThanToken);
             }
             else {
-                parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*advance*/ false);
+                parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                 scanJsxText();
             }
             return finishNode(node);
         }
 
         function parseTypeAssertion(): TypeAssertion {
-            let node = <TypeAssertion>createNode(SyntaxKind.TypeAssertionExpression);
+            const node = <TypeAssertion>createNode(SyntaxKind.TypeAssertionExpression);
             parseExpected(SyntaxKind.LessThanToken);
             node.type = parseType();
             parseExpected(SyntaxKind.GreaterThanToken);
@@ -3633,9 +3671,9 @@ namespace ts {
 
         function parseMemberExpressionRest(expression: LeftHandSideExpression): MemberExpression {
             while (true) {
-                let dotToken = parseOptionalToken(SyntaxKind.DotToken);
+                const dotToken = parseOptionalToken(SyntaxKind.DotToken);
                 if (dotToken) {
-                    let propertyAccess = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
+                    const propertyAccess = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.dotToken = dotToken;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -3645,7 +3683,7 @@ namespace ts {
 
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(SyntaxKind.OpenBracketToken)) {
-                    let indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
+                    const indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
                     indexedAccess.expression = expression;
 
                     // It's not uncommon for a user to write: "new Type[]".
@@ -3653,7 +3691,7 @@ namespace ts {
                     if (token !== SyntaxKind.CloseBracketToken) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
                         if (indexedAccess.argumentExpression.kind === SyntaxKind.StringLiteral || indexedAccess.argumentExpression.kind === SyntaxKind.NumericLiteral) {
-                            let literal = <LiteralExpression>indexedAccess.argumentExpression;
+                            const literal = <LiteralExpression>indexedAccess.argumentExpression;
                             literal.text = internIdentifier(literal.text);
                         }
                     }
@@ -3664,7 +3702,7 @@ namespace ts {
                 }
 
                 if (token === SyntaxKind.NoSubstitutionTemplateLiteral || token === SyntaxKind.TemplateHead) {
-                    let tagExpression = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, expression.pos);
+                    const tagExpression = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token === SyntaxKind.NoSubstitutionTemplateLiteral
                         ? parseLiteralNode()
@@ -3685,12 +3723,12 @@ namespace ts {
                     // keep checking for postfix expressions.  Otherwise, it's just a '<' that's
                     // part of an arithmetic expression.  Break out so we consume it higher in the
                     // stack.
-                    let typeArguments = tryParse(parseTypeArgumentsInExpression);
+                    const typeArguments = tryParse(parseTypeArgumentsInExpression);
                     if (!typeArguments) {
                         return expression;
                     }
 
-                    let callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
+                    const callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -3698,7 +3736,7 @@ namespace ts {
                     continue;
                 }
                 else if (token === SyntaxKind.OpenParenToken) {
-                    let callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
+                    const callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -3711,7 +3749,7 @@ namespace ts {
 
         function parseArgumentList() {
             parseExpected(SyntaxKind.OpenParenToken);
-            let result = parseDelimitedList(ParsingContext.ArgumentExpressions, parseArgumentExpression);
+            const result = parseDelimitedList(ParsingContext.ArgumentExpressions, parseArgumentExpression);
             parseExpected(SyntaxKind.CloseParenToken);
             return result;
         }
@@ -3721,7 +3759,7 @@ namespace ts {
                 return undefined;
             }
 
-            let typeArguments = parseDelimitedList(ParsingContext.TypeArguments, parseType);
+            const typeArguments = parseDelimitedList(ParsingContext.TypeArguments, parseType);
             if (!parseExpected(SyntaxKind.GreaterThanToken)) {
                 // If it doesn't have the closing >  then it's definitely not an type argument list.
                 return undefined;
@@ -3821,7 +3859,7 @@ namespace ts {
         }
 
         function parseParenthesizedExpression(): ParenthesizedExpression {
-            let node = <ParenthesizedExpression>createNode(SyntaxKind.ParenthesizedExpression);
+            const node = <ParenthesizedExpression>createNode(SyntaxKind.ParenthesizedExpression);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
             parseExpected(SyntaxKind.CloseParenToken);
@@ -3829,7 +3867,7 @@ namespace ts {
         }
 
         function parseSpreadElement(): Expression {
-            let node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression);
+            const node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression);
             parseExpected(SyntaxKind.DotDotDotToken);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
@@ -3846,7 +3884,7 @@ namespace ts {
         }
 
         function parseArrayLiteralExpression(): ArrayLiteralExpression {
-            let node = <ArrayLiteralExpression>createNode(SyntaxKind.ArrayLiteralExpression);
+            const node = <ArrayLiteralExpression>createNode(SyntaxKind.ArrayLiteralExpression);
             parseExpected(SyntaxKind.OpenBracketToken);
             if (scanner.hasPrecedingLineBreak()) node.flags |= NodeFlags.MultiLine;
             node.elements = parseDelimitedList(ParsingContext.ArrayLiteralMembers, parseArgumentOrArrayLiteralElement);
@@ -3866,22 +3904,22 @@ namespace ts {
         }
 
         function parseObjectLiteralElement(): ObjectLiteralElement {
-            let fullStart = scanner.getStartPos();
-            let decorators = parseDecorators();
-            let modifiers = parseModifiers();
+            const fullStart = scanner.getStartPos();
+            const decorators = parseDecorators();
+            const modifiers = parseModifiers();
 
-            let accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
+            const accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
             if (accessor) {
                 return accessor;
             }
 
-            let asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
-            let tokenIsIdentifier = isIdentifier();
-            let nameToken = token;
-            let propertyName = parsePropertyName();
+            const asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
+            const tokenIsIdentifier = isIdentifier();
+            const nameToken = token;
+            const propertyName = parsePropertyName();
 
             // Disallowing of optional property assignments happens in the grammar checker.
-            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (asteriskToken || token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
                 return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken);
             }
@@ -3895,7 +3933,7 @@ namespace ts {
                 tokenIsIdentifier && (token === SyntaxKind.CommaToken || token === SyntaxKind.CloseBraceToken || token === SyntaxKind.EqualsToken);
 
             if (isShorthandPropertyAssignment) {
-                let shorthandDeclaration = <ShorthandPropertyAssignment>createNode(SyntaxKind.ShorthandPropertyAssignment, fullStart);
+                const shorthandDeclaration = <ShorthandPropertyAssignment>createNode(SyntaxKind.ShorthandPropertyAssignment, fullStart);
                 shorthandDeclaration.name = <Identifier>propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 const equalsToken = parseOptionalToken(SyntaxKind.EqualsToken);
@@ -3906,7 +3944,7 @@ namespace ts {
                 return finishNode(shorthandDeclaration);
             }
             else {
-                let propertyAssignment = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, fullStart);
+                const propertyAssignment = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, fullStart);
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(SyntaxKind.ColonToken);
@@ -3916,7 +3954,7 @@ namespace ts {
         }
 
         function parseObjectLiteralExpression(): ObjectLiteralExpression {
-            let node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression);
+            const node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression);
             parseExpected(SyntaxKind.OpenBraceToken);
             if (scanner.hasPrecedingLineBreak()) {
                 node.flags |= NodeFlags.MultiLine;
@@ -3933,18 +3971,18 @@ namespace ts {
             //
             // FunctionExpression:
             //      function BindingIdentifier[opt](FormalParameters){ FunctionBody }
-            let saveDecoratorContext = inDecoratorContext();
+            const saveDecoratorContext = inDecoratorContext();
             if (saveDecoratorContext) {
-                setDecoratorContext(false);
+                setDecoratorContext(/*val*/ false);
             }
 
-            let node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression);
+            const node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression);
             setModifiers(node, parseModifiers());
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
 
-            let isGenerator = !!node.asteriskToken;
-            let isAsync = !!(node.flags & NodeFlags.Async);
+            const isGenerator = !!node.asteriskToken;
+            const isAsync = !!(node.flags & NodeFlags.Async);
             node.name =
                 isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
                 isGenerator ? doInYieldContext(parseOptionalIdentifier) :
@@ -3955,7 +3993,7 @@ namespace ts {
             node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false);
 
             if (saveDecoratorContext) {
-                setDecoratorContext(true);
+                setDecoratorContext(/*val*/ true);
             }
 
             return finishNode(node);
@@ -3966,7 +4004,7 @@ namespace ts {
         }
 
         function parseNewExpression(): NewExpression {
-            let node = <NewExpression>createNode(SyntaxKind.NewExpression);
+            const node = <NewExpression>createNode(SyntaxKind.NewExpression);
             parseExpected(SyntaxKind.NewKeyword);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -3979,7 +4017,7 @@ namespace ts {
 
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace: boolean, diagnosticMessage?: DiagnosticMessage): Block {
-            let node = <Block>createNode(SyntaxKind.Block);
+            const node = <Block>createNode(SyntaxKind.Block);
             if (parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage) || ignoreMissingOpenBrace) {
                 node.statements = parseList(ParsingContext.BlockStatements, parseStatement);
                 parseExpected(SyntaxKind.CloseBraceToken);
@@ -3991,23 +4029,23 @@ namespace ts {
         }
 
         function parseFunctionBlock(allowYield: boolean, allowAwait: boolean, ignoreMissingOpenBrace: boolean, diagnosticMessage?: DiagnosticMessage): Block {
-            let savedYieldContext = inYieldContext();
+            const savedYieldContext = inYieldContext();
             setYieldContext(allowYield);
 
-            let savedAwaitContext = inAwaitContext();
+            const savedAwaitContext = inAwaitContext();
             setAwaitContext(allowAwait);
 
             // We may be in a [Decorator] context when parsing a function expression or
             // arrow function. The body of the function is not in [Decorator] context.
-            let saveDecoratorContext = inDecoratorContext();
+            const saveDecoratorContext = inDecoratorContext();
             if (saveDecoratorContext) {
-                setDecoratorContext(false);
+                setDecoratorContext(/*val*/ false);
             }
 
-            let block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage);
+            const block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage);
 
             if (saveDecoratorContext) {
-                setDecoratorContext(true);
+                setDecoratorContext(/*val*/ true);
             }
 
             setYieldContext(savedYieldContext);
@@ -4017,13 +4055,13 @@ namespace ts {
         }
 
         function parseEmptyStatement(): Statement {
-            let node = <Statement>createNode(SyntaxKind.EmptyStatement);
+            const node = <Statement>createNode(SyntaxKind.EmptyStatement);
             parseExpected(SyntaxKind.SemicolonToken);
             return finishNode(node);
         }
 
         function parseIfStatement(): IfStatement {
-            let node = <IfStatement>createNode(SyntaxKind.IfStatement);
+            const node = <IfStatement>createNode(SyntaxKind.IfStatement);
             parseExpected(SyntaxKind.IfKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
@@ -4034,7 +4072,7 @@ namespace ts {
         }
 
         function parseDoStatement(): DoStatement {
-            let node = <DoStatement>createNode(SyntaxKind.DoStatement);
+            const node = <DoStatement>createNode(SyntaxKind.DoStatement);
             parseExpected(SyntaxKind.DoKeyword);
             node.statement = parseStatement();
             parseExpected(SyntaxKind.WhileKeyword);
@@ -4051,7 +4089,7 @@ namespace ts {
         }
 
         function parseWhileStatement(): WhileStatement {
-            let node = <WhileStatement>createNode(SyntaxKind.WhileStatement);
+            const node = <WhileStatement>createNode(SyntaxKind.WhileStatement);
             parseExpected(SyntaxKind.WhileKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
@@ -4061,7 +4099,7 @@ namespace ts {
         }
 
         function parseForOrForInOrForOfStatement(): Statement {
-            let pos = getNodePos();
+            const pos = getNodePos();
             parseExpected(SyntaxKind.ForKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
 
@@ -4076,21 +4114,21 @@ namespace ts {
             }
             let forOrForInOrForOfStatement: IterationStatement;
             if (parseOptional(SyntaxKind.InKeyword)) {
-                let forInStatement = <ForInStatement>createNode(SyntaxKind.ForInStatement, pos);
+                const forInStatement = <ForInStatement>createNode(SyntaxKind.ForInStatement, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(SyntaxKind.CloseParenToken);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else if (parseOptional(SyntaxKind.OfKeyword)) {
-                let forOfStatement = <ForOfStatement>createNode(SyntaxKind.ForOfStatement, pos);
+                const forOfStatement = <ForOfStatement>createNode(SyntaxKind.ForOfStatement, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(SyntaxKind.CloseParenToken);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                let forStatement = <ForStatement>createNode(SyntaxKind.ForStatement, pos);
+                const forStatement = <ForStatement>createNode(SyntaxKind.ForStatement, pos);
                 forStatement.initializer = initializer;
                 parseExpected(SyntaxKind.SemicolonToken);
                 if (token !== SyntaxKind.SemicolonToken && token !== SyntaxKind.CloseParenToken) {
@@ -4110,7 +4148,7 @@ namespace ts {
         }
 
         function parseBreakOrContinueStatement(kind: SyntaxKind): BreakOrContinueStatement {
-            let node = <BreakOrContinueStatement>createNode(kind);
+            const node = <BreakOrContinueStatement>createNode(kind);
 
             parseExpected(kind === SyntaxKind.BreakStatement ? SyntaxKind.BreakKeyword : SyntaxKind.ContinueKeyword);
             if (!canParseSemicolon()) {
@@ -4122,7 +4160,7 @@ namespace ts {
         }
 
         function parseReturnStatement(): ReturnStatement {
-            let node = <ReturnStatement>createNode(SyntaxKind.ReturnStatement);
+            const node = <ReturnStatement>createNode(SyntaxKind.ReturnStatement);
 
             parseExpected(SyntaxKind.ReturnKeyword);
             if (!canParseSemicolon()) {
@@ -4134,7 +4172,7 @@ namespace ts {
         }
 
         function parseWithStatement(): WithStatement {
-            let node = <WithStatement>createNode(SyntaxKind.WithStatement);
+            const node = <WithStatement>createNode(SyntaxKind.WithStatement);
             parseExpected(SyntaxKind.WithKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
@@ -4144,7 +4182,7 @@ namespace ts {
         }
 
         function parseCaseClause(): CaseClause {
-            let node = <CaseClause>createNode(SyntaxKind.CaseClause);
+            const node = <CaseClause>createNode(SyntaxKind.CaseClause);
             parseExpected(SyntaxKind.CaseKeyword);
             node.expression = allowInAnd(parseExpression);
             parseExpected(SyntaxKind.ColonToken);
@@ -4153,7 +4191,7 @@ namespace ts {
         }
 
         function parseDefaultClause(): DefaultClause {
-            let node = <DefaultClause>createNode(SyntaxKind.DefaultClause);
+            const node = <DefaultClause>createNode(SyntaxKind.DefaultClause);
             parseExpected(SyntaxKind.DefaultKeyword);
             parseExpected(SyntaxKind.ColonToken);
             node.statements = parseList(ParsingContext.SwitchClauseStatements, parseStatement);
@@ -4165,12 +4203,12 @@ namespace ts {
         }
 
         function parseSwitchStatement(): SwitchStatement {
-            let node = <SwitchStatement>createNode(SyntaxKind.SwitchStatement);
+            const node = <SwitchStatement>createNode(SyntaxKind.SwitchStatement);
             parseExpected(SyntaxKind.SwitchKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
             parseExpected(SyntaxKind.CloseParenToken);
-            let caseBlock = <CaseBlock>createNode(SyntaxKind.CaseBlock, scanner.getStartPos());
+            const caseBlock = <CaseBlock>createNode(SyntaxKind.CaseBlock, scanner.getStartPos());
             parseExpected(SyntaxKind.OpenBraceToken);
             caseBlock.clauses = parseList(ParsingContext.SwitchClauses, parseCaseOrDefaultClause);
             parseExpected(SyntaxKind.CloseBraceToken);
@@ -4187,7 +4225,7 @@ namespace ts {
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            let node = <ThrowStatement>createNode(SyntaxKind.ThrowStatement);
+            const node = <ThrowStatement>createNode(SyntaxKind.ThrowStatement);
             parseExpected(SyntaxKind.ThrowKeyword);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
@@ -4196,7 +4234,7 @@ namespace ts {
 
         // TODO: Review for error recovery
         function parseTryStatement(): TryStatement {
-            let node = <TryStatement>createNode(SyntaxKind.TryStatement);
+            const node = <TryStatement>createNode(SyntaxKind.TryStatement);
 
             parseExpected(SyntaxKind.TryKeyword);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
@@ -4213,7 +4251,7 @@ namespace ts {
         }
 
         function parseCatchClause(): CatchClause {
-            let result = <CatchClause>createNode(SyntaxKind.CatchClause);
+            const result = <CatchClause>createNode(SyntaxKind.CatchClause);
             parseExpected(SyntaxKind.CatchKeyword);
             if (parseExpected(SyntaxKind.OpenParenToken)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -4225,7 +4263,7 @@ namespace ts {
         }
 
         function parseDebuggerStatement(): Statement {
-            let node = <Statement>createNode(SyntaxKind.DebuggerStatement);
+            const node = <Statement>createNode(SyntaxKind.DebuggerStatement);
             parseExpected(SyntaxKind.DebuggerKeyword);
             parseSemicolon();
             return finishNode(node);
@@ -4235,17 +4273,17 @@ namespace ts {
             // Avoiding having to do the lookahead for a labeled statement by just trying to parse
             // out an expression, seeing if it is identifier and then seeing if it is followed by
             // a colon.
-            let fullStart = scanner.getStartPos();
-            let expression = allowInAnd(parseExpression);
+            const fullStart = scanner.getStartPos();
+            const expression = allowInAnd(parseExpression);
 
             if (expression.kind === SyntaxKind.Identifier && parseOptional(SyntaxKind.ColonToken)) {
-                let labeledStatement = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, fullStart);
+                const labeledStatement = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, fullStart);
                 labeledStatement.label = <Identifier>expression;
                 labeledStatement.statement = parseStatement();
                 return finishNode(labeledStatement);
             }
             else {
-                let expressionStatement = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, fullStart);
+                const expressionStatement = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return finishNode(expressionStatement);
@@ -4479,9 +4517,9 @@ namespace ts {
         }
 
         function parseDeclaration(): Statement {
-            let fullStart = getNodePos();
-            let decorators = parseDecorators();
-            let modifiers = parseModifiers();
+            const fullStart = getNodePos();
+            const decorators = parseDecorators();
+            const modifiers = parseModifiers();
             switch (token) {
                 case SyntaxKind.VarKeyword:
                 case SyntaxKind.LetKeyword:
@@ -4511,7 +4549,7 @@ namespace ts {
                     if (decorators || modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        let node = <Statement>createMissingNode(SyntaxKind.MissingDeclaration, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
+                        const node = <Statement>createMissingNode(SyntaxKind.MissingDeclaration, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         setModifiers(node, modifiers);
@@ -4540,7 +4578,7 @@ namespace ts {
             if (token === SyntaxKind.CommaToken) {
                 return <BindingElement>createNode(SyntaxKind.OmittedExpression);
             }
-            let node = <BindingElement>createNode(SyntaxKind.BindingElement);
+            const node = <BindingElement>createNode(SyntaxKind.BindingElement);
             node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
@@ -4548,16 +4586,15 @@ namespace ts {
         }
 
         function parseObjectBindingElement(): BindingElement {
-            let node = <BindingElement>createNode(SyntaxKind.BindingElement);
-            // TODO(andersh): Handle computed properties
-            let tokenIsIdentifier = isIdentifier();
-            let propertyName = parsePropertyName();
+            const node = <BindingElement>createNode(SyntaxKind.BindingElement);
+            const tokenIsIdentifier = isIdentifier();
+            const propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== SyntaxKind.ColonToken) {
                 node.name = <Identifier>propertyName;
             }
             else {
                 parseExpected(SyntaxKind.ColonToken);
-                node.propertyName = <Identifier>propertyName;
+                node.propertyName = propertyName;
                 node.name = parseIdentifierOrPattern();
             }
             node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
@@ -4565,7 +4602,7 @@ namespace ts {
         }
 
         function parseObjectBindingPattern(): BindingPattern {
-            let node = <BindingPattern>createNode(SyntaxKind.ObjectBindingPattern);
+            const node = <BindingPattern>createNode(SyntaxKind.ObjectBindingPattern);
             parseExpected(SyntaxKind.OpenBraceToken);
             node.elements = parseDelimitedList(ParsingContext.ObjectBindingElements, parseObjectBindingElement);
             parseExpected(SyntaxKind.CloseBraceToken);
@@ -4573,7 +4610,7 @@ namespace ts {
         }
 
         function parseArrayBindingPattern(): BindingPattern {
-            let node = <BindingPattern>createNode(SyntaxKind.ArrayBindingPattern);
+            const node = <BindingPattern>createNode(SyntaxKind.ArrayBindingPattern);
             parseExpected(SyntaxKind.OpenBracketToken);
             node.elements = parseDelimitedList(ParsingContext.ArrayBindingElements, parseArrayBindingElement);
             parseExpected(SyntaxKind.CloseBracketToken);
@@ -4595,7 +4632,7 @@ namespace ts {
         }
 
         function parseVariableDeclaration(): VariableDeclaration {
-            let node = <VariableDeclaration>createNode(SyntaxKind.VariableDeclaration);
+            const node = <VariableDeclaration>createNode(SyntaxKind.VariableDeclaration);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token)) {
@@ -4605,7 +4642,7 @@ namespace ts {
         }
 
         function parseVariableDeclarationList(inForStatementInitializer: boolean): VariableDeclarationList {
-            let node = <VariableDeclarationList>createNode(SyntaxKind.VariableDeclarationList);
+            const node = <VariableDeclarationList>createNode(SyntaxKind.VariableDeclarationList);
 
             switch (token) {
                 case SyntaxKind.VarKeyword:
@@ -4635,7 +4672,7 @@ namespace ts {
                 node.declarations = createMissingList<VariableDeclaration>();
             }
             else {
-                let savedDisallowIn = inDisallowInContext();
+                const savedDisallowIn = inDisallowInContext();
                 setDisallowInContext(inForStatementInitializer);
 
                 node.declarations = parseDelimitedList(ParsingContext.VariableDeclarations, parseVariableDeclaration);
@@ -4651,7 +4688,7 @@ namespace ts {
         }
 
         function parseVariableStatement(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): VariableStatement {
-            let node = <VariableStatement>createNode(SyntaxKind.VariableStatement, fullStart);
+            const node = <VariableStatement>createNode(SyntaxKind.VariableStatement, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
@@ -4660,21 +4697,21 @@ namespace ts {
         }
 
         function parseFunctionDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): FunctionDeclaration {
-            let node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, fullStart);
+            const node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
             node.name = node.flags & NodeFlags.Default ? parseOptionalIdentifier() : parseIdentifier();
-            let isGenerator = !!node.asteriskToken;
-            let isAsync = !!(node.flags & NodeFlags.Async);
+            const isGenerator = !!node.asteriskToken;
+            const isAsync = !!(node.flags & NodeFlags.Async);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, Diagnostics.or_expected);
             return finishNode(node);
         }
 
         function parseConstructorDeclaration(pos: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ConstructorDeclaration {
-            let node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, pos);
+            const node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, pos);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ConstructorKeyword);
@@ -4683,22 +4720,22 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, asteriskToken: Node, name: DeclarationName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
-            let method = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, fullStart);
+        function parseMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, asteriskToken: Node, name: PropertyName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
+            const method = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, fullStart);
             method.decorators = decorators;
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
             method.name = name;
             method.questionToken = questionToken;
-            let isGenerator = !!asteriskToken;
-            let isAsync = !!(method.flags & NodeFlags.Async);
+            const isGenerator = !!asteriskToken;
+            const isAsync = !!(method.flags & NodeFlags.Async);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
             return finishNode(method);
         }
 
-        function parsePropertyDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, name: DeclarationName, questionToken: Node): ClassElement {
-            let property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
+        function parsePropertyDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, name: PropertyName, questionToken: Node): ClassElement {
+            const property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
             property.decorators = decorators;
             setModifiers(property, modifiers);
             property.name = name;
@@ -4723,12 +4760,12 @@ namespace ts {
         }
 
         function parsePropertyOrMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ClassElement {
-            let asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
-            let name = parsePropertyName();
+            const asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
+            const name = parsePropertyName();
 
             // Note: this is not legal as per the grammar.  But we allow it in the parser and
             // report an error in the grammar checker.
-            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (asteriskToken || token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
                 return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, Diagnostics.or_expected);
             }
@@ -4742,7 +4779,7 @@ namespace ts {
         }
 
         function parseAccessorDeclaration(kind: SyntaxKind, fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {
-            let node = <AccessorDeclaration>createNode(kind, fullStart);
+            const node = <AccessorDeclaration>createNode(kind, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.name = parsePropertyName();
@@ -4771,7 +4808,7 @@ namespace ts {
             }
 
             // Eat up all modifiers, but hold on to the last one in case it is actually an identifier.
-            while (isModifier(token)) {
+            while (isModifierKind(token)) {
                 idToken = token;
                 // If the idToken is a class modifier (protected, private, public, and static), it is
                 // certain that we are starting to parse class member. This allows better error recovery
@@ -4834,7 +4871,7 @@ namespace ts {
         function parseDecorators(): NodeArray<Decorator> {
             let decorators: NodeArray<Decorator>;
             while (true) {
-                let decoratorStart = getNodePos();
+                const decoratorStart = getNodePos();
                 if (!parseOptional(SyntaxKind.AtToken)) {
                     break;
                 }
@@ -4844,7 +4881,7 @@ namespace ts {
                     decorators.pos = scanner.getStartPos();
                 }
 
-                let decorator = <Decorator>createNode(SyntaxKind.Decorator, decoratorStart);
+                const decorator = <Decorator>createNode(SyntaxKind.Decorator, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 decorators.push(finishNode(decorator));
             }
@@ -4858,8 +4895,8 @@ namespace ts {
             let flags = 0;
             let modifiers: ModifiersArray;
             while (true) {
-                let modifierStart = scanner.getStartPos();
-                let modifierKind = token;
+                const modifierStart = scanner.getStartPos();
+                const modifierKind = token;
 
                 if (!parseAnyContextualModifier()) {
                     break;
@@ -4884,8 +4921,8 @@ namespace ts {
             let flags = 0;
             let modifiers: ModifiersArray;
             if (token === SyntaxKind.AsyncKeyword) {
-                let modifierStart = scanner.getStartPos();
-                let modifierKind = token;
+                const modifierStart = scanner.getStartPos();
+                const modifierKind = token;
                 nextToken();
                 modifiers = <ModifiersArray>[];
                 modifiers.pos = modifierStart;
@@ -4900,16 +4937,16 @@ namespace ts {
 
         function parseClassElement(): ClassElement {
             if (token === SyntaxKind.SemicolonToken) {
-                let result = <SemicolonClassElement>createNode(SyntaxKind.SemicolonClassElement);
+                const result = <SemicolonClassElement>createNode(SyntaxKind.SemicolonClassElement);
                 nextToken();
                 return finishNode(result);
             }
 
-            let fullStart = getNodePos();
-            let decorators = parseDecorators();
-            let modifiers = parseModifiers();
+            const fullStart = getNodePos();
+            const decorators = parseDecorators();
+            const modifiers = parseModifiers();
 
-            let accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
+            const accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
             if (accessor) {
                 return accessor;
             }
@@ -4935,7 +4972,7 @@ namespace ts {
 
             if (decorators || modifiers) {
                 // treat this as a property declaration with a missing name.
-                let name = <Identifier>createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
+                const name = <Identifier>createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(fullStart, decorators, modifiers, name, /*questionToken*/ undefined);
             }
 
@@ -4956,7 +4993,7 @@ namespace ts {
         }
 
         function parseClassDeclarationOrExpression(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, kind: SyntaxKind): ClassLikeDeclaration {
-            let node = <ClassLikeDeclaration>createNode(kind, fullStart);
+            const node = <ClassLikeDeclaration>createNode(kind, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ClassKeyword);
@@ -4981,8 +5018,8 @@ namespace ts {
             // implements is a future reserved word so
             // 'class implements' might mean either
             // - class expression with omitted name, 'implements' starts heritage clause
-            // - class with name 'implements' 
-            // 'isImplementsClause' helps to disambiguate between these two cases 
+            // - class with name 'implements'
+            // 'isImplementsClause' helps to disambiguate between these two cases
             return isIdentifier() && !isImplementsClause()
                 ? parseIdentifier()
                 : undefined;
@@ -5009,7 +5046,7 @@ namespace ts {
 
         function parseHeritageClause() {
             if (token === SyntaxKind.ExtendsKeyword || token === SyntaxKind.ImplementsKeyword) {
-                let node = <HeritageClause>createNode(SyntaxKind.HeritageClause);
+                const node = <HeritageClause>createNode(SyntaxKind.HeritageClause);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(ParsingContext.HeritageClauseElement, parseExpressionWithTypeArguments);
@@ -5020,7 +5057,7 @@ namespace ts {
         }
 
         function parseExpressionWithTypeArguments(): ExpressionWithTypeArguments {
-            let node = <ExpressionWithTypeArguments>createNode(SyntaxKind.ExpressionWithTypeArguments);
+            const node = <ExpressionWithTypeArguments>createNode(SyntaxKind.ExpressionWithTypeArguments);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token === SyntaxKind.LessThanToken) {
                 node.typeArguments = parseBracketedList(ParsingContext.TypeArguments, parseType, SyntaxKind.LessThanToken, SyntaxKind.GreaterThanToken);
@@ -5038,7 +5075,7 @@ namespace ts {
         }
 
         function parseInterfaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): InterfaceDeclaration {
-            let node = <InterfaceDeclaration>createNode(SyntaxKind.InterfaceDeclaration, fullStart);
+            const node = <InterfaceDeclaration>createNode(SyntaxKind.InterfaceDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.InterfaceKeyword);
@@ -5050,7 +5087,7 @@ namespace ts {
         }
 
         function parseTypeAliasDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): TypeAliasDeclaration {
-            let node = <TypeAliasDeclaration>createNode(SyntaxKind.TypeAliasDeclaration, fullStart);
+            const node = <TypeAliasDeclaration>createNode(SyntaxKind.TypeAliasDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.TypeKeyword);
@@ -5067,14 +5104,14 @@ namespace ts {
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember(): EnumMember {
-            let node = <EnumMember>createNode(SyntaxKind.EnumMember, scanner.getStartPos());
+            const node = <EnumMember>createNode(SyntaxKind.EnumMember, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
         }
 
         function parseEnumDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): EnumDeclaration {
-            let node = <EnumDeclaration>createNode(SyntaxKind.EnumDeclaration, fullStart);
+            const node = <EnumDeclaration>createNode(SyntaxKind.EnumDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.EnumKeyword);
@@ -5090,7 +5127,7 @@ namespace ts {
         }
 
         function parseModuleBlock(): ModuleBlock {
-            let node = <ModuleBlock>createNode(SyntaxKind.ModuleBlock, scanner.getStartPos());
+            const node = <ModuleBlock>createNode(SyntaxKind.ModuleBlock, scanner.getStartPos());
             if (parseExpected(SyntaxKind.OpenBraceToken)) {
                 node.statements = parseList(ParsingContext.BlockStatements, parseStatement);
                 parseExpected(SyntaxKind.CloseBraceToken);
@@ -5102,10 +5139,10 @@ namespace ts {
         }
 
         function parseModuleOrNamespaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, flags: NodeFlags): ModuleDeclaration {
-            let node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
+            const node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
-            let namespaceFlag = flags & NodeFlags.Namespace;
+            const namespaceFlag = flags & NodeFlags.Namespace;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
@@ -5117,7 +5154,7 @@ namespace ts {
         }
 
         function parseAmbientExternalModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ModuleDeclaration {
-            let node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
+            const node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.name = parseLiteralNode(/*internName*/ true);
@@ -5160,7 +5197,7 @@ namespace ts {
 
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
             parseExpected(SyntaxKind.ImportKeyword);
-            let afterImportPos = scanner.getStartPos();
+            const afterImportPos = scanner.getStartPos();
 
             let identifier: Identifier;
             if (isIdentifier()) {
@@ -5169,7 +5206,7 @@ namespace ts {
                     // ImportEquals declaration of type:
                     // import x = require("mod"); or
                     // import x = M.x;
-                    let importEqualsDeclaration = <ImportEqualsDeclaration>createNode(SyntaxKind.ImportEqualsDeclaration, fullStart);
+                    const importEqualsDeclaration = <ImportEqualsDeclaration>createNode(SyntaxKind.ImportEqualsDeclaration, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
@@ -5181,7 +5218,7 @@ namespace ts {
             }
 
             // Import statement
-            let importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
+            const importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
             importDeclaration.decorators = decorators;
             setModifiers(importDeclaration, modifiers);
 
@@ -5208,7 +5245,7 @@ namespace ts {
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
 
-            let importClause = <ImportClause>createNode(SyntaxKind.ImportClause, fullStart);
+            const importClause = <ImportClause>createNode(SyntaxKind.ImportClause, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -5232,7 +5269,7 @@ namespace ts {
         }
 
         function parseExternalModuleReference() {
-            let node = <ExternalModuleReference>createNode(SyntaxKind.ExternalModuleReference);
+            const node = <ExternalModuleReference>createNode(SyntaxKind.ExternalModuleReference);
             parseExpected(SyntaxKind.RequireKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = parseModuleSpecifier();
@@ -5244,7 +5281,7 @@ namespace ts {
             // We allow arbitrary expressions here, even though the grammar only allows string
             // literals.  We check to ensure that it is only a string literal later in the grammar
             // walker.
-            let result = parseExpression();
+            const result = parseExpression();
             // Ensure the string being required is in our 'identifier' table.  This will ensure
             // that features like 'find refs' will look inside this file when search for its name.
             if (result.kind === SyntaxKind.StringLiteral) {
@@ -5256,7 +5293,7 @@ namespace ts {
         function parseNamespaceImport(): NamespaceImport {
             // NameSpaceImport:
             //  * as ImportedBinding
-            let namespaceImport = <NamespaceImport>createNode(SyntaxKind.NamespaceImport);
+            const namespaceImport = <NamespaceImport>createNode(SyntaxKind.NamespaceImport);
             parseExpected(SyntaxKind.AsteriskToken);
             parseExpected(SyntaxKind.AsKeyword);
             namespaceImport.name = parseIdentifier();
@@ -5264,7 +5301,7 @@ namespace ts {
         }
 
         function parseNamedImportsOrExports(kind: SyntaxKind): NamedImportsOrExports {
-            let node = <NamedImports>createNode(kind);
+            const node = <NamedImports>createNode(kind);
 
             // NamedImports:
             //  { }
@@ -5289,7 +5326,7 @@ namespace ts {
         }
 
         function parseImportOrExportSpecifier(kind: SyntaxKind): ImportOrExportSpecifier {
-            let node = <ImportSpecifier>createNode(kind);
+            const node = <ImportSpecifier>createNode(kind);
             // ImportSpecifier:
             //   BindingIdentifier
             //   IdentifierName as BindingIdentifier
@@ -5299,7 +5336,7 @@ namespace ts {
             let checkIdentifierIsKeyword = isKeyword(token) && !isIdentifier();
             let checkIdentifierStart = scanner.getTokenPos();
             let checkIdentifierEnd = scanner.getTextPos();
-            let identifierName = parseIdentifierName();
+            const identifierName = parseIdentifierName();
             if (token === SyntaxKind.AsKeyword) {
                 node.propertyName = identifierName;
                 parseExpected(SyntaxKind.AsKeyword);
@@ -5319,7 +5356,7 @@ namespace ts {
         }
 
         function parseExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ExportDeclaration {
-            let node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, fullStart);
+            const node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(SyntaxKind.AsteriskToken)) {
@@ -5342,7 +5379,7 @@ namespace ts {
         }
 
         function parseExportAssignment(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ExportAssignment {
-            let node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, fullStart);
+            const node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(SyntaxKind.EqualsToken)) {
@@ -5357,16 +5394,16 @@ namespace ts {
         }
 
         function processReferenceComments(sourceFile: SourceFile): void {
-            let triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, LanguageVariant.Standard, sourceText);
-            let referencedFiles: FileReference[] = [];
-            let amdDependencies: { path: string; name: string }[] = [];
+            const triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, LanguageVariant.Standard, sourceText);
+            const referencedFiles: FileReference[] = [];
+            const amdDependencies: { path: string; name: string }[] = [];
             let amdModuleName: string;
 
             // Keep scanning all the leading trivia in the file until we get to something that
             // isn't trivia.  Any single line comment will be analyzed to see if it is a
             // reference comment.
             while (true) {
-                let kind = triviaScanner.scan();
+                const kind = triviaScanner.scan();
                 if (kind === SyntaxKind.WhitespaceTrivia || kind === SyntaxKind.NewLineTrivia || kind === SyntaxKind.MultiLineCommentTrivia) {
                     continue;
                 }
@@ -5374,14 +5411,14 @@ namespace ts {
                     break;
                 }
 
-                let range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() };
+                const range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() };
 
-                let comment = sourceText.substring(range.pos, range.end);
-                let referencePathMatchResult = getFileReferenceFromReferencePath(comment, range);
+                const comment = sourceText.substring(range.pos, range.end);
+                const referencePathMatchResult = getFileReferenceFromReferencePath(comment, range);
                 if (referencePathMatchResult) {
-                    let fileReference = referencePathMatchResult.fileReference;
+                    const fileReference = referencePathMatchResult.fileReference;
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
-                    let diagnosticMessage = referencePathMatchResult.diagnosticMessage;
+                    const diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
                         referencedFiles.push(fileReference);
                     }
@@ -5390,8 +5427,8 @@ namespace ts {
                     }
                 }
                 else {
-                    let amdModuleNameRegEx = /^\/\/\/\s*<amd-module\s+name\s*=\s*('|")(.+?)\1/gim;
-                    let amdModuleNameMatchResult = amdModuleNameRegEx.exec(comment);
+                    const amdModuleNameRegEx = /^\/\/\/\s*<amd-module\s+name\s*=\s*('|")(.+?)\1/gim;
+                    const amdModuleNameMatchResult = amdModuleNameRegEx.exec(comment);
                     if (amdModuleNameMatchResult) {
                         if (amdModuleName) {
                             parseDiagnostics.push(createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, Diagnostics.An_AMD_module_cannot_have_multiple_name_assignments));
@@ -5399,15 +5436,15 @@ namespace ts {
                         amdModuleName = amdModuleNameMatchResult[2];
                     }
 
-                    let amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
-                    let pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
-                    let nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
-                    let amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
+                    const amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
+                    const pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
+                    const nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
+                    const amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
                     if (amdDependencyMatchResult) {
-                        let pathMatchResult = pathRegex.exec(comment);
-                        let nameMatchResult = nameRegex.exec(comment);
+                        const pathMatchResult = pathRegex.exec(comment);
+                        const nameMatchResult = nameRegex.exec(comment);
                         if (pathMatchResult) {
-                            let amdDependency = { path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
+                            const amdDependency = { path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
                             amdDependencies.push(amdDependency);
                         }
                     }
@@ -5486,9 +5523,9 @@ namespace ts {
             }
 
             export function parseJSDocTypeExpressionForTests(content: string, start: number, length: number) {
-                initializeState("file.js", content, ScriptTarget.Latest, /*_syntaxCursor:*/ undefined);
-                let jsDocTypeExpression = parseJSDocTypeExpression(start, length);
-                let diagnostics = parseDiagnostics;
+                initializeState("file.js", content, ScriptTarget.Latest, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
+                const jsDocTypeExpression = parseJSDocTypeExpression(start, length);
+                const diagnostics = parseDiagnostics;
                 clearState();
 
                 return jsDocTypeExpression ? { jsDocTypeExpression, diagnostics } : undefined;
@@ -5503,7 +5540,7 @@ namespace ts {
                 // Prime the first token for us to start processing.
                 token = nextToken();
 
-                let result = <JSDocTypeExpression>createNode(SyntaxKind.JSDocTypeExpression);
+                const result = <JSDocTypeExpression>createNode(SyntaxKind.JSDocTypeExpression);
 
                 parseExpected(SyntaxKind.OpenBraceToken);
                 result.type = parseJSDocTopLevelType();
@@ -5516,13 +5553,13 @@ namespace ts {
             function parseJSDocTopLevelType(): JSDocType {
                 let type = parseJSDocType();
                 if (token === SyntaxKind.BarToken) {
-                    let unionType = <JSDocUnionType>createNode(SyntaxKind.JSDocUnionType, type.pos);
+                    const unionType = <JSDocUnionType>createNode(SyntaxKind.JSDocUnionType, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
 
                 if (token === SyntaxKind.EqualsToken) {
-                    let optionalType = <JSDocOptionalType>createNode(SyntaxKind.JSDocOptionalType, type.pos);
+                    const optionalType = <JSDocOptionalType>createNode(SyntaxKind.JSDocOptionalType, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -5536,7 +5573,7 @@ namespace ts {
 
                 while (true) {
                     if (token === SyntaxKind.OpenBracketToken) {
-                        let arrayType = <JSDocArrayType>createNode(SyntaxKind.JSDocArrayType, type.pos);
+                        const arrayType = <JSDocArrayType>createNode(SyntaxKind.JSDocArrayType, type.pos);
                         arrayType.elementType = type;
 
                         nextToken();
@@ -5545,14 +5582,14 @@ namespace ts {
                         type = finishNode(arrayType);
                     }
                     else if (token === SyntaxKind.QuestionToken) {
-                        let nullableType = <JSDocNullableType>createNode(SyntaxKind.JSDocNullableType, type.pos);
+                        const nullableType = <JSDocNullableType>createNode(SyntaxKind.JSDocNullableType, type.pos);
                         nullableType.type = type;
 
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token === SyntaxKind.ExclamationToken) {
-                        let nonNullableType = <JSDocNonNullableType>createNode(SyntaxKind.JSDocNonNullableType, type.pos);
+                        const nonNullableType = <JSDocNonNullableType>createNode(SyntaxKind.JSDocNonNullableType, type.pos);
                         nonNullableType.type = type;
 
                         nextToken();
@@ -5597,11 +5634,12 @@ namespace ts {
                         return parseTokenNode<JSDocType>();
                 }
 
+                // TODO (drosen): Parse string literal types in JSDoc as well.
                 return parseJSDocTypeReference();
             }
 
             function parseJSDocThisType(): JSDocThisType {
-                let result = <JSDocThisType>createNode(SyntaxKind.JSDocThisType);
+                const result = <JSDocThisType>createNode(SyntaxKind.JSDocThisType);
                 nextToken();
                 parseExpected(SyntaxKind.ColonToken);
                 result.type = parseJSDocType();
@@ -5609,7 +5647,7 @@ namespace ts {
             }
 
             function parseJSDocConstructorType(): JSDocConstructorType {
-                let result = <JSDocConstructorType>createNode(SyntaxKind.JSDocConstructorType);
+                const result = <JSDocConstructorType>createNode(SyntaxKind.JSDocConstructorType);
                 nextToken();
                 parseExpected(SyntaxKind.ColonToken);
                 result.type = parseJSDocType();
@@ -5617,14 +5655,14 @@ namespace ts {
             }
 
             function parseJSDocVariadicType(): JSDocVariadicType {
-                let result = <JSDocVariadicType>createNode(SyntaxKind.JSDocVariadicType);
+                const result = <JSDocVariadicType>createNode(SyntaxKind.JSDocVariadicType);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
 
             function parseJSDocFunctionType(): JSDocFunctionType {
-                let result = <JSDocFunctionType>createNode(SyntaxKind.JSDocFunctionType);
+                const result = <JSDocFunctionType>createNode(SyntaxKind.JSDocFunctionType);
                 nextToken();
 
                 parseExpected(SyntaxKind.OpenParenToken);
@@ -5641,20 +5679,20 @@ namespace ts {
             }
 
             function parseJSDocParameter(): ParameterDeclaration {
-                let parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
+                const parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
                 parameter.type = parseJSDocType();
                 return finishNode(parameter);
             }
 
             function parseJSDocOptionalType(type: JSDocType): JSDocOptionalType {
-                let result = <JSDocOptionalType>createNode(SyntaxKind.JSDocOptionalType, type.pos);
+                const result = <JSDocOptionalType>createNode(SyntaxKind.JSDocOptionalType, type.pos);
                 nextToken();
                 result.type = type;
                 return finishNode(result);
             }
 
             function parseJSDocTypeReference(): JSDocTypeReference {
-                let result = <JSDocTypeReference>createNode(SyntaxKind.JSDocTypeReference);
+                const result = <JSDocTypeReference>createNode(SyntaxKind.JSDocTypeReference);
                 result.name = parseSimplePropertyName();
 
                 while (parseOptional(SyntaxKind.DotToken)) {
@@ -5673,7 +5711,7 @@ namespace ts {
             function parseTypeArguments() {
                 // Move past the <
                 nextToken();
-                let typeArguments = parseDelimitedList(ParsingContext.JSDocTypeArguments, parseJSDocType);
+                const typeArguments = parseDelimitedList(ParsingContext.JSDocTypeArguments, parseJSDocType);
                 checkForTrailingComma(typeArguments);
                 checkForEmptyTypeArgumentList(typeArguments);
                 parseExpected(SyntaxKind.GreaterThanToken);
@@ -5683,14 +5721,14 @@ namespace ts {
 
             function checkForEmptyTypeArgumentList(typeArguments: NodeArray<Node>) {
                 if (parseDiagnostics.length === 0 &&  typeArguments && typeArguments.length === 0) {
-                    let start = typeArguments.pos - "<".length;
-                    let end = skipTrivia(sourceText, typeArguments.end) + ">".length;
+                    const start = typeArguments.pos - "<".length;
+                    const end = skipTrivia(sourceText, typeArguments.end) + ">".length;
                     return parseErrorAtPosition(start, end - start, Diagnostics.Type_argument_list_cannot_be_empty);
                 }
             }
 
             function parseQualifiedName(left: EntityName): QualifiedName {
-                let result = <QualifiedName>createNode(SyntaxKind.QualifiedName, left.pos);
+                const result = <QualifiedName>createNode(SyntaxKind.QualifiedName, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
 
@@ -5698,7 +5736,7 @@ namespace ts {
             }
 
             function parseJSDocRecordType(): JSDocRecordType {
-                let result = <JSDocRecordType>createNode(SyntaxKind.JSDocRecordType);
+                const result = <JSDocRecordType>createNode(SyntaxKind.JSDocRecordType);
                 nextToken();
                 result.members = parseDelimitedList(ParsingContext.JSDocRecordMembers, parseJSDocRecordMember);
                 checkForTrailingComma(result.members);
@@ -5707,7 +5745,7 @@ namespace ts {
             }
 
             function parseJSDocRecordMember(): JSDocRecordMember {
-                let result = <JSDocRecordMember>createNode(SyntaxKind.JSDocRecordMember);
+                const result = <JSDocRecordMember>createNode(SyntaxKind.JSDocRecordMember);
                 result.name = parseSimplePropertyName();
 
                 if (token === SyntaxKind.ColonToken) {
@@ -5719,14 +5757,14 @@ namespace ts {
             }
 
             function parseJSDocNonNullableType(): JSDocNonNullableType {
-                let result = <JSDocNonNullableType>createNode(SyntaxKind.JSDocNonNullableType);
+                const result = <JSDocNonNullableType>createNode(SyntaxKind.JSDocNonNullableType);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
 
             function parseJSDocTupleType(): JSDocTupleType {
-                let result = <JSDocTupleType>createNode(SyntaxKind.JSDocTupleType);
+                const result = <JSDocTupleType>createNode(SyntaxKind.JSDocTupleType);
                 nextToken();
                 result.types = parseDelimitedList(ParsingContext.JSDocTupleTypes, parseJSDocType);
                 checkForTrailingComma(result.types);
@@ -5737,13 +5775,13 @@ namespace ts {
 
             function checkForTrailingComma(list: NodeArray<Node>) {
                 if (parseDiagnostics.length === 0 && list.hasTrailingComma) {
-                    let start = list.end - ",".length;
+                    const start = list.end - ",".length;
                     parseErrorAtPosition(start, ",".length, Diagnostics.Trailing_comma_not_allowed);
                 }
             }
 
             function parseJSDocUnionType(): JSDocUnionType {
-                let result = <JSDocUnionType>createNode(SyntaxKind.JSDocUnionType);
+                const result = <JSDocUnionType>createNode(SyntaxKind.JSDocUnionType);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
 
@@ -5755,7 +5793,7 @@ namespace ts {
             function parseJSDocTypeList(firstType: JSDocType) {
                 Debug.assert(!!firstType);
 
-                let types = <NodeArray<JSDocType>>[];
+                const types = <NodeArray<JSDocType>>[];
                 types.pos = firstType.pos;
 
                 types.push(firstType);
@@ -5768,13 +5806,13 @@ namespace ts {
             }
 
             function parseJSDocAllType(): JSDocAllType {
-                let result = <JSDocAllType>createNode(SyntaxKind.JSDocAllType);
+                const result = <JSDocAllType>createNode(SyntaxKind.JSDocAllType);
                 nextToken();
                 return finishNode(result);
             }
 
             function parseJSDocUnknownOrNullableType(): JSDocUnknownType | JSDocNullableType {
-                let pos = scanner.getStartPos();
+                const pos = scanner.getStartPos();
                 // skip the ?
                 nextToken();
 
@@ -5795,27 +5833,27 @@ namespace ts {
                     token === SyntaxKind.EqualsToken ||
                     token === SyntaxKind.BarToken) {
 
-                    let result = <JSDocUnknownType>createNode(SyntaxKind.JSDocUnknownType, pos);
+                    const result = <JSDocUnknownType>createNode(SyntaxKind.JSDocUnknownType, pos);
                     return finishNode(result);
                 }
                 else {
-                    let result = <JSDocNullableType>createNode(SyntaxKind.JSDocNullableType, pos);
+                    const result = <JSDocNullableType>createNode(SyntaxKind.JSDocNullableType, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
 
             export function parseIsolatedJSDocComment(content: string, start: number, length: number) {
-                initializeState("file.js", content, ScriptTarget.Latest, /*_syntaxCursor:*/ undefined);
-                let jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length);
-                let diagnostics = parseDiagnostics;
+                initializeState("file.js", content, ScriptTarget.Latest, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
+                const jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length);
+                const diagnostics = parseDiagnostics;
                 clearState();
 
                 return jsDocComment ? { jsDocComment, diagnostics } : undefined;
             }
 
             export function parseJSDocComment(parent: Node, start: number, length: number): JSDocComment {
-                let comment = parseJSDocCommentWorker(start, length);
+                const comment = parseJSDocCommentWorker(start, length);
                 if (comment) {
                     fixupParentReferences(comment);
                     comment.parent = parent;
@@ -5825,9 +5863,9 @@ namespace ts {
             }
 
             export function parseJSDocCommentWorker(start: number, length: number): JSDocComment {
-                let content = sourceText;
+                const content = sourceText;
                 start = start || 0;
-                let end = length === undefined ? content.length : start + length;
+                const end = length === undefined ? content.length : start + length;
                 length = end - start;
 
                 Debug.assert(start >= 0);
@@ -5854,7 +5892,7 @@ namespace ts {
                         let seenAsterisk = true;
 
                         for (pos = start + "/**".length; pos < end; ) {
-                            let ch = content.charCodeAt(pos);
+                            const ch = content.charCodeAt(pos);
                             pos++;
 
                             if (ch === CharacterCodes.at && canParseTag) {
@@ -5904,7 +5942,7 @@ namespace ts {
                         return undefined;
                     }
 
-                    let result = <JSDocComment>createNode(SyntaxKind.JSDocComment, start);
+                    const result = <JSDocComment>createNode(SyntaxKind.JSDocComment, start);
                     result.tags = tags;
                     return finishNode(result, end);
                 }
@@ -5917,15 +5955,15 @@ namespace ts {
 
                 function parseTag(): void {
                     Debug.assert(content.charCodeAt(pos - 1) === CharacterCodes.at);
-                    let atToken = createNode(SyntaxKind.AtToken, pos - 1);
+                    const atToken = createNode(SyntaxKind.AtToken, pos - 1);
                     atToken.end = pos;
 
-                    let tagName = scanIdentifier();
+                    const tagName = scanIdentifier();
                     if (!tagName) {
                         return;
                     }
 
-                    let tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName);
+                    const tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName);
                     addTag(tag);
                 }
 
@@ -5948,7 +5986,7 @@ namespace ts {
                 }
 
                 function handleUnknownTag(atToken: Node, tagName: Identifier) {
-                    let result = <JSDocTag>createNode(SyntaxKind.JSDocTag, atToken.pos);
+                    const result = <JSDocTag>createNode(SyntaxKind.JSDocTag, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     return finishNode(result, pos);
@@ -5973,7 +6011,7 @@ namespace ts {
                         return undefined;
                     }
 
-                    let typeExpression = parseJSDocTypeExpression(pos, end - pos);
+                    const typeExpression = parseJSDocTypeExpression(pos, end - pos);
                     pos = typeExpression.end;
                     return typeExpression;
                 }
@@ -6010,7 +6048,7 @@ namespace ts {
                         typeExpression = tryParseTypeExpression();
                     }
 
-                    let result = <JSDocParameterTag>createNode(SyntaxKind.JSDocParameterTag, atToken.pos);
+                    const result = <JSDocParameterTag>createNode(SyntaxKind.JSDocParameterTag, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
@@ -6025,7 +6063,7 @@ namespace ts {
                         parseErrorAtPosition(tagName.pos, pos - tagName.pos, Diagnostics._0_tag_already_specified, tagName.text);
                     }
 
-                    let result = <JSDocReturnTag>createNode(SyntaxKind.JSDocReturnTag, atToken.pos);
+                    const result = <JSDocReturnTag>createNode(SyntaxKind.JSDocReturnTag, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -6037,7 +6075,7 @@ namespace ts {
                         parseErrorAtPosition(tagName.pos, pos - tagName.pos, Diagnostics._0_tag_already_specified, tagName.text);
                     }
 
-                    let result = <JSDocTypeTag>createNode(SyntaxKind.JSDocTypeTag, atToken.pos);
+                    const result = <JSDocTypeTag>createNode(SyntaxKind.JSDocTypeTag, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -6049,20 +6087,20 @@ namespace ts {
                         parseErrorAtPosition(tagName.pos, pos - tagName.pos, Diagnostics._0_tag_already_specified, tagName.text);
                     }
 
-                    let typeParameters = <NodeArray<TypeParameterDeclaration>>[];
+                    const typeParameters = <NodeArray<TypeParameterDeclaration>>[];
                     typeParameters.pos = pos;
 
                     while (true) {
                         skipWhitespace();
 
-                        let startPos = pos;
-                        let name = scanIdentifier();
+                        const startPos = pos;
+                        const name = scanIdentifier();
                         if (!name) {
                             parseErrorAtPosition(startPos, 0, Diagnostics.Identifier_expected);
                             return undefined;
                         }
 
-                        let typeParameter = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter, name.pos);
+                        const typeParameter = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter, name.pos);
                         typeParameter.name = name;
                         finishNode(typeParameter, pos);
 
@@ -6078,7 +6116,7 @@ namespace ts {
 
                     typeParameters.end = pos;
 
-                    let result = <JSDocTemplateTag>createNode(SyntaxKind.JSDocTemplateTag, atToken.pos);
+                    const result = <JSDocTemplateTag>createNode(SyntaxKind.JSDocTemplateTag, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
@@ -6086,9 +6124,9 @@ namespace ts {
                 }
 
                 function scanIdentifier(): Identifier {
-                    let startPos = pos;
+                    const startPos = pos;
                     for (; pos < end; pos++) {
-                        let ch = content.charCodeAt(pos);
+                        const ch = content.charCodeAt(pos);
                         if (pos === startPos && isIdentifierStart(ch, ScriptTarget.Latest)) {
                             continue;
                         }
@@ -6103,7 +6141,7 @@ namespace ts {
                         return undefined;
                     }
 
-                    let result = <Identifier>createNode(SyntaxKind.Identifier, startPos);
+                    const result = <Identifier>createNode(SyntaxKind.Identifier, startPos);
                     result.text = content.substring(startPos, pos);
                     return finishNode(result, pos);
                 }
@@ -6124,7 +6162,7 @@ namespace ts {
             if (sourceFile.statements.length === 0) {
                 // If we don't have any statements in the current source file, then there's no real
                 // way to incrementally parse.  So just do a full parse instead.
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setNodeParents*/ true);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true);
             }
 
             // Make sure we're not trying to incrementally update a source file more than once.  Once
@@ -6133,16 +6171,16 @@ namespace ts {
             // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
             // tree and give them new positions and parents.  From that point on, trusting the old
             // tree at all is not possible as far too much of it may violate invariants.
-            let incrementalSourceFile = <IncrementalNode><Node>sourceFile;
+            const incrementalSourceFile = <IncrementalNode><Node>sourceFile;
             Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
             incrementalSourceFile.hasBeenIncrementallyParsed = true;
 
-            let oldText = sourceFile.text;
-            let syntaxCursor = createSyntaxCursor(sourceFile);
+            const oldText = sourceFile.text;
+            const syntaxCursor = createSyntaxCursor(sourceFile);
 
             // Make the actual change larger so that we know to reparse anything whose lookahead
             // might have intersected the change.
-            let changeRange = extendToAffectedRange(sourceFile, textChangeRange);
+            const changeRange = extendToAffectedRange(sourceFile, textChangeRange);
             checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks);
 
             // Ensure that extending the affected range only moved the start of the change range
@@ -6154,7 +6192,7 @@ namespace ts {
             // The is the amount the nodes after the edit range need to be adjusted.  It can be
             // positive (if the edit added characters), negative (if the edit deleted characters)
             // or zero (if this was a pure overwrite with nothing added/removed).
-            let delta = textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
+            const delta = textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
 
             // If we added or removed characters during the edit, then we need to go and adjust all
             // the nodes after the edit.  Those nodes may move forward (if we inserted chars) or they
@@ -6188,7 +6226,7 @@ namespace ts {
             // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
             // will immediately bail out of walking any subtrees when we can see that their parents
             // are already correct.
-            let result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true);
+            const result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true);
 
             return result;
         }
@@ -6234,7 +6272,7 @@ namespace ts {
                 array.pos += delta;
                 array.end += delta;
 
-                for (let node of array) {
+                for (const node of array) {
                     visitNode(node);
                 }
             }
@@ -6362,7 +6400,7 @@ namespace ts {
                 // Check if the element intersects the change range.  If it does, then it is not
                 // reusable.  Also, we'll need to recurse to see what constituent portions we may
                 // be able to use.
-                let fullEnd = child.end;
+                const fullEnd = child.end;
                 if (fullEnd >= changeStart) {
                     child.intersectsChange = true;
                     child._children = undefined;
@@ -6391,14 +6429,14 @@ namespace ts {
                 // Check if the element intersects the change range.  If it does, then it is not
                 // reusable.  Also, we'll need to recurse to see what constituent portions we may
                 // be able to use.
-                let fullEnd = array.end;
+                const fullEnd = array.end;
                 if (fullEnd >= changeStart) {
                     array.intersectsChange = true;
                     array._children = undefined;
 
                     // Adjust the pos or end (or both) of the intersecting array accordingly.
                     adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    for (let node of array) {
+                    for (const node of array) {
                         visitNode(node);
                     }
                     return;
@@ -6420,7 +6458,7 @@ namespace ts {
             // (as it does not intersect the actual original change range).  Because an edit may
             // change the token touching it, we actually need to look back *at least* one token so
             // that the prior token sees that change.
-            let maxLookahead = 1;
+            const maxLookahead = 1;
 
             let start = changeRange.span.start;
 
@@ -6428,15 +6466,15 @@ namespace ts {
             // the left by maxLookahead tokens.  We only need to do this as long as we're not at the
             // start of the tree.
             for (let i = 0; start > 0 && i <= maxLookahead; i++) {
-                let nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start);
+                const nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start);
                 Debug.assert(nearestNode.pos <= start);
-                let position = nearestNode.pos;
+                const position = nearestNode.pos;
 
                 start = Math.max(0, position - 1);
             }
 
-            let finalSpan = createTextSpanFromBounds(start, textSpanEnd(changeRange.span));
-            let finalLength = changeRange.newLength + (changeRange.span.start - start);
+            const finalSpan = createTextSpanFromBounds(start, textSpanEnd(changeRange.span));
+            const finalLength = changeRange.newLength + (changeRange.span.start - start);
 
             return createTextChangeRange(finalSpan, finalLength);
         }
@@ -6448,7 +6486,7 @@ namespace ts {
             forEachChild(sourceFile, visit);
 
             if (lastNodeEntirelyBeforePosition) {
-                let lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition);
+                const lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition);
                 if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) {
                     bestResult = lastChildOfLastEntireNodeBeforePosition;
                 }
@@ -6458,7 +6496,7 @@ namespace ts {
 
             function getLastChild(node: Node): Node {
                 while (true) {
-                    let lastChild = getLastChildWorker(node);
+                    const lastChild = getLastChildWorker(node);
                     if (lastChild) {
                         node = lastChild;
                     }
@@ -6537,17 +6575,17 @@ namespace ts {
         }
 
         function checkChangeRange(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks: boolean) {
-            let oldText = sourceFile.text;
+            const oldText = sourceFile.text;
             if (textChangeRange) {
                 Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length);
 
                 if (aggressiveChecks || Debug.shouldAssert(AssertionLevel.VeryAggressive)) {
-                    let oldTextPrefix = oldText.substr(0, textChangeRange.span.start);
-                    let newTextPrefix = newText.substr(0, textChangeRange.span.start);
+                    const oldTextPrefix = oldText.substr(0, textChangeRange.span.start);
+                    const newTextPrefix = newText.substr(0, textChangeRange.span.start);
                     Debug.assert(oldTextPrefix === newTextPrefix);
 
-                    let oldTextSuffix = oldText.substring(textSpanEnd(textChangeRange.span), oldText.length);
-                    let newTextSuffix = newText.substring(textSpanEnd(textChangeRangeNewSpan(textChangeRange)), newText.length);
+                    const oldTextSuffix = oldText.substring(textSpanEnd(textChangeRange.span), oldText.length);
+                    const newTextSuffix = newText.substring(textSpanEnd(textChangeRangeNewSpan(textChangeRange)), newText.length);
                     Debug.assert(oldTextSuffix === newTextSuffix);
                 }
             }
@@ -6649,7 +6687,7 @@ namespace ts {
                         // position was in this array.  Search through this array to see if we find a
                         // viable element.
                         for (let i = 0, n = array.length; i < n; i++) {
-                            let child = array[i];
+                            const child = array[i];
                             if (child) {
                                 if (child.pos === position) {
                                     // Found the right node.  We're done.
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index d76e7585d15..dc31dfb5213 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -10,7 +10,7 @@ namespace ts {
 
     /** The version of the TypeScript compiler release */
 
-    let emptyArray: any[] = [];
+    const emptyArray: any[] = [];
 
     export const version = "1.8.0";
 
@@ -20,7 +20,7 @@ namespace ts {
             if (sys.fileExists(fileName)) {
                 return fileName;
             }
-            let parentPath = getDirectoryPath(searchPath);
+            const parentPath = getDirectoryPath(searchPath);
             if (parentPath === searchPath) {
                 break;
             }
@@ -31,13 +31,13 @@ namespace ts {
     }
 
     export function resolveTripleslashReference(moduleName: string, containingFile: string): string {
-        let basePath = getDirectoryPath(containingFile);
-        let referencedFileName = isRootedDiskPath(moduleName) ? moduleName : combinePaths(basePath, moduleName);
+        const basePath = getDirectoryPath(containingFile);
+        const referencedFileName = isRootedDiskPath(moduleName) ? moduleName : combinePaths(basePath, moduleName);
         return normalizePath(referencedFileName);
     }
 
     export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
-        let moduleResolution = compilerOptions.moduleResolution !== undefined
+        const moduleResolution = compilerOptions.moduleResolution !== undefined
             ? compilerOptions.moduleResolution
             : compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
 
@@ -48,18 +48,18 @@ namespace ts {
     }
 
     export function nodeModuleNameResolver(moduleName: string, containingFile: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
-        let containingDirectory = getDirectoryPath(containingFile);
+        const containingDirectory = getDirectoryPath(containingFile);
 
         if (getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
-            let failedLookupLocations: string[] = [];
-            let candidate = normalizePath(combinePaths(containingDirectory, moduleName));
-            let resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+            const failedLookupLocations: string[] = [];
+            const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
+            let resolvedFileName = loadNodeModuleFromFile(supportedJsExtensions, candidate, failedLookupLocations, host);
 
             if (resolvedFileName) {
                 return { resolvedModule: { resolvedFileName }, failedLookupLocations };
             }
 
-            resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+            resolvedFileName = loadNodeModuleFromDirectory(supportedJsExtensions, candidate, failedLookupLocations, host);
             return resolvedFileName
                 ? { resolvedModule: { resolvedFileName }, failedLookupLocations }
                 : { resolvedModule: undefined, failedLookupLocations };
@@ -69,11 +69,11 @@ namespace ts {
         }
     }
 
-    function loadNodeModuleFromFile(candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string {
-        return forEach(moduleFileExtensions, tryLoad);
+    function loadNodeModuleFromFile(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string {
+        return forEach(extensions, tryLoad);
 
         function tryLoad(ext: string): string {
-            let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
+            const fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
             if (host.fileExists(fileName)) {
                 return fileName;
             }
@@ -84,14 +84,14 @@ namespace ts {
         }
     }
 
-    function loadNodeModuleFromDirectory(candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string {
-        let packageJsonPath = combinePaths(candidate, "package.json");
+    function loadNodeModuleFromDirectory(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string {
+        const packageJsonPath = combinePaths(candidate, "package.json");
         if (host.fileExists(packageJsonPath)) {
 
             let jsonContent: { typings?: string };
 
             try {
-                let jsonText = host.readFile(packageJsonPath);
+                const jsonText = host.readFile(packageJsonPath);
                 jsonContent = jsonText ? <{ typings?: string }>JSON.parse(jsonText) : { typings: undefined };
             }
             catch (e) {
@@ -100,7 +100,7 @@ namespace ts {
             }
 
             if (jsonContent.typings) {
-                let result = loadNodeModuleFromFile(normalizePath(combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
+                const result = loadNodeModuleFromFile(extensions, normalizePath(combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host);
                 if (result) {
                     return result;
                 }
@@ -111,29 +111,29 @@ namespace ts {
             failedLookupLocation.push(packageJsonPath);
         }
 
-        return loadNodeModuleFromFile(combinePaths(candidate, "index"), failedLookupLocation, host);
+        return loadNodeModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host);
     }
 
     function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
-        let failedLookupLocations: string[] = [];
+        const failedLookupLocations: string[] = [];
         directory = normalizeSlashes(directory);
         while (true) {
-            let baseName = getBaseFileName(directory);
+            const baseName = getBaseFileName(directory);
             if (baseName !== "node_modules") {
-                let nodeModulesFolder = combinePaths(directory, "node_modules");
-                let candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
-                let result = loadNodeModuleFromFile(candidate, failedLookupLocations, host);
+                const nodeModulesFolder = combinePaths(directory, "node_modules");
+                const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
+                let result = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations };
                 }
 
-                result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host);
+                result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, host);
                 if (result) {
                     return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations };
                 }
             }
 
-            let parentPath = getDirectoryPath(directory);
+            const parentPath = getDirectoryPath(directory);
             if (parentPath === directory) {
                 break;
             }
@@ -145,7 +145,7 @@ namespace ts {
     }
 
     function nameStartsWithDotSlashOrDotDotSlash(name: string) {
-        let i = name.lastIndexOf("./", 1);
+        const i = name.lastIndexOf("./", 1);
         return i === 0 || (i === 1 && name.charCodeAt(0) === CharacterCodes.dot);
     }
 
@@ -159,19 +159,20 @@ namespace ts {
         let searchPath = getDirectoryPath(containingFile);
         let searchName: string;
 
-        let failedLookupLocations: string[] = [];
+        const failedLookupLocations: string[] = [];
 
         let referencedSourceFile: string;
+        const extensions = compilerOptions.allowNonTsExtensions ? supportedJsExtensions : supportedExtensions;
         while (true) {
             searchName = normalizePath(combinePaths(searchPath, moduleName));
-            referencedSourceFile = forEach(supportedExtensions, extension => {
+            referencedSourceFile = forEach(extensions, extension => {
                 if (extension === ".tsx" && !compilerOptions.jsx) {
                     // resolve .tsx files only if jsx support is enabled 
                     // 'logical not' handles both undefined and None cases
                     return undefined;
                 }
 
-                let candidate = searchName + extension;
+                const candidate = searchName + extension;
                 if (host.fileExists(candidate)) {
                     return candidate;
                 }
@@ -184,7 +185,7 @@ namespace ts {
                 break;
             }
 
-            let parentPath = getDirectoryPath(searchPath);
+            const parentPath = getDirectoryPath(searchPath);
             if (parentPath === searchPath) {
                 break;
             }
@@ -199,16 +200,13 @@ namespace ts {
     /* @internal */
     export const defaultInitCompilerOptions: CompilerOptions = {
         module: ModuleKind.CommonJS,
-        target: ScriptTarget.ES3,
+        target: ScriptTarget.ES5,
         noImplicitAny: false,
-        outDir: "built",
-        rootDir: ".",
         sourceMap: false,
     };
 
     export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost {
-        let currentDirectory: string;
-        let existingDirectories: Map<boolean> = {};
+        const existingDirectories: Map<boolean> = {};
 
         function getCanonicalFileName(fileName: string): string {
             // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
@@ -217,12 +215,12 @@ namespace ts {
         }
 
         // returned by CScript sys environment
-        let unsupportedFileEncodingErrorCode = -2147024809;
+        const unsupportedFileEncodingErrorCode = -2147024809;
 
         function getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile {
             let text: string;
             try {
-                let start = new Date().getTime();
+                const start = new Date().getTime();
                 text = sys.readFile(fileName, options.charset);
                 ioReadTime += new Date().getTime() - start;
             }
@@ -251,7 +249,7 @@ namespace ts {
 
         function ensureDirectoriesExist(directoryPath: string) {
             if (directoryPath.length > getRootLength(directoryPath) && !directoryExists(directoryPath)) {
-                let parentDirectory = getDirectoryPath(directoryPath);
+                const parentDirectory = getDirectoryPath(directoryPath);
                 ensureDirectoriesExist(parentDirectory);
                 sys.createDirectory(directoryPath);
             }
@@ -259,7 +257,7 @@ namespace ts {
 
         function writeFile(fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void) {
             try {
-                let start = new Date().getTime();
+                const start = new Date().getTime();
                 ensureDirectoriesExist(getDirectoryPath(normalizePath(fileName)));
                 sys.writeFile(fileName, data, writeByteOrderMark);
                 ioWriteTime += new Date().getTime() - start;
@@ -277,7 +275,7 @@ namespace ts {
             getSourceFile,
             getDefaultLibFileName: options => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), getDefaultLibFileName(options)),
             writeFile,
-            getCurrentDirectory: () => currentDirectory || (currentDirectory = sys.getCurrentDirectory()),
+            getCurrentDirectory: memoize(() => sys.getCurrentDirectory()),
             useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
             getCanonicalFileName,
             getNewLine: () => newLine,
@@ -287,7 +285,7 @@ namespace ts {
     }
 
     export function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[] {
-        let diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(
+        const diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(
                           program.getSyntacticDiagnostics(sourceFile, cancellationToken),
                           program.getGlobalDiagnostics(cancellationToken),
                           program.getSemanticDiagnostics(sourceFile, cancellationToken));
@@ -329,7 +327,7 @@ namespace ts {
         let program: Program;
         let files: SourceFile[] = [];
         let fileProcessingDiagnostics = createDiagnosticCollection();
-        let programDiagnostics = createDiagnosticCollection();
+        const programDiagnostics = createDiagnosticCollection();
 
         let commonSourceDirectory: string;
         let diagnosticsProducingTypeChecker: TypeChecker;
@@ -338,20 +336,24 @@ namespace ts {
 
         let skipDefaultLib = options.noLib;
 
-        let start = new Date().getTime();
+        const start = new Date().getTime();
 
         host = host || createCompilerHost(options);
 
+        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));
 
-        let filesByName = createFileMap<SourceFile>(fileName => host.getCanonicalFileName(fileName));
+        const filesByName = createFileMap<SourceFile>();
+        // stores 'filename -> file association' ignoring case
+        // used to track cases when two file names differ only in casing 
+        const filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? createFileMap<SourceFile>(fileName => fileName.toLowerCase()) : undefined;
 
         if (oldProgram) {
             // check properties that can affect structure of the program or module resolution strategy
             // if any of these properties has changed - structure cannot be reused
-            let oldOptions = oldProgram.getCompilerOptions();
+            const oldOptions = oldProgram.getCompilerOptions();
             if ((oldOptions.module !== options.module) ||
                 (oldOptions.noResolve !== options.noResolve) ||
                 (oldOptions.target !== options.target) ||
@@ -362,13 +364,13 @@ namespace ts {
         }
 
         if (!tryReuseStructureFromOldProgram()) {
-            forEach(rootNames, name => processRootFile(name, false));
+            forEach(rootNames, name => processRootFile(name, /*isDefaultLib*/ false));
             // Do not process the default library if:
             //  - The '--noLib' flag is used.
             //  - A 'no-default-lib' reference comment is encountered in
             //      processing the root files.
             if (!skipDefaultLib) {
-                processRootFile(host.getDefaultLibFileName(options), true);
+                processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
             }
         }
 
@@ -381,7 +383,7 @@ namespace ts {
 
         program = {
             getRootFileNames: () => rootNames,
-            getSourceFile: getSourceFile,
+            getSourceFile,
             getSourceFiles: () => files,
             getCompilerOptions: () => options,
             getSyntacticDiagnostics,
@@ -394,7 +396,7 @@ namespace ts {
             getDiagnosticsProducingTypeChecker,
             getCommonSourceDirectory: () => commonSourceDirectory,
             emit,
-            getCurrentDirectory: () => host.getCurrentDirectory(),
+            getCurrentDirectory: () => currentDirectory,
             getNodeCount: () => getDiagnosticsProducingTypeChecker().getNodeCount(),
             getIdentifierCount: () => getDiagnosticsProducingTypeChecker().getIdentifierCount(),
             getSymbolCount: () => getDiagnosticsProducingTypeChecker().getSymbolCount(),
@@ -409,7 +411,7 @@ namespace ts {
                 getTypeChecker();
                 classifiableNames = {};
 
-                for (let sourceFile of files) {
+                for (const sourceFile of files) {
                     copyMap(sourceFile.classifiableNames, classifiableNames);
                 }
             }
@@ -425,20 +427,25 @@ namespace ts {
             Debug.assert(!oldProgram.structureIsReused);
 
             // there is an old program, check if we can reuse its structure
-            let oldRootNames = oldProgram.getRootFileNames();
+            const oldRootNames = oldProgram.getRootFileNames();
             if (!arrayIsEqualTo(oldRootNames, rootNames)) {
                 return false;
             }
 
             // check if program source files has changed in the way that can affect structure of the program
-            let newSourceFiles: SourceFile[] = [];
-            let modifiedSourceFiles: SourceFile[] = [];
-            for (let oldSourceFile of oldProgram.getSourceFiles()) {
+            const newSourceFiles: SourceFile[] = [];
+            const filePaths: Path[] = [];
+            const modifiedSourceFiles: SourceFile[] = [];
+
+            for (const oldSourceFile of oldProgram.getSourceFiles()) {
                 let newSourceFile = host.getSourceFile(oldSourceFile.fileName, options.target);
                 if (!newSourceFile) {
                     return false;
                 }
 
+                newSourceFile.path = oldSourceFile.path;
+                filePaths.push(newSourceFile.path);
+
                 if (oldSourceFile !== newSourceFile) {
                     if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
                         // value of no-default-lib has changed
@@ -460,13 +467,13 @@ namespace ts {
                     }
 
                     if (resolveModuleNamesWorker) {
-                        let moduleNames = map(newSourceFile.imports, name => name.text);
-                        let resolutions = resolveModuleNamesWorker(moduleNames, newSourceFile.fileName);
+                        const moduleNames = map(newSourceFile.imports, name => name.text);
+                        const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
                         // ensure that module resolution results are still correct
                         for (let i = 0; i < moduleNames.length; ++i) {
-                            let newResolution = resolutions[i];
-                            let oldResolution = getResolvedModule(oldSourceFile, moduleNames[i]);
-                            let resolutionChanged = oldResolution
+                            const newResolution = resolutions[i];
+                            const oldResolution = getResolvedModule(oldSourceFile, moduleNames[i]);
+                            const resolutionChanged = oldResolution
                                 ? !newResolution ||
                                   oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
                                   !!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
@@ -491,14 +498,14 @@ namespace ts {
             }
 
             // update fileName -> file mapping
-            for (let file of newSourceFiles) {
-                filesByName.set(file.fileName, file);
+            for (let i = 0, len = newSourceFiles.length; i < len; ++i) {
+                filesByName.set(filePaths[i], newSourceFiles[i]);
             }
 
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
 
-            for (let modifiedFile of modifiedSourceFiles) {
+            for (const modifiedFile of modifiedSourceFiles) {
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
             oldProgram.structureIsReused = true;
@@ -508,10 +515,10 @@ namespace ts {
 
         function getEmitHost(writeFileCallback?: WriteFileCallback): EmitHost {
             return {
-                getCanonicalFileName: fileName => host.getCanonicalFileName(fileName),
+                getCanonicalFileName,
                 getCommonSourceDirectory: program.getCommonSourceDirectory,
                 getCompilerOptions: program.getCompilerOptions,
-                getCurrentDirectory: () => host.getCurrentDirectory(),
+                getCurrentDirectory: () => currentDirectory,
                 getNewLine: () => host.getNewLine(),
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
@@ -548,11 +555,11 @@ namespace ts {
             // This is because in the -out scenario all files need to be emitted, and therefore all
             // files need to be type checked. And the way to specify that all files need to be type
             // checked is to not pass the file to getEmitResolver.
-            let emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile);
+            const emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile);
 
-            let start = new Date().getTime();
+            const start = new Date().getTime();
 
-            let emitResult = emitFiles(
+            const emitResult = emitFiles(
                 emitResolver,
                 getEmitHost(writeFileCallback),
                 sourceFile);
@@ -561,10 +568,8 @@ namespace ts {
             return emitResult;
         }
 
-        function getSourceFile(fileName: string) {
-            // first try to use file name as is to find file
-            // then try to convert relative file name to absolute and use it to retrieve source file
-            return filesByName.get(fileName) || filesByName.get(getNormalizedAbsolutePath(fileName, host.getCurrentDirectory()));
+        function getSourceFile(fileName: string): SourceFile {
+            return filesByName.get(toPath(fileName, currentDirectory, getCanonicalFileName));
         }
 
         function getDiagnosticsHelper(
@@ -575,7 +580,7 @@ namespace ts {
                 return getDiagnostics(sourceFile, cancellationToken);
             }
 
-            let allDiagnostics: Diagnostic[] = [];
+            const allDiagnostics: Diagnostic[] = [];
             forEach(program.getSourceFiles(), sourceFile => {
                 if (cancellationToken) {
                     cancellationToken.throwIfCancellationRequested();
@@ -627,13 +632,13 @@ namespace ts {
 
         function getSemanticDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
             return runWithCancellationToken(() => {
-                let typeChecker = getDiagnosticsProducingTypeChecker();
+                const typeChecker = getDiagnosticsProducingTypeChecker();
 
                 Debug.assert(!!sourceFile.bindDiagnostics);
-                let bindDiagnostics = sourceFile.bindDiagnostics;
-                let checkDiagnostics = typeChecker.getDiagnostics(sourceFile, cancellationToken);
-                let fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
-                let programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
+                const bindDiagnostics = sourceFile.bindDiagnostics;
+                const checkDiagnostics = typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                const fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
+                const programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
 
                 return bindDiagnostics.concat(checkDiagnostics).concat(fileProcessingDiagnosticsInFile).concat(programDiagnosticsInFile);
             });
@@ -642,23 +647,23 @@ namespace ts {
         function getDeclarationDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
             return runWithCancellationToken(() => {
                 if (!isDeclarationFile(sourceFile)) {
-                    let resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                    const resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
                     // Don't actually write any files since we're just getting diagnostics.
-                    let writeFile: WriteFileCallback = () => { };
+                    const writeFile: WriteFileCallback = () => { };
                     return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
                 }
             });
         }
 
         function getOptionsDiagnostics(): Diagnostic[] {
-            let allDiagnostics: Diagnostic[] = [];
+            const allDiagnostics: Diagnostic[] = [];
             addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
             addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics());
             return sortAndDeduplicateDiagnostics(allDiagnostics);
         }
 
         function getGlobalDiagnostics(): Diagnostic[] {
-            let allDiagnostics: Diagnostic[] = [];
+            const allDiagnostics: Diagnostic[] = [];
             addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
             return sortAndDeduplicateDiagnostics(allDiagnostics);
         }
@@ -684,45 +689,60 @@ namespace ts {
                 return;
             }
 
+            const isJavaScriptFile = isSourceFileJavaScript(file);
+
             let imports: LiteralExpression[];
-            for (let node of file.statements) {
-                collect(node, /* allowRelativeModuleNames */ true);
+            for (const node of file.statements) {
+                collect(node, /*allowRelativeModuleNames*/ true, /*collectOnlyRequireCalls*/ false);
             }
 
             file.imports = imports || emptyArray;
 
-            function collect(node: Node, allowRelativeModuleNames: 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;
-                        }
-                        if (!(<LiteralExpression>moduleNameExpr).text) {
-                            break;
-                        }
+            return;
 
-                        if (allowRelativeModuleNames || !isExternalModuleNameRelative((<LiteralExpression>moduleNameExpr).text)) {
-                            (imports || (imports = [])).push(<LiteralExpression>moduleNameExpr);
-                        }
-                        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
-                            // 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 => {
+            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);
+                            }
+                            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
-                                // 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);
-                            });
-                        }
-                        break;
+                                // 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));
+                    }
                 }
             }
         }
@@ -735,7 +755,7 @@ namespace ts {
                     diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -745,13 +765,13 @@ namespace ts {
                 }
             }
             else {
-                let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd);
+                const nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd))) {
+                    else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd))) {
                         diagnostic = Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -769,24 +789,31 @@ namespace ts {
             }
         }
 
-        // Get source file from normalized fileName
-        function findSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
-            if (filesByName.contains(fileName)) {
-                // We've already looked for this file, use cached result
-                return getSourceFileFromCache(fileName, /*useAbsolutePath*/ false);
+        function reportFileNamesDifferOnlyInCasingError(fileName: string, existingFileName: string, refFile: SourceFile, refPos: number, refEnd: number): void {
+            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                fileProcessingDiagnostics.add(createFileDiagnostic(refFile, refPos, refEnd - refPos,
+                    Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
+            else {
+                fileProcessingDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+        }
+
+        // Get source file from normalized fileName
+        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
+            if (filesByName.contains(path)) {
+                const file = filesByName.get(path);
+                // try to check if we've already seen this file but with a different casing in path
+                // NOTE: this only makes sense for case-insensitive file systems
+                if (file && options.forceConsistentCasingInFileNames && getNormalizedAbsolutePath(file.fileName, currentDirectory) !== getNormalizedAbsolutePath(fileName, currentDirectory)) {
+                    reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd);
+                }
 
-            let normalizedAbsolutePath = getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
-            if (filesByName.contains(normalizedAbsolutePath)) {
-                const file = getSourceFileFromCache(normalizedAbsolutePath, /*useAbsolutePath*/ true);
-                // we don't have resolution for this relative file name but the match was found by absolute file name
-                // store resolution for relative name as well 
-                filesByName.set(fileName, file);
                 return file;
             }
 
             // We haven't looked for this file, do so now and cache result
-            let file = host.getSourceFile(fileName, options.target, hostErrorMessage => {
+            const file = host.getSourceFile(fileName, options.target, hostErrorMessage => {
                 if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
                     fileProcessingDiagnostics.add(createFileDiagnostic(refFile, refPos, refEnd - refPos,
                         Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
@@ -796,14 +823,24 @@ namespace ts {
                 }
             });
 
-            filesByName.set(fileName, file);
+            filesByName.set(path, file);
             if (file) {
+                file.path = path;
+
+                if (host.useCaseSensitiveFileNames()) {
+                    // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
+                    const existingFile = filesByNameIgnoreCase.get(path);
+                    if (existingFile) {
+                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
+                    }
+                    else {
+                        filesByNameIgnoreCase.set(path, file);
+                    }
+                }
+
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
 
-                // Set the source file for normalized absolute path
-                filesByName.set(normalizedAbsolutePath, file);
-
-                let basePath = getDirectoryPath(fileName);
+                const basePath = getDirectoryPath(fileName);
                 if (!options.noResolve) {
                     processReferencedFiles(file, basePath);
                 }
@@ -812,7 +849,6 @@ namespace ts {
                 processImportedModules(file, basePath);
 
                 if (isDefaultLib) {
-                    file.isDefaultLib = true;
                     files.unshift(file);
                 }
                 else {
@@ -821,54 +857,38 @@ namespace ts {
             }
 
             return file;
-
-            function getSourceFileFromCache(fileName: string, useAbsolutePath: boolean): SourceFile {
-                let file = filesByName.get(fileName);
-                if (file && host.useCaseSensitiveFileNames()) {
-                    let sourceFileName = useAbsolutePath ? getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()) : file.fileName;
-                    if (normalizeSlashes(fileName) !== normalizeSlashes(sourceFileName)) {
-                        if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                            fileProcessingDiagnostics.add(createFileDiagnostic(refFile, refPos, refEnd - refPos,
-                                Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                        else {
-                            fileProcessingDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, sourceFileName));
-                        }
-                    }
-                }
-                return file;
-            }
         }
 
         function processReferencedFiles(file: SourceFile, basePath: string) {
             forEach(file.referencedFiles, ref => {
-                let referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, /* isDefaultLib */ false, file, ref.pos, ref.end);
+                const referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
+                processSourceFile(referencedFileName, /*isDefaultLib*/ false, file, ref.pos, ref.end);
             });
         }
 
+        function getCanonicalFileName(fileName: string): string {
+            return host.getCanonicalFileName(fileName);
+        }
+
         function processImportedModules(file: SourceFile, basePath: string) {
             collectExternalModuleReferences(file);
             if (file.imports.length) {
                 file.resolvedModules = {};
-                let moduleNames = map(file.imports, name => name.text);
-                let resolutions = resolveModuleNamesWorker(moduleNames, file.fileName);
+                const moduleNames = map(file.imports, name => name.text);
+                const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory));
                 for (let i = 0; i < file.imports.length; ++i) {
-                    let resolution = resolutions[i];
+                    const resolution = resolutions[i];
                     setResolvedModule(file, moduleNames[i], resolution);
                     if (resolution && !options.noResolve) {
-                        const importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
+                        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) {
                             if (!isExternalModule(importedFile)) {
-                                let start = getTokenPosOfNode(file.imports[i], file);
+                                const start = getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
-                            else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) {
-                                let start = getTokenPosOfNode(file.imports[i], file);
-                                fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
-                            }
                             else if (importedFile.referencedFiles.length) {
-                                let firstRef = importedFile.referencedFiles[0];
+                                const firstRef = importedFile.referencedFiles[0];
                                 fileProcessingDiagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
                             }
                         }
@@ -880,22 +900,17 @@ namespace ts {
                 file.resolvedModules = undefined;
             }
             return;
-
-            function findModuleSourceFile(fileName: string, nameLiteral: Expression) {
-                return findSourceFile(fileName, /* isDefaultLib */ false, file, skipTrivia(file.text, nameLiteral.pos), nameLiteral.end);
-            }
         }
 
         function computeCommonSourceDirectory(sourceFiles: SourceFile[]): string {
             let commonPathComponents: string[];
-            let currentDirectory = host.getCurrentDirectory();
-            forEach(files, sourceFile => {
+            const failed = forEach(files, sourceFile => {
                 // Each file contributes into common source file path
                 if (isDeclarationFile(sourceFile)) {
                     return;
                 }
 
-                let sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
+                const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
                 sourcePathComponents.pop(); // The base file name is not part of the common directory path
 
                 if (!commonPathComponents) {
@@ -905,10 +920,10 @@ namespace ts {
                 }
 
                 for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (commonPathComponents[i] !== sourcePathComponents[i]) {
+                    if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
                         if (i === 0) {
-                            programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
-                            return;
+                            // Failed to find any common path component
+                            return true;
                         }
 
                         // New common path found that is 0 -> i-1
@@ -923,18 +938,26 @@ namespace ts {
                 }
             });
 
+            // A common path can not be found when paths span multiple drives on windows, for example
+            if (failed) {
+                return "";
+            }
+
+            if (!commonPathComponents) { // Can happen when all input files are .d.ts files
+                return currentDirectory;
+            }
+
             return getNormalizedPathFromPathComponents(commonPathComponents);
         }
 
         function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean {
             let allFilesBelongToPath = true;
             if (sourceFiles) {
-                let currentDirectory = host.getCurrentDirectory();
-                let absoluteRootDirectoryPath = host.getCanonicalFileName(getNormalizedAbsolutePath(rootDirectory, currentDirectory));
+                const absoluteRootDirectoryPath = host.getCanonicalFileName(getNormalizedAbsolutePath(rootDirectory, currentDirectory));
 
                 for (var sourceFile of sourceFiles) {
                     if (!isDeclarationFile(sourceFile)) {
-                        let absoluteSourceFilePath = host.getCanonicalFileName(getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
+                        const absoluteSourceFilePath = host.getCanonicalFileName(getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
                             programDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files, sourceFile.fileName, options.rootDir));
                             allFilesBelongToPath = false;
@@ -972,16 +995,15 @@ namespace ts {
                 if (options.mapRoot) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap"));
                 }
-                if (options.sourceRoot) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "sourceRoot", "inlineSourceMap"));
-                }
             }
 
-
             if (options.inlineSources) {
                 if (!options.sourceMap && !options.inlineSourceMap) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided));
                 }
+                if (options.sourceRoot) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "sourceRoot", "inlineSources"));
+                }
             }
 
             if (options.out && options.outFile) {
@@ -993,52 +1015,59 @@ namespace ts {
                 if (options.mapRoot) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "mapRoot", "sourceMap"));
                 }
-                if (options.sourceRoot) {
+                if (options.sourceRoot && !options.inlineSourceMap) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "sourceRoot", "sourceMap"));
                 }
-                return;
             }
 
-            let languageVersion = options.target || ScriptTarget.ES3;
-            let outFile = options.outFile || options.out;
+            const languageVersion = options.target || ScriptTarget.ES3;
+            const outFile = options.outFile || options.out;
 
-            let firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);
+            const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);
             if (options.isolatedModules) {
                 if (!options.module && languageVersion < ScriptTarget.ES6) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES6_or_higher));
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
 
-                let firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined);
+                const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined);
                 if (firstNonExternalModuleSourceFile) {
-                    let span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
+                    const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
                     programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && !options.module) {
                 // We cannot use createDiagnosticFromNode because nodes do not have parents yet
-                let span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
+                const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
                 programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided));
             }
 
             // Cannot specify module gen target of es6 when below es6
             if (options.module === ModuleKind.ES6 && languageVersion < ScriptTarget.ES6) {
-                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower));
+                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
+            }
+
+            // Cannot specify module gen that isn't amd or system with --out
+            if (outFile && options.module && !(options.module === ModuleKind.AMD || options.module === ModuleKind.System)) {
+                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
 
             // there has to be common source directory if user specified --outdir || --sourceRoot
             // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted
             if (options.outDir || // there is --outDir specified
                 options.sourceRoot || // there is --sourceRoot specified
-                (options.mapRoot &&  // there is --mapRoot specified and there would be multiple js files generated
-                    (!outFile || firstExternalModuleSourceFile !== undefined))) {
+                options.mapRoot) { // there is --mapRoot specified
 
                 if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
                     // If a rootDir is specified and is valid use it as the commonSourceDirectory
-                    commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, host.getCurrentDirectory());
+                    commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
                     // Compute the commonSourceDirectory from the input files
                     commonSourceDirectory = computeCommonSourceDirectory(files);
+                    // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure
+                    if (options.outDir && commonSourceDirectory === "" && forEach(files, file => getRootLength(file.fileName) > 1)) {
+                            programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
+                    }
                 }
 
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) {
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index a827d755302..4289d910608 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -49,7 +49,7 @@ namespace ts {
         tryScan<T>(callback: () => T): T;
     }
 
-    let textToToken: Map<SyntaxKind> = {
+    const textToToken: Map<SyntaxKind> = {
         "abstract": SyntaxKind.AbstractKeyword,
         "any": SyntaxKind.AnyKeyword,
         "as": SyntaxKind.AsKeyword,
@@ -191,8 +191,8 @@ namespace ts {
         Codepoint ranges for ES3 Identifiers are extracted from the Unicode 3.0.0 specification at:
         http://www.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
     */
-    let unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
-    let unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    const unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    const unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
 
     /*
         As per ECMAScript Language Specification 5th Edition, Section 7.6: ISyntaxToken Names and Identifiers
@@ -216,8 +216,8 @@ namespace ts {
         Codepoint ranges for ES5 Identifiers are extracted from the Unicode 6.2 specification at:
         http://www.unicode.org/Public/6.2.0/ucd/UnicodeData.txt
     */
-    let unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
-    let unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    const unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    const unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
 
     function lookupInUnicodeMap(code: number, map: number[]): boolean {
         // Bail out quickly if it couldn't possibly be in the map.
@@ -262,8 +262,8 @@ namespace ts {
     }
 
     function makeReverseMap(source: Map<number>): string[] {
-        let result: string[] = [];
-        for (let name in source) {
+        const result: string[] = [];
+        for (const name in source) {
             if (source.hasOwnProperty(name)) {
                 result[source[name]] = name;
             }
@@ -271,7 +271,7 @@ namespace ts {
         return result;
     }
 
-    let tokenStrings = makeReverseMap(textToToken);
+    const tokenStrings = makeReverseMap(textToToken);
 
     export function tokenToString(t: SyntaxKind): string {
         return tokenStrings[t];
@@ -284,11 +284,11 @@ namespace ts {
 
     /* @internal */
     export function computeLineStarts(text: string): number[] {
-        let result: number[] = new Array();
+        const result: number[] = new Array();
         let pos = 0;
         let lineStart = 0;
         while (pos < text.length) {
-           let ch = text.charCodeAt(pos++);
+           const ch = text.charCodeAt(pos++);
            switch (ch) {
                 case CharacterCodes.carriageReturn:
                     if (text.charCodeAt(pos) === CharacterCodes.lineFeed) {
@@ -352,7 +352,7 @@ namespace ts {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
 
-    let hasOwnProperty = Object.prototype.hasOwnProperty;
+    const hasOwnProperty = Object.prototype.hasOwnProperty;
 
     export function isWhiteSpace(ch: number): boolean {
         // Note: nextLine is in the Zs space, and should be considered to be a whitespace.
@@ -400,7 +400,7 @@ namespace ts {
 
       export function couldStartTrivia(text: string, pos: number): boolean {
           // Keep in sync with skipTrivia
-          let ch = text.charCodeAt(pos);
+          const ch = text.charCodeAt(pos);
           switch (ch) {
               case CharacterCodes.carriageReturn:
               case CharacterCodes.lineFeed:
@@ -427,7 +427,7 @@ namespace ts {
       export function skipTrivia(text: string, pos: number, stopAfterLineBreak?: boolean): number {
           // Keep in sync with couldStartTrivia
           while (true) {
-              let ch = text.charCodeAt(pos);
+              const ch = text.charCodeAt(pos);
               switch (ch) {
                   case CharacterCodes.carriageReturn:
                       if (text.charCodeAt(pos + 1) === CharacterCodes.lineFeed) {
@@ -498,14 +498,14 @@ namespace ts {
 
       // All conflict markers consist of the same character repeated seven times.  If it is
       // a <<<<<<< or >>>>>>> marker then it is also followd by a space.
-    let mergeConflictMarkerLength = "<<<<<<<".length;
+    const mergeConflictMarkerLength = "<<<<<<<".length;
 
     function isConflictMarkerTrivia(text: string, pos: number) {
         Debug.assert(pos >= 0);
 
         // Conflict markers must be at the start of a line.
         if (pos === 0 || isLineBreak(text.charCodeAt(pos - 1))) {
-            let ch = text.charCodeAt(pos);
+            const ch = text.charCodeAt(pos);
 
             if ((pos + mergeConflictMarkerLength) < text.length) {
                 for (let i = 0, n = mergeConflictMarkerLength; i < n; i++) {
@@ -527,8 +527,8 @@ namespace ts {
             error(Diagnostics.Merge_conflict_marker_encountered, mergeConflictMarkerLength);
         }
 
-        let ch = text.charCodeAt(pos);
-        let len = text.length;
+        const ch = text.charCodeAt(pos);
+        const len = text.length;
 
         if (ch === CharacterCodes.lessThan || ch === CharacterCodes.greaterThan) {
             while (pos < len && !isLineBreak(text.charCodeAt(pos))) {
@@ -540,7 +540,7 @@ namespace ts {
             // Consume everything from the start of the mid-conlict marker to the start of the next
             // end-conflict marker.
             while (pos < len) {
-                let ch = text.charCodeAt(pos);
+                const ch = text.charCodeAt(pos);
                 if (ch === CharacterCodes.greaterThan && isConflictMarkerTrivia(text, pos)) {
                     break;
                 }
@@ -561,7 +561,7 @@ namespace ts {
     }
 
     function scanShebangTrivia(text: string, pos: number) {
-        let shebang = shebangTriviaRegex.exec(text)[0];
+        const shebang = shebangTriviaRegex.exec(text)[0];
         pos = pos + shebang.length;
         return pos;
     }
@@ -580,8 +580,8 @@ namespace ts {
     function getCommentRanges(text: string, pos: number, trailing: boolean): CommentRange[] {
         let result: CommentRange[];
         let collecting = trailing || pos === 0;
-        while (true) {
-            let ch = text.charCodeAt(pos);
+        while (pos < text.length) {
+            const ch = text.charCodeAt(pos);
             switch (ch) {
                 case CharacterCodes.carriageReturn:
                     if (text.charCodeAt(pos + 1) === CharacterCodes.lineFeed) {
@@ -607,8 +607,8 @@ namespace ts {
                     let nextChar = text.charCodeAt(pos + 1);
                     let hasTrailingNewLine = false;
                     if (nextChar === CharacterCodes.slash || nextChar === CharacterCodes.asterisk) {
-                        let kind = nextChar === CharacterCodes.slash ? SyntaxKind.SingleLineCommentTrivia : SyntaxKind.MultiLineCommentTrivia;
-                        let startPos = pos;
+                        const kind = nextChar === CharacterCodes.slash ? SyntaxKind.SingleLineCommentTrivia : SyntaxKind.MultiLineCommentTrivia;
+                        const startPos = pos;
                         pos += 2;
                         if (nextChar === CharacterCodes.slash) {
                             while (pos < text.length) {
@@ -650,6 +650,8 @@ namespace ts {
             }
             return result;
         }
+
+        return result;
     }
 
     export function getLeadingCommentRanges(text: string, pos: number): CommentRange[] {
@@ -741,8 +743,8 @@ namespace ts {
             }
         }
 
-        function scanNumber(): number {
-            let start = pos;
+        function scanNumber(): string {
+            const start = pos;
             while (isDigit(text.charCodeAt(pos))) pos++;
             if (text.charCodeAt(pos) === CharacterCodes.dot) {
                 pos++;
@@ -761,11 +763,11 @@ namespace ts {
                     error(Diagnostics.Digit_expected);
                 }
             }
-            return +(text.substring(start, end));
+            return "" + +(text.substring(start, end));
         }
 
         function scanOctalDigits(): number {
-            let start = pos;
+            const start = pos;
             while (isOctalDigit(text.charCodeAt(pos))) {
                 pos++;
             }
@@ -792,7 +794,7 @@ namespace ts {
             let digits = 0;
             let value = 0;
             while (digits < minCount || scanAsManyAsPossible) {
-                let ch = text.charCodeAt(pos);
+                const ch = text.charCodeAt(pos);
                 if (ch >= CharacterCodes._0 && ch <= CharacterCodes._9) {
                     value = value * 16 + ch - CharacterCodes._0;
                 }
@@ -815,7 +817,7 @@ namespace ts {
         }
 
         function scanString(): string {
-            let quote = text.charCodeAt(pos++);
+            const quote = text.charCodeAt(pos++);
             let result = "";
             let start = pos;
             while (true) {
@@ -825,7 +827,7 @@ namespace ts {
                     error(Diagnostics.Unterminated_string_literal);
                     break;
                 }
-                let ch = text.charCodeAt(pos);
+                const ch = text.charCodeAt(pos);
                 if (ch === quote) {
                     result += text.substring(start, pos);
                     pos++;
@@ -853,7 +855,7 @@ namespace ts {
          * a literal component of a TemplateExpression.
          */
         function scanTemplateAndSetTokenValue(): SyntaxKind {
-            let startedWithBacktick = text.charCodeAt(pos) === CharacterCodes.backtick;
+            const startedWithBacktick = text.charCodeAt(pos) === CharacterCodes.backtick;
 
             pos++;
             let start = pos;
@@ -869,7 +871,7 @@ namespace ts {
                     break;
                 }
 
-                let currChar = text.charCodeAt(pos);
+                const currChar = text.charCodeAt(pos);
 
                 // '`'
                 if (currChar === CharacterCodes.backtick) {
@@ -925,7 +927,7 @@ namespace ts {
                 error(Diagnostics.Unexpected_end_of_text);
                 return "";
             }
-            let ch = text.charCodeAt(pos++);
+            const ch = text.charCodeAt(pos++);
             switch (ch) {
                 case CharacterCodes._0:
                     return "\0";
@@ -977,7 +979,7 @@ namespace ts {
         }
 
         function scanHexadecimalEscape(numDigits: number): string {
-            let escapedValue = scanExactNumberOfHexDigits(numDigits);
+            const escapedValue = scanExactNumberOfHexDigits(numDigits);
 
             if (escapedValue >= 0) {
                 return String.fromCharCode(escapedValue);
@@ -989,7 +991,7 @@ namespace ts {
         }
 
         function scanExtendedUnicodeEscape(): string {
-            let escapedValue = scanMinimumNumberOfHexDigits(1);
+            const escapedValue = scanMinimumNumberOfHexDigits(1);
             let isInvalidExtendedEscape = false;
 
             // Validate the value of the digit
@@ -1030,8 +1032,8 @@ namespace ts {
                 return String.fromCharCode(codePoint);
             }
 
-            let codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
-            let codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
+            const codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
+            const codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
 
             return String.fromCharCode(codeUnit1, codeUnit2);
         }
@@ -1040,9 +1042,9 @@ namespace ts {
         // and return code point value if valid Unicode escape is found. Otherwise return -1.
         function peekUnicodeEscape(): number {
             if (pos + 5 < end && text.charCodeAt(pos + 1) === CharacterCodes.u) {
-                let start = pos;
+                const start = pos;
                 pos += 2;
-                let value = scanExactNumberOfHexDigits(4);
+                const value = scanExactNumberOfHexDigits(4);
                 pos = start;
                 return value;
             }
@@ -1078,9 +1080,9 @@ namespace ts {
 
         function getIdentifierToken(): SyntaxKind {
             // Reserved words are between 2 and 11 characters long and start with a lowercase letter
-            let len = tokenValue.length;
+            const len = tokenValue.length;
             if (len >= 2 && len <= 11) {
-                let ch = tokenValue.charCodeAt(0);
+                const ch = tokenValue.charCodeAt(0);
                 if (ch >= CharacterCodes.a && ch <= CharacterCodes.z && hasOwnProperty.call(textToToken, tokenValue)) {
                     return token = textToToken[tokenValue];
                 }
@@ -1096,8 +1098,8 @@ namespace ts {
             // Similarly valid octalIntegerLiteral must have at least one octal digit following o or O.
             let numberOfDigits = 0;
             while (true) {
-                let ch = text.charCodeAt(pos);
-                let valueOfCh = ch - CharacterCodes._0;
+                const ch = text.charCodeAt(pos);
+                const valueOfCh = ch - CharacterCodes._0;
                 if (!isDigit(ch) || valueOfCh >= base) {
                     break;
                 }
@@ -1229,7 +1231,7 @@ namespace ts {
                         return pos++, token = SyntaxKind.MinusToken;
                     case CharacterCodes.dot:
                         if (isDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = "" + scanNumber();
+                            tokenValue = scanNumber();
                             return token = SyntaxKind.NumericLiteral;
                         }
                         if (text.charCodeAt(pos + 1) === CharacterCodes.dot && text.charCodeAt(pos + 2) === CharacterCodes.dot) {
@@ -1262,7 +1264,7 @@ namespace ts {
 
                             let commentClosed = false;
                             while (pos < end) {
-                                let ch = text.charCodeAt(pos);
+                                const ch = text.charCodeAt(pos);
 
                                 if (ch === CharacterCodes.asterisk && text.charCodeAt(pos + 1) === CharacterCodes.slash) {
                                     pos += 2;
@@ -1343,7 +1345,7 @@ namespace ts {
                     case CharacterCodes._7:
                     case CharacterCodes._8:
                     case CharacterCodes._9:
-                        tokenValue = "" + scanNumber();
+                        tokenValue = scanNumber();
                         return token = SyntaxKind.NumericLiteral;
                     case CharacterCodes.colon:
                         return pos++, token = SyntaxKind.ColonToken;
@@ -1504,7 +1506,7 @@ namespace ts {
                         break;
                     }
 
-                    let ch = text.charCodeAt(p);
+                    const ch = text.charCodeAt(p);
                     if (isLineBreak(ch)) {
                         tokenIsUnterminated = true;
                         error(Diagnostics.Unterminated_regular_expression_literal);
@@ -1594,9 +1596,9 @@ namespace ts {
         // they allow dashes
         function scanJsxIdentifier(): SyntaxKind {
             if (tokenIsIdentifierOrKeyword(token)) {
-                let firstCharPosition = pos;
+                const firstCharPosition = pos;
                 while (pos < end) {
-                    let ch = text.charCodeAt(pos);
+                    const ch = text.charCodeAt(pos);
                     if (ch === CharacterCodes.minus || ((firstCharPosition === pos) ? isIdentifierStart(ch, languageVersion) : isIdentifierPart(ch, languageVersion))) {
                         pos++;
                     }
@@ -1610,13 +1612,13 @@ namespace ts {
         }
 
         function speculationHelper<T>(callback: () => T, isLookahead: boolean): T {
-            let savePos = pos;
-            let saveStartPos = startPos;
-            let saveTokenPos = tokenPos;
-            let saveToken = token;
-            let saveTokenValue = tokenValue;
-            let savePrecedingLineBreak = precedingLineBreak;
-            let result = callback();
+            const savePos = pos;
+            const saveStartPos = startPos;
+            const saveTokenPos = tokenPos;
+            const saveToken = token;
+            const saveTokenValue = tokenValue;
+            const savePrecedingLineBreak = precedingLineBreak;
+            const result = callback();
 
             // If our callback returned something 'falsy' or we're just looking ahead,
             // then unconditionally restore us to where we were.
@@ -1632,11 +1634,11 @@ namespace ts {
         }
 
         function lookAhead<T>(callback: () => T): T {
-            return speculationHelper(callback, /*isLookahead:*/ true);
+            return speculationHelper(callback, /*isLookahead*/ true);
         }
 
         function tryScan<T>(callback: () => T): T {
-            return speculationHelper(callback, /*isLookahead:*/ false);
+            return speculationHelper(callback, /*isLookahead*/ false);
         }
 
         function setText(newText: string, start: number, length: number) {
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 0872a2e5ba5..3a90ca42fa1 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -51,15 +51,15 @@ namespace ts {
 
         function getWScriptSystem(): System {
 
-            let fso = new ActiveXObject("Scripting.FileSystemObject");
+            const fso = new ActiveXObject("Scripting.FileSystemObject");
 
-            let fileStream = new ActiveXObject("ADODB.Stream");
+            const fileStream = new ActiveXObject("ADODB.Stream");
             fileStream.Type = 2 /*text*/;
 
-            let binaryStream = new ActiveXObject("ADODB.Stream");
+            const binaryStream = new ActiveXObject("ADODB.Stream");
             binaryStream.Type = 1 /*binary*/;
 
-            let args: string[] = [];
+            const args: string[] = [];
             for (let i = 0; i < WScript.Arguments.length; i++) {
                 args[i] = WScript.Arguments.Item(i);
             }
@@ -78,7 +78,7 @@ namespace ts {
                         // Load file and read the first two bytes into a string with no interpretation
                         fileStream.Charset = "x-ansi";
                         fileStream.LoadFromFile(fileName);
-                        let bom = fileStream.ReadText(2) || "";
+                        const bom = fileStream.ReadText(2) || "";
                         // Position must be at 0 before encoding can be changed
                         fileStream.Position = 0;
                         // [0xFF,0xFE] and [0xFE,0xFF] mean utf-16 (little or big endian), otherwise default to utf-8
@@ -124,7 +124,7 @@ namespace ts {
             }
 
             function getNames(collection: any): string[] {
-                let result: string[] = [];
+                const result: string[] = [];
                 for (let e = new Enumerator(collection); !e.atEnd(); e.moveNext()) {
                     result.push(e.item().Name);
                 }
@@ -132,22 +132,22 @@ namespace ts {
             }
 
             function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
-                let result: string[] = [];
+                const result: string[] = [];
                 exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
                 visitDirectory(path);
                 return result;
                 function visitDirectory(path: string) {
-                    let folder = fso.GetFolder(path || ".");
-                    let files = getNames(folder.files);
-                    for (let current of files) {
-                        let name = combinePaths(path, current);
+                    const folder = fso.GetFolder(path || ".");
+                    const files = getNames(folder.files);
+                    for (const current of files) {
+                        const name = combinePaths(path, current);
                         if ((!extension || fileExtensionIs(name, extension)) && !contains(exclude, getCanonicalPath(name))) {
                             result.push(name);
                         }
                     }
-                    let subfolders = getNames(folder.subfolders);
-                    for (let current of subfolders) {
-                        let name = combinePaths(path, current);
+                    const subfolders = getNames(folder.subfolders);
+                    for (const current of subfolders) {
+                        const name = combinePaths(path, current);
                         if (!contains(exclude, getCanonicalPath(name))) {
                             visitDirectory(name);
                         }
@@ -198,6 +198,7 @@ namespace ts {
             const _fs = require("fs");
             const _path = require("path");
             const _os = require("os");
+            const _tty = require("tty");
 
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
@@ -211,7 +212,7 @@ namespace ts {
                 }
 
                 function poll(checkedIndex: number) {
-                    let watchedFile = watchedFiles[checkedIndex];
+                    const watchedFile = watchedFiles[checkedIndex];
                     if (!watchedFile) {
                         return;
                     }
@@ -251,7 +252,7 @@ namespace ts {
                 }
 
                 function addFile(fileName: string, callback: (fileName: string, removed?: boolean) => void): WatchedFile {
-                    let file: WatchedFile = {
+                    const file: WatchedFile = {
                         fileName,
                         callback,
                         mtime: getModifiedTime(fileName)
@@ -290,7 +291,7 @@ 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?
-            let watchedFileSet = createWatchedFileSet();
+            const watchedFileSet = createWatchedFileSet();
 
             function isNode4OrLater(): Boolean {
                 return parseInt(process.version.charAt(1)) >= 4;
@@ -304,14 +305,14 @@ namespace ts {
                 if (!_fs.existsSync(fileName)) {
                     return undefined;
                 }
-                let buffer = _fs.readFileSync(fileName);
+                const buffer = _fs.readFileSync(fileName);
                 let len = buffer.length;
                 if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
                     // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
                     // flip all byte pairs and treat as little endian.
                     len &= ~1;
                     for (let i = 0; i < len; i += 2) {
-                        let temp = buffer[i];
+                        const temp = buffer[i];
                         buffer[i] = buffer[i + 1];
                         buffer[i + 1] = temp;
                     }
@@ -335,7 +336,17 @@ namespace ts {
                     data = "\uFEFF" + data;
                 }
 
-                _fs.writeFileSync(fileName, data, "utf8");
+                let fd: number;
+
+                try {
+                    fd = _fs.openSync(fileName, "w");
+                    _fs.writeSync(fd, data, undefined, "utf8");
+                }
+                finally {
+                    if (fd !== undefined) {
+                        _fs.closeSync(fd);
+                    }
+                }
             }
 
             function getCanonicalPath(path: string): string {
@@ -343,17 +354,17 @@ namespace ts {
             }
 
             function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
-                let result: string[] = [];
+                const result: string[] = [];
                 exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
                 visitDirectory(path);
                 return result;
                 function visitDirectory(path: string) {
-                    let files = _fs.readdirSync(path || ".").sort();
-                    let directories: string[] = [];
-                    for (let current of files) {
-                        let name = combinePaths(path, current);
+                    const files = _fs.readdirSync(path || ".").sort();
+                    const directories: string[] = [];
+                    for (const current of files) {
+                        const name = combinePaths(path, current);
                         if (!contains(exclude, getCanonicalPath(name))) {
-                            let stat = _fs.statSync(name);
+                            const stat = _fs.statSync(name);
                             if (stat.isFile()) {
                                 if (!extension || fileExtensionIs(name, extension)) {
                                     result.push(name);
@@ -364,7 +375,7 @@ namespace ts {
                             }
                         }
                     }
-                    for (let current of directories) {
+                    for (const current of directories) {
                         visitDirectory(current);
                     }
                 }
@@ -375,15 +386,7 @@ namespace ts {
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 write(s: string): void {
-                    const buffer = new Buffer(s, "utf8");
-                    let offset = 0;
-                    let toWrite: number = buffer.length;
-                    let written = 0;
-                    // 1 is a standard descriptor for stdout
-                    while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
-                        offset += written;
-                        toWrite -= written;
-                    }
+                    process.stdout.write(s);
                 },
                 readFile,
                 writeFile,
@@ -397,7 +400,7 @@ namespace ts {
                         return _fs.watch(fileName, (eventName: string, relativeFileName: string) => callback(fileName));
                     }
 
-                    let watchedFile = watchedFileSet.addFile(fileName, callback);
+                    const watchedFile = watchedFileSet.addFile(fileName, callback);
                     return {
                         close: () => watchedFileSet.removeFile(watchedFile)
                     };
@@ -407,7 +410,7 @@ namespace ts {
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     return _fs.watch(
                         path,
-                        { persisten: true, recursive: !!recursive },
+                        { persistent: true, recursive: !!recursive },
                         (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
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 636f76b3799..578c94235d4 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -6,20 +6,28 @@ namespace ts {
         fileWatcher?: FileWatcher;
     }
 
+    let reportDiagnostic = reportDiagnosticSimply;
+
+    function reportDiagnostics(diagnostics: Diagnostic[], host: CompilerHost): void {
+        for (const diagnostic of diagnostics) {
+            reportDiagnostic(diagnostic, host);
+        }
+    }
+
     /**
      * Checks to see if the locale is in the appropriate format,
      * and if it is, attempts to set the appropriate language.
      */
     function validateLocaleAndSetLanguage(locale: string, errors: Diagnostic[]): boolean {
-        let matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
+        const matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
 
         if (!matchResult) {
             errors.push(createCompilerDiagnostic(Diagnostics.Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1, "en", "ja-jp"));
             return false;
         }
 
-        let language = matchResult[1];
-        let territory = matchResult[3];
+        const language = matchResult[1];
+        const territory = matchResult[3];
 
         // First try the entire locale, then fall back to just language if that's all we have.
         if (!trySetLanguageAndTerritory(language, territory, errors) &&
@@ -33,8 +41,8 @@ namespace ts {
     }
 
     function trySetLanguageAndTerritory(language: string, territory: string, errors: Diagnostic[]): boolean {
-        let compilerFilePath = normalizePath(sys.getExecutingFilePath());
-        let containingDirectoryPath = getDirectoryPath(compilerFilePath);
+        const compilerFilePath = normalizePath(sys.getExecutingFilePath());
+        const containingDirectoryPath = getDirectoryPath(compilerFilePath);
 
         let filePath = combinePaths(containingDirectoryPath, language);
 
@@ -77,35 +85,122 @@ namespace ts {
     }
 
     function getDiagnosticText(message: DiagnosticMessage, ...args: any[]): string {
-        let diagnostic = createCompilerDiagnostic.apply(undefined, arguments);
+        const diagnostic = createCompilerDiagnostic.apply(undefined, arguments);
         return <string>diagnostic.messageText;
     }
 
-    function reportDiagnostic(diagnostic: Diagnostic) {
+    function getRelativeFileName(fileName: string, host: CompilerHost): string {
+        return host ? convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName)) : fileName;
+    }
+
+    function reportDiagnosticSimply(diagnostic: Diagnostic, host: CompilerHost): void {
         let output = "";
 
         if (diagnostic.file) {
-            let loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
-            output += `${ diagnostic.file.fileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
+            const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
+            const relativeFileName = getRelativeFileName(diagnostic.file.fileName, host);
+            output += `${ relativeFileName }(${ line + 1 },${ character + 1 }): `;
         }
 
-        let category = DiagnosticCategory[diagnostic.category].toLowerCase();
+        const category = DiagnosticCategory[diagnostic.category].toLowerCase();
         output += `${ category } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }${ sys.newLine }`;
 
         sys.write(output);
     }
 
-    function reportDiagnostics(diagnostics: Diagnostic[]) {
-        for (let i = 0; i < diagnostics.length; i++) {
-            reportDiagnostic(diagnostics[i]);
+
+    const redForegroundEscapeSequence = "\u001b[91m";
+    const yellowForegroundEscapeSequence = "\u001b[93m";
+    const blueForegroundEscapeSequence = "\u001b[93m";
+    const gutterStyleSequence = "\u001b[100;30m";
+    const gutterSeparator = " ";
+    const resetEscapeSequence = "\u001b[0m";
+    const elipsis = "...";
+    const categoryFormatMap: Map<string> = {
+        [DiagnosticCategory.Warning]: yellowForegroundEscapeSequence,
+        [DiagnosticCategory.Error]: redForegroundEscapeSequence,
+        [DiagnosticCategory.Message]: blueForegroundEscapeSequence,
+    };
+
+    function formatAndReset(text: string, formatStyle: string) {
+        return formatStyle + text + resetEscapeSequence;
+    }
+
+    function reportDiagnosticWithColorAndContext(diagnostic: Diagnostic, host: CompilerHost): void {
+        let output = "";
+
+        if (diagnostic.file) {
+            const { start, length, file } = diagnostic;
+            const { line: firstLine, character: firstLineChar } = getLineAndCharacterOfPosition(file, start);
+            const { line: lastLine, character: lastLineChar } = getLineAndCharacterOfPosition(file, start + length);
+            const lastLineInFile = getLineAndCharacterOfPosition(file, file.text.length).line;
+            const relativeFileName = getRelativeFileName(file.fileName, host);
+
+            const hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
+            let gutterWidth = (lastLine + 1 + "").length;
+            if (hasMoreThanFiveLines) {
+                gutterWidth = Math.max(elipsis.length, gutterWidth);
+            }
+
+            output += sys.newLine;
+            for (let i = firstLine; i <= lastLine; i++) {
+                // If the error spans over 5 lines, we'll only show the first 2 and last 2 lines,
+                // so we'll skip ahead to the second-to-last line.
+                if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
+                    output += formatAndReset(padLeft(elipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + sys.newLine;
+                    i = lastLine - 1;
+                }
+
+                const lineStart = getPositionOfLineAndCharacter(file, i, 0);
+                const lineEnd = i < lastLineInFile ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
+                let lineContent = file.text.slice(lineStart, lineEnd);
+                lineContent = lineContent.replace(/\s+$/g, "");  // trim from end
+                lineContent = lineContent.replace("\t", " ");    // convert tabs to single spaces
+
+                // Output the gutter and the actual contents of the line.
+                output += formatAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
+                output += lineContent + sys.newLine;
+
+                // Output the gutter and the error span for the line using tildes.
+                output += formatAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
+                output += redForegroundEscapeSequence;
+                if (i === firstLine) {
+                    // If we're on the last line, then limit it to the last character of the last line.
+                    // Otherwise, we'll just squiggle the rest of the line, giving 'slice' no end position.
+                    const lastCharForLine = i === lastLine ? lastLineChar : undefined;
+
+                    output += lineContent.slice(0, firstLineChar).replace(/\S/g, " ");
+                    output += lineContent.slice(firstLineChar, lastCharForLine).replace(/./g, "~");
+                }
+                else if (i === lastLine) {
+                    output += lineContent.slice(0, lastLineChar).replace(/./g, "~");
+                }
+                else {
+                    // Squiggle the entire line.
+                    output += lineContent.replace(/./g, "~");
+                }
+                output += resetEscapeSequence;
+
+                output += sys.newLine;
+            }
+
+            output += sys.newLine;
+            output += `${ relativeFileName }(${ firstLine + 1 },${ firstLineChar + 1 }): `;
         }
+
+        const categoryColor = categoryFormatMap[diagnostic.category];
+        const category = DiagnosticCategory[diagnostic.category].toLowerCase();
+        output += `${ formatAndReset(category, categoryColor) } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }`;
+        output += sys.newLine + sys.newLine;
+
+        sys.write(output);
     }
 
     function reportWatchDiagnostic(diagnostic: Diagnostic) {
         let output = new Date().toLocaleTimeString() + " - ";
 
         if (diagnostic.file) {
-            let loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
+            const loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
             output += `${ diagnostic.file.fileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
         }
 
@@ -146,7 +241,7 @@ namespace ts {
     }
 
     export function executeCommandLine(args: string[]): void {
-        let commandLine = parseCommandLine(args);
+        const commandLine = parseCommandLine(args);
         let configFileName: string;                                 // Configuration file name (if any)
         let cachedConfigFileText: string;                           // Cached configuration file text, used for reparsing (if any)
         let configFileWatcher: FileWatcher;                         // Configuration file watcher
@@ -159,9 +254,14 @@ namespace ts {
         let timerHandleForRecompilation: number;                    // Handle for 0.25s wait timer to trigger recompilation
         let timerHandleForDirectoryChanges: number;                 // Handle for 0.25s wait timer to trigger directory change handler
 
+        // This map stores and reuses results of fileExists check that happen inside 'createProgram'
+        // This allows to save time in module resolution heavy scenarios when existence of the same file might be checked multiple times.
+        let cachedExistingFiles: Map<boolean>;
+        let hostFileExists: typeof compilerHost.fileExists;
+
         if (commandLine.options.locale) {
             if (!isJSONSupported()) {
-                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"));
+                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"), /* compilerHost */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             validateLocaleAndSetLanguage(commandLine.options.locale, commandLine.errors);
@@ -170,7 +270,7 @@ namespace ts {
         // If there are any errors due to command line parsing and/or
         // setting up localization, report them and quit.
         if (commandLine.errors.length > 0) {
-            reportDiagnostics(commandLine.errors);
+            reportDiagnostics(commandLine.errors, compilerHost);
             return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
         }
 
@@ -192,17 +292,17 @@ namespace ts {
 
         if (commandLine.options.project) {
             if (!isJSONSupported()) {
-                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--project"));
+                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--project"), /* compilerHost */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             configFileName = normalizePath(combinePaths(commandLine.options.project, "tsconfig.json"));
             if (commandLine.fileNames.length !== 0) {
-                reportDiagnostic(createCompilerDiagnostic(Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line));
+                reportDiagnostic(createCompilerDiagnostic(Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line), /* compilerHost */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
         }
         else if (commandLine.fileNames.length === 0 && isJSONSupported()) {
-            let searchPath = normalizePath(sys.getCurrentDirectory());
+            const searchPath = normalizePath(sys.getCurrentDirectory());
             configFileName = findConfigFile(searchPath);
         }
 
@@ -215,14 +315,14 @@ namespace ts {
         // Firefox has Object.prototype.watch
         if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {
             if (!sys.watchFile) {
-                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"));
+                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             if (configFileName) {
                 configFileWatcher = sys.watchFile(configFileName, configFileChanged);
             }
             if (sys.watchDirectory && configFileName) {
-                let directory = ts.getDirectoryPath(configFileName);
+                const directory = ts.getDirectoryPath(configFileName);
                 directoryWatcher = sys.watchDirectory(
                     // When the configFileName is just "tsconfig.json", the watched directory should be 
                     // the current direcotry; if there is a given "project" parameter, then the configFileName
@@ -240,18 +340,29 @@ namespace ts {
                     cachedConfigFileText = sys.readFile(configFileName);
                 }
                 catch (e) {
-                    let error = createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, configFileName, e.message);
+                    const error = createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, configFileName, e.message);
                     reportWatchDiagnostic(error);
                     sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                     return;
                 }
             }
+            if (!cachedConfigFileText) {
+                const error = createCompilerDiagnostic(Diagnostics.File_0_not_found, configFileName);
+                reportDiagnostics([error], /* compilerHost */ undefined);
+                sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
+                return;
+            }
 
-            let result = parseConfigFileTextToJson(configFileName, cachedConfigFileText);
-            let configObject = result.config;
-            let configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName));
+            const result = parseConfigFileTextToJson(configFileName, cachedConfigFileText);
+            const configObject = result.config;
+            if (!configObject) {
+                reportDiagnostics([result.error], /* compilerHost */ undefined);
+                sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
+                return;
+            }
+            const configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName));
             if (configParseResult.errors.length > 0) {
-                reportDiagnostics(configParseResult.errors);
+                reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
                 sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
@@ -263,7 +374,7 @@ namespace ts {
 
             if (!cachedProgram) {
                 if (configFileName) {
-                    let configParseResult = parseConfigFile();
+                    const configParseResult = parseConfigFile();
                     rootFileNames = configParseResult.fileNames;
                     compilerOptions = extend(commandLine.options, configParseResult.options);
                 }
@@ -274,9 +385,19 @@ namespace ts {
                 compilerHost = createCompilerHost(compilerOptions);
                 hostGetSourceFile = compilerHost.getSourceFile;
                 compilerHost.getSourceFile = getSourceFile;
+
+                hostFileExists = compilerHost.fileExists;
+                compilerHost.fileExists = cachedFileExists;
             }
 
-            let compileResult = compile(rootFileNames, compilerOptions, compilerHost);
+            if (compilerOptions.pretty) {
+                reportDiagnostic = reportDiagnosticWithColorAndContext;
+            }
+
+            // reset the cache of existing files
+            cachedExistingFiles = {};
+
+            const compileResult = compile(rootFileNames, compilerOptions, compilerHost);
 
             if (!compilerOptions.watch) {
                 return sys.exit(compileResult.exitStatus);
@@ -286,17 +407,24 @@ namespace ts {
             reportWatchDiagnostic(createCompilerDiagnostic(Diagnostics.Compilation_complete_Watching_for_file_changes));
         }
 
+        function cachedFileExists(fileName: string): boolean {
+            if (hasProperty(cachedExistingFiles, fileName)) {
+                return cachedExistingFiles[fileName];
+            }
+            return cachedExistingFiles[fileName] = hostFileExists(fileName);
+        }
+
         function getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void) {
             // Return existing SourceFile object if one is available
             if (cachedProgram) {
-                let sourceFile = cachedProgram.getSourceFile(fileName);
+                const sourceFile = cachedProgram.getSourceFile(fileName);
                 // A modified source file has no watcher and should not be reused
                 if (sourceFile && sourceFile.fileWatcher) {
                     return sourceFile;
                 }
             }
             // Use default host function
-            let sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
+            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));
@@ -307,7 +435,7 @@ namespace ts {
         // Change cached program to the given program
         function setCachedProgram(program: Program) {
             if (cachedProgram) {
-                let newSourceFiles = program ? program.getSourceFiles() : undefined;
+                const newSourceFiles = program ? program.getSourceFiles() : undefined;
                 forEach(cachedProgram.getSourceFiles(), sourceFile => {
                     if (!(newSourceFiles && contains(newSourceFiles, sourceFile))) {
                         if (sourceFile.fileWatcher) {
@@ -325,7 +453,7 @@ namespace ts {
             sourceFile.fileWatcher.close();
             sourceFile.fileWatcher = undefined;
             if (removed) {
-                let index = rootFileNames.indexOf(sourceFile.fileName);
+                const index = rootFileNames.indexOf(sourceFile.fileName);
                 if (index >= 0) {
                     rootFileNames.splice(index, 1);
                 }
@@ -356,11 +484,12 @@ namespace ts {
         }
 
         function directoryChangeHandler() {
-            let parsedCommandLine = parseConfigFile();
-            let newFileNames = ts.map(parsedCommandLine.fileNames, compilerHost.getCanonicalFileName);
-            let canonicalRootFileNames = ts.map(rootFileNames, compilerHost.getCanonicalFileName);
+            const parsedCommandLine = parseConfigFile();
+            const newFileNames = ts.map(parsedCommandLine.fileNames, compilerHost.getCanonicalFileName);
+            const canonicalRootFileNames = ts.map(rootFileNames, compilerHost.getCanonicalFileName);
 
-            if (!arrayStructurallyIsEqualTo(newFileNames, canonicalRootFileNames)) {
+            // We check if the project file list has changed. If so, we just throw away the old program and start fresh.
+            if (!arrayIsEqualTo(newFileNames && newFileNames.sort(), canonicalRootFileNames && canonicalRootFileNames.sort())) {
                 setCachedProgram(undefined);
                 startTimerForRecompilation();
             }
@@ -391,8 +520,8 @@ namespace ts {
         checkTime = 0;
         emitTime = 0;
 
-        let program = createProgram(fileNames, compilerOptions, compilerHost);
-        let exitStatus = compileProgram();
+        const program = createProgram(fileNames, compilerOptions, compilerHost);
+        const exitStatus = compileProgram();
 
         if (compilerOptions.listFiles) {
             forEach(program.getSourceFiles(), file => {
@@ -401,7 +530,7 @@ namespace ts {
         }
 
         if (compilerOptions.diagnostics) {
-            let memoryUsed = sys.getMemoryUsage ? sys.getMemoryUsage() : -1;
+            const memoryUsed = sys.getMemoryUsage ? sys.getMemoryUsage() : -1;
             reportCountStatistic("Files", program.getSourceFiles().length);
             reportCountStatistic("Lines", countLines(program));
             reportCountStatistic("Nodes", program.getNodeCount());
@@ -444,7 +573,7 @@ namespace ts {
                 }
             }
 
-            reportDiagnostics(diagnostics);
+            reportDiagnostics(diagnostics, compilerHost);
 
             // If the user doesn't want us to emit, then we're done at this point.
             if (compilerOptions.noEmit) {
@@ -454,8 +583,8 @@ namespace ts {
             }
 
             // Otherwise, emit and report any errors we ran into.
-            let emitOutput = program.emit();
-            reportDiagnostics(emitOutput.diagnostics);
+            const emitOutput = program.emit();
+            reportDiagnostics(emitOutput.diagnostics, compilerHost);
 
             // If the emitter didn't emit anything, then pass that value along.
             if (emitOutput.emitSkipped) {
@@ -480,8 +609,8 @@ namespace ts {
         let output = "";
 
         // We want to align our "syntax" and "examples" commands to a certain margin.
-        let syntaxLength = getDiagnosticText(Diagnostics.Syntax_Colon_0, "").length;
-        let examplesLength = getDiagnosticText(Diagnostics.Examples_Colon_0, "").length;
+        const syntaxLength = getDiagnosticText(Diagnostics.Syntax_Colon_0, "").length;
+        const examplesLength = getDiagnosticText(Diagnostics.Examples_Colon_0, "").length;
         let marginLength = Math.max(syntaxLength, examplesLength);
 
         // Build up the syntactic skeleton.
@@ -492,7 +621,7 @@ namespace ts {
         output += sys.newLine + sys.newLine;
 
         // Build up the list of examples.
-        let padding = makePadding(marginLength);
+        const padding = makePadding(marginLength);
         output += getDiagnosticText(Diagnostics.Examples_Colon_0, makePadding(marginLength - examplesLength) + "tsc hello.ts") + sys.newLine;
         output += padding + "tsc --out file.js file.ts" + sys.newLine;
         output += padding + "tsc @args.txt" + sys.newLine;
@@ -501,17 +630,17 @@ namespace ts {
         output += getDiagnosticText(Diagnostics.Options_Colon) + sys.newLine;
 
         // Sort our options by their names, (e.g. "--noImplicitAny" comes before "--watch")
-        let optsList = filter(optionDeclarations.slice(), v => !v.experimental);
+        const optsList = filter(optionDeclarations.slice(), v => !v.experimental);
         optsList.sort((a, b) => compareValues<string>(a.name.toLowerCase(), b.name.toLowerCase()));
 
         // We want our descriptions to align at the same column in our output,
         // so we keep track of the longest option usage string.
         marginLength = 0;
-        let usageColumn: string[] = []; // Things like "-d, --declaration" go in here.
-        let descriptionColumn: string[] = [];
+        const usageColumn: string[] = []; // Things like "-d, --declaration" go in here.
+        const descriptionColumn: string[] = [];
 
         for (let i = 0; i < optsList.length; i++) {
-            let option = optsList[i];
+            const option = optsList[i];
 
             // If an option lacks a description,
             // it is not officially supported.
@@ -537,15 +666,15 @@ namespace ts {
         }
 
         // Special case that can't fit in the loop.
-        let usageText = " @<" + getDiagnosticText(Diagnostics.file) + ">";
+        const usageText = " @<" + getDiagnosticText(Diagnostics.file) + ">";
         usageColumn.push(usageText);
         descriptionColumn.push(getDiagnosticText(Diagnostics.Insert_command_line_options_and_files_from_a_file));
         marginLength = Math.max(usageText.length, marginLength);
 
         // Print out each row, aligning all the descriptions on the same column.
         for (let i = 0; i < usageColumn.length; i++) {
-            let usage = usageColumn[i];
-            let description = descriptionColumn[i];
+            const usage = usageColumn[i];
+            const description = descriptionColumn[i];
             output += usage + makePadding(marginLength - usage.length + 2) + description + sys.newLine;
         }
 
@@ -565,14 +694,14 @@ namespace ts {
     }
 
     function writeConfigFile(options: CompilerOptions, fileNames: string[]) {
-        let currentDirectory = sys.getCurrentDirectory();
-        let file = combinePaths(currentDirectory, "tsconfig.json");
+        const currentDirectory = sys.getCurrentDirectory();
+        const file = normalizePath(combinePaths(currentDirectory, "tsconfig.json"));
         if (sys.fileExists(file)) {
-            reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file));
+            reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file), /* compilerHost */ undefined);
         }
         else {
-            let compilerOptions = extend(options, defaultInitCompilerOptions);
-            let configurations: any = {
+            const compilerOptions = extend(options, defaultInitCompilerOptions);
+            const configurations: any = {
                 compilerOptions: serializeCompilerOptions(compilerOptions),
                 exclude: ["node_modules"]
             };
@@ -583,18 +712,18 @@ namespace ts {
             }
 
             sys.writeFile(file, JSON.stringify(configurations, undefined, 4));
-            reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file));
+            reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file), /* compilerHost */ undefined);
         }
 
         return;
 
         function serializeCompilerOptions(options: CompilerOptions): Map<string | number | boolean> {
-            let result: Map<string | number | boolean> = {};
-            let optionsNameMap = getOptionNameMap().optionNameMap;
+            const result: Map<string | number | boolean> = {};
+            const optionsNameMap = getOptionNameMap().optionNameMap;
 
-            for (let name in options) {
+            for (const name in options) {
                 if (hasProperty(options, name)) {
-                    let value = options[name];
+                    const value = options[name];
                     switch (name) {
                         case "init":
                         case "watch":
@@ -611,8 +740,8 @@ namespace ts {
                                 }
                                 else {
                                     // Enum
-                                    let typeMap = <Map<number>>optionDefinition.type;
-                                    for (let key in typeMap) {
+                                    const typeMap = <Map<number>>optionDefinition.type;
+                                    for (const key in typeMap) {
                                         if (hasProperty(typeMap, key)) {
                                             if (typeMap[key] === value)
                                                 result[name] = key;
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index fd541a8ca80..ca297c087cf 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -11,6 +11,7 @@
         "core.ts",
         "sys.ts",
         "types.ts",
+        "diagnosticInformationMap.generated.ts",
         "scanner.ts",
         "parser.ts",
         "utilities.ts",
@@ -19,7 +20,6 @@
         "emitter.ts",
         "program.ts",
         "commandLineParser.ts",
-        "tsc.ts",
-        "diagnosticInformationMap.generated.ts"
+        "tsc.ts"
     ]
 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2818ef04a48..34be02c5ba5 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3,12 +3,17 @@ namespace ts {
         [index: string]: T;
     }
 
+    // branded string type used to store absolute, normalized and canonicalized paths
+    // arbitrary file name can be converted to Path via toPath function
+    export type Path = string & { __pathBrand: any };
+
     export interface FileMap<T> {
-        get(fileName: string): T;
-        set(fileName: string, value: T): void;
-        contains(fileName: string): boolean;
-        remove(fileName: string): void;
-        forEachValue(f: (v: T) => void): void;
+        get(fileName: Path): T;
+        set(fileName: Path, value: T): void;
+        contains(fileName: Path): boolean;
+        remove(fileName: Path): void;
+
+        forEachValue(f: (key: Path, v: T) => void): void;
         clear(): void;
     }
 
@@ -343,7 +348,7 @@ namespace ts {
         LastKeyword = OfKeyword,
         FirstFutureReservedWord = ImplementsKeyword,
         LastFutureReservedWord = YieldKeyword,
-        FirstTypeNode = TypeReference,
+        FirstTypeNode = TypePredicate,
         LastTypeNode = ParenthesizedType,
         FirstPunctuation = OpenBraceToken,
         LastPunctuation = CaretEqualsToken,
@@ -361,28 +366,32 @@ namespace ts {
     }
 
     export const enum NodeFlags {
-        Export =            0x00000001,  // Declarations
-        Ambient =           0x00000002,  // Declarations
-        Public =            0x00000010,  // Property/Method
-        Private =           0x00000020,  // Property/Method
-        Protected =         0x00000040,  // Property/Method
-        Static =            0x00000080,  // Property/Method
-        Abstract =          0x00000100,  // Class/Method/ConstructSignature
-        Async =             0x00000200,  // Property/Method/Function
-        Default =           0x00000400,  // Function/Class (export default declaration)
-        MultiLine =         0x00000800,  // Multi-line array or object literal
-        Synthetic =         0x00001000,  // Synthetic node (for full fidelity)
-        DeclarationFile =   0x00002000,  // Node is a .d.ts file
-        Let =               0x00004000,  // Variable declaration
-        Const =             0x00008000,  // Variable declaration
-        OctalLiteral =      0x00010000,  // Octal numeric literal
-        Namespace =         0x00020000,  // Namespace declaration
-        ExportContext =     0x00040000,  // Export context (initialized by binding)
-        ContainsThis =      0x00080000,  // Interface contains references to "this"
-
+        None =              0,
+        Export =            1 << 1,  // Declarations
+        Ambient =           1 << 2,  // Declarations
+        Public =            1 << 3,  // Property/Method
+        Private =           1 << 4,  // Property/Method
+        Protected =         1 << 5,  // Property/Method
+        Static =            1 << 6,  // Property/Method
+        Abstract =          1 << 7,  // Class/Method/ConstructSignature
+        Async =             1 << 8,  // Property/Method/Function
+        Default =           1 << 9,  // Function/Class (export default declaration)
+        MultiLine =         1 << 10,  // Multi-line array or object literal
+        Synthetic =         1 << 11,  // Synthetic node (for full fidelity)
+        DeclarationFile =   1 << 12,  // Node is a .d.ts file
+        Let =               1 << 13,  // Variable declaration
+        Const =             1 << 14,  // Variable declaration
+        OctalLiteral =      1 << 15,  // Octal numeric literal
+        Namespace =         1 << 16,  // Namespace declaration
+        ExportContext =     1 << 17,  // Export context (initialized by binding)
+        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)
         Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async,
         AccessibilityModifier = Public | Private | Protected,
-        BlockScoped = Let | Const
+        BlockScoped = Let | Const,
+
+        ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn
     }
 
     /* @internal */
@@ -465,15 +474,29 @@ namespace ts {
         hasTrailingComma?: boolean;
     }
 
-    export interface ModifiersArray extends NodeArray<Node> {
+    export interface ModifiersArray extends NodeArray<Modifier> {
         flags: number;
     }
 
+    // @kind(SyntaxKind.AbstractKeyword)
+    // @kind(SyntaxKind.AsyncKeyword)
+    // @kind(SyntaxKind.ConstKeyword)
+    // @kind(SyntaxKind.DeclareKeyword)
+    // @kind(SyntaxKind.DefaultKeyword)
+    // @kind(SyntaxKind.ExportKeyword)
+    // @kind(SyntaxKind.PublicKeyword)
+    // @kind(SyntaxKind.PrivateKeyword)
+    // @kind(SyntaxKind.ProtectedKeyword)
+    // @kind(SyntaxKind.StaticKeyword)
+    export interface Modifier extends Node { }
+
+    // @kind(SyntaxKind.Identifier)
     export interface Identifier extends PrimaryExpression {
         text: string;                                  // Text of identifier (with escapes converted to characters)
         originalKeywordKind?: SyntaxKind;              // Original syntaxKind which get set so that we can report an error later
     }
 
+    // @kind(SyntaxKind.QualifiedName)
     export interface QualifiedName extends Node {
         // Must have same layout as PropertyAccess
         left: EntityName;
@@ -482,6 +505,8 @@ namespace ts {
 
     export type EntityName = Identifier | QualifiedName;
 
+    export type PropertyName = Identifier | LiteralExpression | ComputedPropertyName;
+
     export type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern;
 
     export interface Declaration extends Node {
@@ -489,14 +514,21 @@ namespace ts {
         name?: DeclarationName;
     }
 
+    export interface DeclarationStatement extends Declaration, Statement {
+        name?: Identifier;
+    }
+
+    // @kind(SyntaxKind.ComputedPropertyName)
     export interface ComputedPropertyName extends Node {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.Decorator)
     export interface Decorator extends Node {
         expression: LeftHandSideExpression;
     }
 
+    // @kind(SyntaxKind.TypeParameter)
     export interface TypeParameterDeclaration extends Declaration {
         name: Identifier;
         constraint?: TypeNode;
@@ -506,12 +538,19 @@ namespace ts {
     }
 
     export interface SignatureDeclaration extends Declaration {
+        name?: PropertyName;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         parameters: NodeArray<ParameterDeclaration>;
         type?: TypeNode;
     }
 
-    // SyntaxKind.VariableDeclaration
+    // @kind(SyntaxKind.CallSignature)
+    export interface CallSignatureDeclaration extends SignatureDeclaration, TypeElement { }
+
+    // @kind(SyntaxKind.ConstructSignature)
+    export interface ConstructSignatureDeclaration extends SignatureDeclaration, TypeElement { }
+
+    // @kind(SyntaxKind.VariableDeclaration)
     export interface VariableDeclaration extends Declaration {
         parent?: VariableDeclarationList;
         name: Identifier | BindingPattern;  // Declared variable name
@@ -519,11 +558,12 @@ namespace ts {
         initializer?: Expression;           // Optional initializer
     }
 
+    // @kind(SyntaxKind.VariableDeclarationList)
     export interface VariableDeclarationList extends Node {
         declarations: NodeArray<VariableDeclaration>;
     }
 
-    // SyntaxKind.Parameter
+    // @kind(SyntaxKind.Parameter)
     export interface ParameterDeclaration extends Declaration {
         dotDotDotToken?: Node;              // Present on rest parameter
         name: Identifier | BindingPattern;  // Declared parameter name
@@ -532,35 +572,43 @@ namespace ts {
         initializer?: Expression;           // Optional initializer
     }
 
-    // SyntaxKind.BindingElement
+    // @kind(SyntaxKind.BindingElement)
     export interface BindingElement extends Declaration {
-        propertyName?: Identifier;          // Binding property name (in object binding pattern)
+        propertyName?: PropertyName;        // Binding property name (in object binding pattern)
         dotDotDotToken?: Node;              // Present on rest binding element
         name: Identifier | BindingPattern;  // Declared binding element name
         initializer?: Expression;           // Optional initializer
     }
 
-    // SyntaxKind.Property
-    export interface PropertyDeclaration extends Declaration, ClassElement {
-        name: DeclarationName;              // Declared property name
+    // @kind(SyntaxKind.PropertySignature)
+    export interface PropertySignature extends TypeElement {
+        name: PropertyName;                 // Declared property name
         questionToken?: Node;               // Present on optional property
         type?: TypeNode;                    // Optional type annotation
+    }
+
+    // @kind(SyntaxKind.PropertyDeclaration)
+    export interface PropertyDeclaration extends ClassElement {
+        questionToken?: Node;               // Present for use with reporting a grammar error
+        name: PropertyName;
+        type?: TypeNode;
         initializer?: Expression;           // Optional initializer
     }
 
     export interface ObjectLiteralElement extends Declaration {
         _objectLiteralBrandBrand: any;
-    }
+        name?: PropertyName;
+   }
 
-    // SyntaxKind.PropertyAssignment
+    // @kind(SyntaxKind.PropertyAssignment)
     export interface PropertyAssignment extends ObjectLiteralElement {
         _propertyAssignmentBrand: any;
-        name: DeclarationName;
+        name: PropertyName;
         questionToken?: Node;
         initializer: Expression;
     }
 
-    // SyntaxKind.ShorthandPropertyAssignment
+    // @kind(SyntaxKind.ShorthandPropertyAssignment)
     export interface ShorthandPropertyAssignment extends ObjectLiteralElement {
         name: Identifier;
         questionToken?: Node;
@@ -578,7 +626,7 @@ namespace ts {
     // SyntaxKind.ShorthandPropertyAssignment
     // SyntaxKind.EnumMember
     export interface VariableLikeDeclaration extends Declaration {
-        propertyName?: Identifier;
+        propertyName?: PropertyName;
         dotDotDotToken?: Node;
         name: DeclarationName;
         questionToken?: Node;
@@ -586,10 +634,20 @@ namespace ts {
         initializer?: Expression;
     }
 
+    export interface PropertyLikeDeclaration extends Declaration {
+        name: PropertyName;
+    }
+
     export interface BindingPattern extends Node {
         elements: NodeArray<BindingElement>;
     }
 
+    // @kind(SyntaxKind.ObjectBindingPattern)
+    export interface ObjectBindingPattern extends BindingPattern { }
+
+    // @kind(SyntaxKind.ArrayBindingPattern)
+    export interface ArrayBindingPattern extends BindingPattern { }
+
     /**
      * Several node kinds share function-like features such as a signature,
      * a name, and a body. These nodes should extend FunctionLikeDeclaration.
@@ -606,9 +664,15 @@ namespace ts {
         body?: Block | Expression;
     }
 
-    export interface FunctionDeclaration extends FunctionLikeDeclaration, Statement {
+    // @kind(SyntaxKind.FunctionDeclaration)
+    export interface FunctionDeclaration extends FunctionLikeDeclaration, DeclarationStatement {
         name?: Identifier;
-        body?: Block;
+        body?: FunctionBody;
+    }
+
+    // @kind(SyntaxKind.MethodSignature)
+    export interface MethodSignature extends SignatureDeclaration, TypeElement {
+        name: PropertyName;
     }
 
     // Note that a MethodDeclaration is considered both a ClassElement and an ObjectLiteralElement.
@@ -620,15 +684,19 @@ namespace ts {
     // Because of this, it may be necessary to determine what sort of MethodDeclaration you have
     // at later stages of the compiler pipeline.  In that case, you can either check the parent kind
     // of the method, or use helpers like isObjectLiteralMethodDeclaration
+    // @kind(SyntaxKind.MethodDeclaration)
     export interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
-        body?: Block;
+        name: PropertyName;
+        body?: FunctionBody;
     }
 
+    // @kind(SyntaxKind.Constructor)
     export interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
-        body?: Block;
+        body?: FunctionBody;
     }
 
     // For when we encounter a semicolon in a class declaration.  ES6 allows these as class elements.
+    // @kind(SyntaxKind.SemicolonClassElement)
     export interface SemicolonClassElement extends ClassElement {
         _semicolonClassElementBrand: any;
     }
@@ -637,13 +705,27 @@ namespace ts {
     // ClassElement and an ObjectLiteralElement.
     export interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
         _accessorDeclarationBrand: any;
-        body: Block;
+        name: PropertyName;
+        body: FunctionBody;
     }
 
-    export interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement {
+    // @kind(SyntaxKind.GetAccessor)
+    export interface GetAccessorDeclaration extends AccessorDeclaration { }
+
+    // @kind(SyntaxKind.SetAccessor)
+    export interface SetAccessorDeclaration extends AccessorDeclaration { }
+
+    // @kind(SyntaxKind.IndexSignature)
+    export interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement, TypeElement {
         _indexSignatureDeclarationBrand: any;
     }
 
+    // @kind(SyntaxKind.AnyKeyword)
+    // @kind(SyntaxKind.NumberKeyword)
+    // @kind(SyntaxKind.BooleanKeyword)
+    // @kind(SyntaxKind.StringKeyword)
+    // @kind(SyntaxKind.SymbolKeyword)
+    // @kind(SyntaxKind.VoidKeyword)
     export interface TypeNode extends Node {
         _typeNodeBrand: any;
     }
@@ -652,29 +734,41 @@ namespace ts {
         _functionOrConstructorTypeNodeBrand: any;
     }
 
+    // @kind(SyntaxKind.FunctionType)
+    export interface FunctionTypeNode extends FunctionOrConstructorTypeNode { }
+
+    // @kind(SyntaxKind.ConstructorType)
+    export interface ConstructorTypeNode extends FunctionOrConstructorTypeNode { }
+
+    // @kind(SyntaxKind.TypeReference)
     export interface TypeReferenceNode extends TypeNode {
         typeName: EntityName;
         typeArguments?: NodeArray<TypeNode>;
     }
 
+    // @kind(SyntaxKind.TypePredicate)
     export interface TypePredicateNode extends TypeNode {
         parameterName: Identifier;
         type: TypeNode;
     }
 
+    // @kind(SyntaxKind.TypeQuery)
     export interface TypeQueryNode extends TypeNode {
         exprName: EntityName;
     }
 
     // A TypeLiteral is the declaration node for an anonymous symbol.
+    // @kind(SyntaxKind.TypeLiteral)
     export interface TypeLiteralNode extends TypeNode, Declaration {
-        members: NodeArray<Node>;
+        members: NodeArray<TypeElement>;
     }
 
+    // @kind(SyntaxKind.ArrayType)
     export interface ArrayTypeNode extends TypeNode {
         elementType: TypeNode;
     }
 
+    // @kind(SyntaxKind.TupleType)
     export interface TupleTypeNode extends TypeNode {
         elementTypes: NodeArray<TypeNode>;
     }
@@ -683,16 +777,20 @@ namespace ts {
         types: NodeArray<TypeNode>;
     }
 
+    // @kind(SyntaxKind.UnionType)
     export interface UnionTypeNode extends UnionOrIntersectionTypeNode { }
 
+    // @kind(SyntaxKind.IntersectionType)
     export interface IntersectionTypeNode extends UnionOrIntersectionTypeNode { }
 
+    // @kind(SyntaxKind.ParenthesizedType)
     export interface ParenthesizedTypeNode extends TypeNode {
         type: TypeNode;
     }
 
     // Note that a StringLiteral AST node is both an Expression and a TypeNode.  The latter is
-    // because string literals can appear in the type annotation of a parameter node.
+    // because string literals can appear in type annotations as well.
+    // @kind(SyntaxKind.StringLiteral)
     export interface StringLiteral extends LiteralExpression, TypeNode {
         _stringLiteralBrand: any;
     }
@@ -709,6 +807,9 @@ namespace ts {
         contextualType?: Type;  // Used to temporarily assign a contextual type during overload resolution
     }
 
+    // @kind(SyntaxKind.OmittedExpression)
+    export interface OmittedExpression extends Expression { }
+
     export interface UnaryExpression extends Expression {
         _unaryExpressionBrand: any;
     }
@@ -717,11 +818,13 @@ namespace ts {
         _incrementExpressionBrand: any;
     }
 
+    // @kind(SyntaxKind.PrefixUnaryExpression)
     export interface PrefixUnaryExpression extends IncrementExpression {
         operator: SyntaxKind;
         operand: UnaryExpression;
     }
 
+    // @kind(SyntaxKind.PostfixUnaryExpression)
     export interface PostfixUnaryExpression extends IncrementExpression {
         operand: LeftHandSideExpression;
         operator: SyntaxKind;
@@ -739,37 +842,50 @@ namespace ts {
         _memberExpressionBrand: any;
     }
 
+    // @kind(SyntaxKind.TrueKeyword)
+    // @kind(SyntaxKind.FalseKeyword)
+    // @kind(SyntaxKind.NullKeyword)
+    // @kind(SyntaxKind.ThisKeyword)
+    // @kind(SyntaxKind.SuperKeyword)
     export interface PrimaryExpression extends MemberExpression {
         _primaryExpressionBrand: any;
     }
 
+    // @kind(SyntaxKind.DeleteExpression)
     export interface DeleteExpression extends UnaryExpression {
         expression: UnaryExpression;
     }
 
+    // @kind(SyntaxKind.TypeOfExpression)
     export interface TypeOfExpression extends UnaryExpression {
         expression: UnaryExpression;
     }
 
+    // @kind(SyntaxKind.VoidExpression)
     export interface VoidExpression extends UnaryExpression {
         expression: UnaryExpression;
     }
 
+    // @kind(SyntaxKind.AwaitExpression)
     export interface AwaitExpression extends UnaryExpression {
         expression: UnaryExpression;
     }
 
+    // @kind(SyntaxKind.YieldExpression)
     export interface YieldExpression extends Expression {
         asteriskToken?: Node;
         expression?: Expression;
     }
 
-    export interface BinaryExpression extends Expression {
+    // @kind(SyntaxKind.BinaryExpression)
+    // Binary expressions can be declarations if they are 'exports.foo = bar' expressions in JS files
+    export interface BinaryExpression extends Expression, Declaration {
         left: Expression;
         operatorToken: Node;
         right: Expression;
     }
 
+    // @kind(SyntaxKind.ConditionalExpression)
     export interface ConditionalExpression extends Expression {
         condition: Expression;
         questionToken: Node;
@@ -778,24 +894,37 @@ namespace ts {
         whenFalse: Expression;
     }
 
+    export type FunctionBody = Block;
+    export type ConciseBody = FunctionBody | Expression;
+
+    // @kind(SyntaxKind.FunctionExpression)
     export interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration {
         name?: Identifier;
-        body: Block | Expression;  // Required, whereas the member inherited from FunctionDeclaration is optional
+        body: FunctionBody;  // Required, whereas the member inherited from FunctionDeclaration is optional
     }
 
+    // @kind(SyntaxKind.ArrowFunction)
     export interface ArrowFunction extends Expression, FunctionLikeDeclaration {
         equalsGreaterThanToken: Node;
+        body: ConciseBody;
     }
 
     // The text property of a LiteralExpression stores the interpreted value of the literal in text form. For a StringLiteral,
     // or any literal of a template, this means quotes have been removed and escapes have been converted to actual characters.
     // For a NumericLiteral, the stored value is the toString() representation of the number. For example 1, 1.00, and 1e0 are all stored as just "1".
+    // @kind(SyntaxKind.NumericLiteral)
+    // @kind(SyntaxKind.RegularExpressionLiteral)
+    // @kind(SyntaxKind.NoSubstitutionTemplateLiteral)
+    // @kind(SyntaxKind.TemplateHead)
+    // @kind(SyntaxKind.TemplateMiddle)
+    // @kind(SyntaxKind.TemplateTail)
     export interface LiteralExpression extends PrimaryExpression {
         text: string;
         isUnterminated?: boolean;
         hasExtendedUnicodeEscape?: boolean;
     }
 
+    // @kind(SyntaxKind.TemplateExpression)
     export interface TemplateExpression extends PrimaryExpression {
         head: LiteralExpression;
         templateSpans: NodeArray<TemplateSpan>;
@@ -803,52 +932,63 @@ namespace ts {
 
     // Each of these corresponds to a substitution expression and a template literal, in that order.
     // The template literal must have kind TemplateMiddleLiteral or TemplateTailLiteral.
+    // @kind(SyntaxKind.TemplateSpan)
     export interface TemplateSpan extends Node {
         expression: Expression;
         literal: LiteralExpression;
     }
 
+    // @kind(SyntaxKind.ParenthesizedExpression)
     export interface ParenthesizedExpression extends PrimaryExpression {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.ArrayLiteralExpression)
     export interface ArrayLiteralExpression extends PrimaryExpression {
         elements: NodeArray<Expression>;
     }
 
+    // @kind(SyntaxKind.SpreadElementExpression)
     export interface SpreadElementExpression extends Expression {
         expression: Expression;
     }
 
     // An ObjectLiteralExpression is the declaration node for an anonymous symbol.
+    // @kind(SyntaxKind.ObjectLiteralExpression)
     export interface ObjectLiteralExpression extends PrimaryExpression, Declaration {
         properties: NodeArray<ObjectLiteralElement>;
     }
 
-    export interface PropertyAccessExpression extends MemberExpression {
+    // @kind(SyntaxKind.PropertyAccessExpression)
+    export interface PropertyAccessExpression extends MemberExpression, Declaration {
         expression: LeftHandSideExpression;
         dotToken: Node;
         name: Identifier;
     }
 
+    // @kind(SyntaxKind.ElementAccessExpression)
     export interface ElementAccessExpression extends MemberExpression {
         expression: LeftHandSideExpression;
         argumentExpression?: Expression;
     }
 
+    // @kind(SyntaxKind.CallExpression)
     export interface CallExpression extends LeftHandSideExpression {
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
 
+    // @kind(SyntaxKind.ExpressionWithTypeArguments)
     export interface ExpressionWithTypeArguments extends TypeNode {
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
     }
 
+    // @kind(SyntaxKind.NewExpression)
     export interface NewExpression extends CallExpression, PrimaryExpression { }
 
+    // @kind(SyntaxKind.TaggedTemplateExpression)
     export interface TaggedTemplateExpression extends MemberExpression {
         tag: LeftHandSideExpression;
         template: LiteralExpression | TemplateExpression;
@@ -856,11 +996,13 @@ namespace ts {
 
     export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator;
 
+    // @kind(SyntaxKind.AsExpression)
     export interface AsExpression extends Expression {
         expression: Expression;
         type: TypeNode;
     }
 
+    // @kind(SyntaxKind.TypeAssertionExpression)
     export interface TypeAssertion extends UnaryExpression {
         type: TypeNode;
         expression: UnaryExpression;
@@ -869,6 +1011,7 @@ namespace ts {
     export type AssertionExpression = TypeAssertion | AsExpression;
 
     /// A JSX expression of the form <TagName attrs>...</TagName>
+    // @kind(SyntaxKind.JsxElement)
     export interface JsxElement extends PrimaryExpression {
         openingElement: JsxOpeningElement;
         children: NodeArray<JsxChild>;
@@ -876,6 +1019,7 @@ namespace ts {
     }
 
     /// The opening element of a <Tag>...</Tag> JsxElement
+    // @kind(SyntaxKind.JsxOpeningElement)
     export interface JsxOpeningElement extends Expression {
         _openingElementBrand?: any;
         tagName: EntityName;
@@ -883,6 +1027,7 @@ namespace ts {
     }
 
     /// A JSX expression of the form <TagName attrs />
+    // @kind(SyntaxKind.JsxSelfClosingElement)
     export interface JsxSelfClosingElement extends PrimaryExpression, JsxOpeningElement {
         _selfClosingElementBrand?: any;
     }
@@ -890,24 +1035,29 @@ namespace ts {
     /// Either the opening tag in a <Tag>...</Tag> pair, or the lone <Tag /> in a self-closing form
     export type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
 
+    // @kind(SyntaxKind.JsxAttribute)
     export interface JsxAttribute extends Node {
         name: Identifier;
         /// JSX attribute initializers are optional; <X y /> is sugar for <X y={true} />
         initializer?: Expression;
     }
 
+    // @kind(SyntaxKind.JsxSpreadAttribute)
     export interface JsxSpreadAttribute extends Node {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.JsxClosingElement)
     export interface JsxClosingElement extends Node {
         tagName: EntityName;
     }
 
+    // @kind(SyntaxKind.JsxExpression)
     export interface JsxExpression extends Expression {
         expression?: Expression;
     }
 
+    // @kind(SyntaxKind.JsxText)
     export interface JsxText extends Node {
         _jsxTextExpressionBrand: any;
     }
@@ -918,18 +1068,36 @@ namespace ts {
         _statementBrand: any;
     }
 
+    // @kind(SyntaxKind.EmptyStatement)
+    export interface EmptyStatement extends Statement { }
+
+    // @kind(SyntaxKind.DebuggerStatement)
+    export interface DebuggerStatement extends Statement { }
+
+    // @kind(SyntaxKind.MissingDeclaration)
+    // @factoryhidden("name", true)
+    export interface MissingDeclaration extends DeclarationStatement, ClassElement, ObjectLiteralElement, TypeElement {
+        name?: Identifier;
+    }
+
+    export type BlockLike = SourceFile | Block | ModuleBlock | CaseClause;
+
+    // @kind(SyntaxKind.Block)
     export interface Block extends Statement {
         statements: NodeArray<Statement>;
     }
 
+    // @kind(SyntaxKind.VariableStatement)
     export interface VariableStatement extends Statement {
         declarationList: VariableDeclarationList;
     }
 
+    // @kind(SyntaxKind.ExpressionStatement)
     export interface ExpressionStatement extends Statement {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.IfStatement)
     export interface IfStatement extends Statement {
         expression: Expression;
         thenStatement: Statement;
@@ -940,78 +1108,101 @@ namespace ts {
         statement: Statement;
     }
 
+    // @kind(SyntaxKind.DoStatement)
     export interface DoStatement extends IterationStatement {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.WhileStatement)
     export interface WhileStatement extends IterationStatement {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.ForStatement)
     export interface ForStatement extends IterationStatement {
         initializer?: VariableDeclarationList | Expression;
         condition?: Expression;
         incrementor?: Expression;
     }
 
+    // @kind(SyntaxKind.ForInStatement)
     export interface ForInStatement extends IterationStatement {
         initializer: VariableDeclarationList | Expression;
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.ForOfStatement)
     export interface ForOfStatement extends IterationStatement {
         initializer: VariableDeclarationList | Expression;
         expression: Expression;
     }
 
-    export interface BreakOrContinueStatement extends Statement {
+    // @kind(SyntaxKind.BreakStatement)
+    export interface BreakStatement extends Statement {
         label?: Identifier;
     }
 
+    // @kind(SyntaxKind.ContinueStatement)
+    export interface ContinueStatement extends Statement {
+        label?: Identifier;
+    }
+
+    export type BreakOrContinueStatement = BreakStatement | ContinueStatement;
+
+    // @kind(SyntaxKind.ReturnStatement)
     export interface ReturnStatement extends Statement {
         expression?: Expression;
     }
 
+    // @kind(SyntaxKind.WithStatement)
     export interface WithStatement extends Statement {
         expression: Expression;
         statement: Statement;
     }
 
+    // @kind(SyntaxKind.SwitchStatement)
     export interface SwitchStatement extends Statement {
         expression: Expression;
         caseBlock: CaseBlock;
     }
 
+    // @kind(SyntaxKind.CaseBlock)
     export interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
 
+    // @kind(SyntaxKind.CaseClause)
     export interface CaseClause extends Node {
         expression?: Expression;
         statements: NodeArray<Statement>;
     }
 
+    // @kind(SyntaxKind.DefaultClause)
     export interface DefaultClause extends Node {
         statements: NodeArray<Statement>;
     }
 
     export type CaseOrDefaultClause = CaseClause | DefaultClause;
 
+    // @kind(SyntaxKind.LabeledStatement)
     export interface LabeledStatement extends Statement {
         label: Identifier;
         statement: Statement;
     }
 
+    // @kind(SyntaxKind.ThrowStatement)
     export interface ThrowStatement extends Statement {
         expression: Expression;
     }
 
+    // @kind(SyntaxKind.TryStatement)
     export interface TryStatement extends Statement {
         tryBlock: Block;
         catchClause?: CatchClause;
         finallyBlock?: Block;
     }
 
+    // @kind(SyntaxKind.CatchClause)
     export interface CatchClause extends Node {
         variableDeclaration: VariableDeclaration;
         block: Block;
@@ -1024,34 +1215,49 @@ namespace ts {
         members: NodeArray<ClassElement>;
     }
 
-    export interface ClassDeclaration extends ClassLikeDeclaration, Statement {
+    // @kind(SyntaxKind.ClassDeclaration)
+    export interface ClassDeclaration extends ClassLikeDeclaration, DeclarationStatement {
+        name?: Identifier;
     }
 
+    // @kind(SyntaxKind.ClassExpression)
     export interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
     }
 
     export interface ClassElement extends Declaration {
         _classElementBrand: any;
+        name?: PropertyName;
     }
 
-    export interface InterfaceDeclaration extends Declaration, Statement {
+    export interface TypeElement extends Declaration {
+        _typeElementBrand: any;
+        name?: PropertyName;
+        // @factoryparam
+        questionToken?: Node;
+    }
+
+    // @kind(SyntaxKind.InterfaceDeclaration)
+    export interface InterfaceDeclaration extends DeclarationStatement {
         name: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
-        members: NodeArray<Declaration>;
+        members: NodeArray<TypeElement>;
     }
 
+    // @kind(SyntaxKind.HeritageClause)
     export interface HeritageClause extends Node {
         token: SyntaxKind;
         types?: NodeArray<ExpressionWithTypeArguments>;
     }
 
-    export interface TypeAliasDeclaration extends Declaration, Statement {
+    // @kind(SyntaxKind.TypeAliasDeclaration)
+    export interface TypeAliasDeclaration extends DeclarationStatement {
         name: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         type: TypeNode;
     }
 
+    // @kind(SyntaxKind.EnumMember)
     export interface EnumMember extends Declaration {
         // This does include ComputedPropertyName, but the parser will give an error
         // if it parses a ComputedPropertyName in an EnumMember
@@ -1059,21 +1265,27 @@ namespace ts {
         initializer?: Expression;
     }
 
-    export interface EnumDeclaration extends Declaration, Statement {
+    // @kind(SyntaxKind.EnumDeclaration)
+    export interface EnumDeclaration extends DeclarationStatement {
         name: Identifier;
         members: NodeArray<EnumMember>;
     }
 
-    export interface ModuleDeclaration extends Declaration, Statement {
+    export type ModuleBody = ModuleBlock | ModuleDeclaration;
+
+    // @kind(SyntaxKind.ModuleDeclaration)
+    export interface ModuleDeclaration extends DeclarationStatement {
         name: Identifier | LiteralExpression;
         body: ModuleBlock | ModuleDeclaration;
     }
 
+    // @kind(SyntaxKind.ModuleBlock)
     export interface ModuleBlock extends Node, Statement {
         statements: NodeArray<Statement>;
     }
 
-    export interface ImportEqualsDeclaration extends Declaration, Statement {
+    // @kind(SyntaxKind.ImportEqualsDeclaration)
+    export interface ImportEqualsDeclaration extends DeclarationStatement {
         name: Identifier;
 
         // 'EntityName' for an internal module reference, 'ExternalModuleReference' for an external
@@ -1081,6 +1293,7 @@ namespace ts {
         moduleReference: EntityName | ExternalModuleReference;
     }
 
+    // @kind(SyntaxKind.ExternalModuleReference)
     export interface ExternalModuleReference extends Node {
         expression?: Expression;
     }
@@ -1089,6 +1302,7 @@ namespace ts {
     // import "mod"  => importClause = undefined, moduleSpecifier = "mod"
     // In rest of the cases, module specifier is string literal corresponding to module
     // ImportClause information is shown at its declaration below.
+    // @kind(SyntaxKind.ImportDeclaration)
     export interface ImportDeclaration extends Statement {
         importClause?: ImportClause;
         moduleSpecifier: Expression;
@@ -1100,36 +1314,51 @@ namespace ts {
     // import d, * as ns from "mod" => name = d, namedBinding: NamespaceImport = { name: ns }
     // import { a, b as x } from "mod" => name = undefined, namedBinding: NamedImports = { elements: [{ name: a }, { name: x, propertyName: b}]}
     // import d, { a, b as x } from "mod" => name = d, namedBinding: NamedImports = { elements: [{ name: a }, { name: x, propertyName: b}]}
+    // @kind(SyntaxKind.ImportClause)
     export interface ImportClause extends Declaration {
         name?: Identifier; // Default binding
         namedBindings?: NamespaceImport | NamedImports;
     }
 
+    // @kind(SyntaxKind.NamespaceImport)
     export interface NamespaceImport extends Declaration {
         name: Identifier;
     }
 
-    export interface ExportDeclaration extends Declaration, Statement {
+    // @kind(SyntaxKind.ExportDeclaration)
+    export interface ExportDeclaration extends DeclarationStatement {
         exportClause?: NamedExports;
         moduleSpecifier?: Expression;
     }
 
-    export interface NamedImportsOrExports extends Node {
-        elements: NodeArray<ImportOrExportSpecifier>;
+    // @kind(SyntaxKind.NamedImports)
+    export interface NamedImports extends Node {
+        elements: NodeArray<ImportSpecifier>;
     }
 
-    export type NamedImports = NamedImportsOrExports;
-    export type NamedExports = NamedImportsOrExports;
+    // @kind(SyntaxKind.NamedExports)
+    export interface NamedExports extends Node {
+        elements: NodeArray<ExportSpecifier>;
+    }
 
-    export interface ImportOrExportSpecifier extends Declaration {
+    export type NamedImportsOrExports = NamedImports | NamedExports;
+
+    // @kind(SyntaxKind.ImportSpecifier)
+    export interface ImportSpecifier extends Declaration {
         propertyName?: Identifier;  // Name preceding "as" keyword (or undefined when "as" is absent)
         name: Identifier;           // Declared name
     }
 
-    export type ImportSpecifier = ImportOrExportSpecifier;
-    export type ExportSpecifier = ImportOrExportSpecifier;
+    // @kind(SyntaxKind.ExportSpecifier)
+    export interface ExportSpecifier extends Declaration {
+        propertyName?: Identifier;  // Name preceding "as" keyword (or undefined when "as" is absent)
+        name: Identifier;           // Declared name
+    }
 
-    export interface ExportAssignment extends Declaration, Statement {
+    export type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
+
+    // @kind(SyntaxKind.ExportAssignment)
+    export interface ExportAssignment extends DeclarationStatement {
         isExportEquals?: boolean;
         expression: Expression;
     }
@@ -1144,6 +1373,7 @@ namespace ts {
     }
 
     // represents a top level: { type } expression in a JSDoc comment.
+    // @kind(SyntaxKind.JSDocTypeExpression)
     export interface JSDocTypeExpression extends Node {
         type: JSDocType;
     }
@@ -1152,90 +1382,111 @@ namespace ts {
         _jsDocTypeBrand: any;
     }
 
+    // @kind(SyntaxKind.JSDocAllType)
     export interface JSDocAllType extends JSDocType {
         _JSDocAllTypeBrand: any;
     }
 
+    // @kind(SyntaxKind.JSDocUnknownType)
     export interface JSDocUnknownType extends JSDocType {
         _JSDocUnknownTypeBrand: any;
     }
 
+    // @kind(SyntaxKind.JSDocArrayType)
     export interface JSDocArrayType extends JSDocType {
         elementType: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocUnionType)
     export interface JSDocUnionType extends JSDocType {
         types: NodeArray<JSDocType>;
     }
 
+    // @kind(SyntaxKind.JSDocTupleType)
     export interface JSDocTupleType extends JSDocType {
         types: NodeArray<JSDocType>;
     }
 
+    // @kind(SyntaxKind.JSDocNonNullableType)
     export interface JSDocNonNullableType extends JSDocType {
         type: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocNullableType)
     export interface JSDocNullableType extends JSDocType {
         type: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocRecordType)
     export interface JSDocRecordType extends JSDocType, TypeLiteralNode {
         members: NodeArray<JSDocRecordMember>;
     }
 
+    // @kind(SyntaxKind.JSDocTypeReference)
     export interface JSDocTypeReference extends JSDocType {
         name: EntityName;
         typeArguments: NodeArray<JSDocType>;
     }
 
+    // @kind(SyntaxKind.JSDocOptionalType)
     export interface JSDocOptionalType extends JSDocType {
         type: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocFunctionType)
     export interface JSDocFunctionType extends JSDocType, SignatureDeclaration {
         parameters: NodeArray<ParameterDeclaration>;
         type: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocVariadicType)
     export interface JSDocVariadicType extends JSDocType {
         type: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocConstructorType)
     export interface JSDocConstructorType extends JSDocType {
         type: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocThisType)
     export interface JSDocThisType extends JSDocType {
         type: JSDocType;
     }
 
-    export interface JSDocRecordMember extends PropertyDeclaration {
+    // @kind(SyntaxKind.JSDocRecordMember)
+    export interface JSDocRecordMember extends PropertySignature {
         name: Identifier | LiteralExpression;
         type?: JSDocType;
     }
 
+    // @kind(SyntaxKind.JSDocComment)
     export interface JSDocComment extends Node {
         tags: NodeArray<JSDocTag>;
     }
 
+    // @kind(SyntaxKind.JSDocTag)
     export interface JSDocTag extends Node {
         atToken: Node;
         tagName: Identifier;
     }
 
+    // @kind(SyntaxKind.JSDocTemplateTag)
     export interface JSDocTemplateTag extends JSDocTag {
         typeParameters: NodeArray<TypeParameterDeclaration>;
     }
 
+    // @kind(SyntaxKind.JSDocReturnTag)
     export interface JSDocReturnTag extends JSDocTag {
         typeExpression: JSDocTypeExpression;
     }
 
+    // @kind(SyntaxKind.JSDocTypeTag)
     export interface JSDocTypeTag extends JSDocTag {
         typeExpression: JSDocTypeExpression;
     }
 
+    // @kind(SyntaxKind.JSDocParameterTag)
     export interface JSDocParameterTag extends JSDocTag {
         preParameterName?: Identifier;
         typeExpression?: JSDocTypeExpression;
@@ -1243,15 +1494,22 @@ namespace ts {
         isBracketed: boolean;
     }
 
+    export interface AmdDependency {
+        path: string;
+        name: string;
+    }
+
     // Source files are declarations when they are external modules.
+    // @kind(SyntaxKind.SourceFile)
     export interface SourceFile extends Declaration {
         statements: NodeArray<Statement>;
         endOfFileToken: Node;
 
         fileName: string;
+        /* internal */ path: Path;
         text: string;
 
-        amdDependencies: {path: string; name: string}[];
+        amdDependencies: AmdDependency[];
         moduleName: string;
         referencedFiles: FileReference[];
         languageVariant: LanguageVariant;
@@ -1274,8 +1532,9 @@ namespace ts {
 
         // The first node that causes this file to be an external module
         /* @internal */ externalModuleIndicator: Node;
+        // The first node that causes this file to be a CommonJS module
+        /* @internal */ commonJsModuleIndicator: Node;
 
-        /* @internal */ isDefaultLib: boolean;
         /* @internal */ identifiers: Map<string>;
         /* @internal */ nodeCount: number;
         /* @internal */ identifierCount: number;
@@ -1611,6 +1870,8 @@ namespace ts {
         getReferencedValueDeclaration(reference: Identifier): Declaration;
         getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind;
         isOptionalParameter(node: ParameterDeclaration): boolean;
+        isArgumentsLocalBinding(node: Identifier): boolean;
+        getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): SourceFile;
     }
 
     export const enum SymbolFlags {
@@ -1755,7 +2016,8 @@ namespace ts {
         // Values for enum members have been computed, and any errors have been reported for them.
         EnumValuesComputed          = 0x00002000,
         BlockScopedBindingInLoop    = 0x00004000,
-        LexicalModuleMergesWithClass= 0x00008000,  // Instantiated lexical module declaration is merged with a previous class declaration.
+        LexicalModuleMergesWithClass = 0x00008000,  // Instantiated lexical module declaration is merged with a previous class declaration.
+        LoopWithBlockScopedBindingCapturedInFunction = 0x00010000, // Loop that contains block scoped variable captured in closure
     }
 
     /* @internal */
@@ -1809,6 +2071,7 @@ namespace ts {
         ContainsAnyFunctionType = 0x00800000,  // Type is or contains object literal type
         ESSymbol                = 0x01000000,  // Type of symbol primitive introduced in ES6
         ThisType                = 0x02000000,  // This type
+        ObjectLiteralPatternWithComputedProperties = 0x04000000,  // Object literal type implied by binding pattern has computed properties
 
         /* @internal */
         Intrinsic = Any | String | Number | Boolean | ESSymbol | Void | Undefined | Null,
@@ -1944,6 +2207,8 @@ namespace ts {
         target?: TypeParameter;  // Instantiation target
         /* @internal */
         mapper?: TypeMapper;     // Instantiation mapper
+        /* @internal */
+        resolvedApparentType: Type;
     }
 
     export const enum SignatureKind {
@@ -2012,6 +2277,7 @@ namespace ts {
         key: string;
         category: DiagnosticCategory;
         code: number;
+        message: string;
     }
 
     /**
@@ -2074,6 +2340,7 @@ namespace ts {
         outFile?: string;
         outDir?: string;
         preserveConstEnums?: boolean;
+        /* @internal */ pretty?: DiagnosticStyle;
         project?: string;
         removeComments?: boolean;
         rootDir?: string;
@@ -2088,6 +2355,11 @@ namespace ts {
         experimentalDecorators?: boolean;
         emitDecoratorMetadata?: boolean;
         moduleResolution?: ModuleResolutionKind;
+        allowUnusedLabels?: boolean;
+        allowUnreachableCode?: boolean;
+        noImplicitReturns?: boolean;
+        noFallthroughCasesInSwitch?: boolean;
+        forceConsistentCasingInFileNames?: boolean;
         /* @internal */ stripInternal?: boolean;
 
         // Skip checking lib.d.ts to help speed up tests.
@@ -2138,6 +2410,12 @@ namespace ts {
         JSX,
     }
 
+    /* @internal */
+    export const enum DiagnosticStyle {
+        Simple,
+        Pretty,
+    }
+
     export interface ParsedCommandLine {
         options: CompilerOptions;
         fileNames: string[];
@@ -2147,17 +2425,17 @@ namespace ts {
     /* @internal */
     export interface CommandLineOptionBase {
         name: string;
-        type: string | Map<number>;         // "string", "number", "boolean", or an object literal mapping named values to actual values
-        isFilePath?: boolean;               // True if option value is a path or fileName
-        shortName?: string;                 // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help'
-        description?: DiagnosticMessage;    // The message describing what the command line switch does
-        paramType?: DiagnosticMessage;      // The name to be used for a non-boolean option's parameter
+        type: "string" | "number" | "boolean" | Map<number>;    // a value of a primitive type, or an object literal mapping named values to actual values
+        isFilePath?: boolean;                                   // True if option value is a path or fileName
+        shortName?: string;                                     // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help'
+        description?: DiagnosticMessage;                        // The message describing what the command line switch does
+        paramType?: DiagnosticMessage;                          // The name to be used for a non-boolean option's parameter
         experimental?: boolean;
     }
 
     /* @internal */
     export interface CommandLineOptionOfPrimitiveType extends CommandLineOptionBase {
-        type: string;                   // "string" | "number" | "boolean"
+        type: "string" | "number" | "boolean";
     }
 
     /* @internal */
@@ -2309,7 +2587,7 @@ namespace ts {
     export interface ModuleResolutionHost {
         fileExists(fileName: string): boolean;
         // readFile function is used to read arbitrary text files on disk, i.e. when resolution procedure needs the content of 'package.json'
-        // to determine location of bundled typings for node module 
+        // to determine location of bundled typings for node module
         readFile(fileName: string): string;
     }
 
@@ -2317,7 +2595,7 @@ namespace ts {
         resolvedFileName: string;
         /*
          * Denotes if 'resolvedFileName' is isExternalLibraryImport and thus should be proper external module:
-         * - be a .d.ts file 
+         * - be a .d.ts file
          * - use top level imports\exports
          * - don't use tripleslash references
          */
@@ -2340,11 +2618,11 @@ namespace ts {
         getNewLine(): string;
 
         /*
-         * CompilerHost must either implement resolveModuleNames (in case if it wants to be completely in charge of 
-         * module name resolution) or provide implementation for methods from ModuleResolutionHost (in this case compiler 
+         * CompilerHost must either implement resolveModuleNames (in case if it wants to be completely in charge of
+         * module name resolution) or provide implementation for methods from ModuleResolutionHost (in this case compiler
          * will appply built-in module resolution logic and use members of ModuleResolutionHost to ask host specific questions).
-         * If resolveModuleNames is implemented then implementation for members from ModuleResolutionHost can be just 
-         * 'throw new Error("NotImplemented")'  
+         * If resolveModuleNames is implemented then implementation for members from ModuleResolutionHost can be just
+         * 'throw new Error("NotImplemented")'
          */
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index ccfab49375d..1e4ee1bed47 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1,4 +1,3 @@
-/// <reference path="binder.ts" />
 /// <reference path="sys.ts" />
 
 /* @internal */
@@ -16,9 +15,9 @@ namespace ts {
     }
 
     export function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration {
-        let declarations = symbol.declarations;
+        const declarations = symbol.declarations;
         if (declarations) {
-            for (let declaration of declarations) {
+            for (const declaration of declarations) {
                 if (declaration.kind === kind) {
                     return declaration;
                 }
@@ -43,12 +42,12 @@ namespace ts {
     }
 
     // Pool writers to avoid needing to allocate them for every symbol we write.
-    let stringWriters: StringSymbolWriter[] = [];
+    const stringWriters: StringSymbolWriter[] = [];
     export function getSingleLineStringWriter(): StringSymbolWriter {
         if (stringWriters.length === 0) {
             let str = "";
 
-            let writeText: (text: string) => void = text => str += text;
+            const writeText: (text: string) => void = text => str += text;
             return {
                 string: () => str,
                 writeKeyword: writeText,
@@ -82,17 +81,17 @@ namespace ts {
         return node.end - node.pos;
     }
 
-    export function arrayIsEqualTo<T>(arr1: T[], arr2: T[], comparer?: (a: T, b: T) => boolean): boolean {
-        if (!arr1 || !arr2) {
-            return arr1 === arr2;
+    export function arrayIsEqualTo<T>(array1: T[], array2: T[], equaler?: (a: T, b: T) => boolean): boolean {
+        if (!array1 || !array2) {
+            return array1 === array2;
         }
 
-        if (arr1.length !== arr2.length) {
+        if (array1.length !== array2.length) {
             return false;
         }
 
-        for (let i = 0; i < arr1.length; ++i) {
-            let equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];
+        for (let i = 0; i < array1.length; ++i) {
+            const equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
             if (!equals) {
                 return false;
             }
@@ -128,7 +127,7 @@ namespace ts {
             // A node is considered to contain a parse error if:
             //  a) the parser explicitly marked that it had an error
             //  b) any of it's children reported that it had an error.
-            let thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & ParserContextFlags.ThisNodeHasError) !== 0) ||
+            const thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & ParserContextFlags.ThisNodeHasError) !== 0) ||
                 forEachChild(node, containsParseError);
 
             // If so, mark ourselves accordingly.
@@ -157,8 +156,8 @@ namespace ts {
 
     // This is a useful function for debugging purposes.
     export function nodePosToString(node: Node): string {
-        let file = getSourceFileOfNode(node);
-        let loc = getLineAndCharacterOfPosition(file, node.pos);
+        const file = getSourceFileOfNode(node);
+        const loc = getLineAndCharacterOfPosition(file, node.pos);
         return `${ file.fileName }(${ loc.line + 1 },${ loc.character + 1 })`;
     }
 
@@ -213,7 +212,7 @@ namespace ts {
             return "";
         }
 
-        let text = sourceFile.text;
+        const text = sourceFile.text;
         return text.substring(includeTrivia ? node.pos : skipTrivia(text, node.pos), node.end);
     }
 
@@ -294,14 +293,14 @@ namespace ts {
     }
 
     export function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): Diagnostic {
-        let sourceFile = getSourceFileOfNode(node);
-        let span = getErrorSpanForNode(sourceFile, node);
+        const sourceFile = getSourceFileOfNode(node);
+        const span = getErrorSpanForNode(sourceFile, node);
         return createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
     }
 
     export function createDiagnosticForNodeFromMessageChain(node: Node, messageChain: DiagnosticMessageChain): Diagnostic {
-        let sourceFile = getSourceFileOfNode(node);
-        let span = getErrorSpanForNode(sourceFile, node);
+        const sourceFile = getSourceFileOfNode(node);
+        const span = getErrorSpanForNode(sourceFile, node);
         return {
             file: sourceFile,
             start: span.start,
@@ -313,9 +312,9 @@ namespace ts {
     }
 
     export function getSpanOfTokenAtPosition(sourceFile: SourceFile, pos: number): TextSpan {
-        let scanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/ true, sourceFile.languageVariant, sourceFile.text, /*onError:*/ undefined, pos);
+        const scanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/ true, sourceFile.languageVariant, sourceFile.text, /*onError:*/ undefined, pos);
         scanner.scan();
-        let start = scanner.getTokenPos();
+        const start = scanner.getTokenPos();
         return createTextSpanFromBounds(start, scanner.getTextPos());
     }
 
@@ -351,7 +350,7 @@ namespace ts {
             return getSpanOfTokenAtPosition(sourceFile, node.pos);
         }
 
-        let pos = nodeIsMissing(errorNode)
+        const pos = nodeIsMissing(errorNode)
             ? errorNode.pos
             : skipTrivia(sourceFile.text, errorNode.pos);
 
@@ -362,6 +361,10 @@ namespace ts {
         return file.externalModuleIndicator !== undefined;
     }
 
+    export function isExternalOrCommonJsModule(file: SourceFile): boolean {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+
     export function isDeclarationFile(file: SourceFile): boolean {
         return (file.flags & NodeFlags.DeclarationFile) !== 0;
     }
@@ -421,18 +424,26 @@ namespace ts {
         return getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
     }
 
+    export function getLeadingCommentRangesOfNodeFromText(node: Node, text: string) {
+        return getLeadingCommentRanges(text, node.pos);
+    }
+
     export function getJsDocComments(node: Node, sourceFileOfNode: SourceFile) {
-        let commentRanges = (node.kind === SyntaxKind.Parameter || node.kind === SyntaxKind.TypeParameter) ?
-            concatenate(getTrailingCommentRanges(sourceFileOfNode.text, node.pos),
-                getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) :
-            getLeadingCommentRangesOfNode(node, sourceFileOfNode);
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
+    }
+
+    export function getJsDocCommentsFromText(node: Node, text: string) {
+        const commentRanges = (node.kind === SyntaxKind.Parameter || node.kind === SyntaxKind.TypeParameter) ?
+            concatenate(getTrailingCommentRanges(text, node.pos),
+                getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
         return filter(commentRanges, isJsDocComment);
 
         function isJsDocComment(comment: CommentRange) {
             // True if the comment starts with '/**' but not if it is '/**/'
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === CharacterCodes.asterisk &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== CharacterCodes.slash;
+            return text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
+                text.charCodeAt(comment.pos + 2) === CharacterCodes.asterisk &&
+                text.charCodeAt(comment.pos + 3) !== CharacterCodes.slash;
         }
     }
 
@@ -579,7 +590,7 @@ namespace ts {
                     return;
                 default:
                     if (isFunctionLike(node)) {
-                        let name = (<FunctionLikeDeclaration>node).name;
+                        const name = (<FunctionLikeDeclaration>node).name;
                         if (name && name.kind === SyntaxKind.ComputedPropertyName) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
@@ -622,25 +633,26 @@ namespace ts {
     }
 
     export function isFunctionLike(node: Node): node is FunctionLikeDeclaration {
-        if (node) {
-            switch (node.kind) {
-                case SyntaxKind.Constructor:
-                case SyntaxKind.FunctionExpression:
-                case SyntaxKind.FunctionDeclaration:
-                case SyntaxKind.ArrowFunction:
-                case SyntaxKind.MethodDeclaration:
-                case SyntaxKind.MethodSignature:
-                case SyntaxKind.GetAccessor:
-                case SyntaxKind.SetAccessor:
-                case SyntaxKind.CallSignature:
-                case SyntaxKind.ConstructSignature:
-                case SyntaxKind.IndexSignature:
-                case SyntaxKind.FunctionType:
-                case SyntaxKind.ConstructorType:
-                    return true;
-            }
+        return node && isFunctionLikeKind(node.kind);
+    }
+
+    export function isFunctionLikeKind(kind: SyntaxKind): boolean {
+        switch (kind) {
+            case SyntaxKind.Constructor:
+            case SyntaxKind.FunctionExpression:
+            case SyntaxKind.FunctionDeclaration:
+            case SyntaxKind.ArrowFunction:
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.MethodSignature:
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+            case SyntaxKind.CallSignature:
+            case SyntaxKind.ConstructSignature:
+            case SyntaxKind.IndexSignature:
+            case SyntaxKind.FunctionType:
+            case SyntaxKind.ConstructorType:
+                return true;
         }
-        return false;
     }
 
     export function introducesArgumentsExoticObject(node: Node) {
@@ -657,6 +669,22 @@ namespace ts {
         return false;
     }
 
+    export function isIterationStatement(node: Node, lookInLabeledStatements: boolean): boolean {
+        switch (node.kind) {
+            case SyntaxKind.ForStatement:
+            case SyntaxKind.ForInStatement:
+            case SyntaxKind.ForOfStatement:
+            case SyntaxKind.DoStatement:
+            case SyntaxKind.WhileStatement:
+                return true;
+            case SyntaxKind.LabeledStatement:
+                return lookInLabeledStatements && isIterationStatement((<LabeledStatement>node).statement, lookInLabeledStatements);
+        }
+
+        return false;
+    }
+
+
     export function isFunctionBlock(node: Node) {
         return node && node.kind === SyntaxKind.Block && isFunctionLike(node.parent);
     }
@@ -1013,7 +1041,7 @@ namespace ts {
     }
 
     export function isInstantiatedModule(node: ModuleDeclaration, preserveConstEnums: boolean) {
-        let moduleState = getModuleInstanceState(node);
+        const moduleState = getModuleInstanceState(node);
         return moduleState === ModuleInstanceState.Instantiated ||
             (preserveConstEnums && moduleState === ModuleInstanceState.ConstEnumOnly);
     }
@@ -1031,12 +1059,63 @@ namespace ts {
         return node.kind === SyntaxKind.ImportEqualsDeclaration && (<ImportEqualsDeclaration>node).moduleReference.kind !== SyntaxKind.ExternalModuleReference;
     }
 
+    export function isSourceFileJavaScript(file: SourceFile): boolean {
+        return isInJavaScriptFile(file);
+    }
+
+    export function isInJavaScriptFile(node: Node): boolean {
+        return node && !!(node.parserContextFlags & ParserContextFlags.JavaScriptFile);
+    }
+
+    /**
+     * Returns true if the node is a CallExpression to the identifier 'require' with
+     * exactly one string literal argument.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    export function isRequireCall(expression: Node): expression is CallExpression {
+        // of the form 'require("name")'
+        return expression.kind === SyntaxKind.CallExpression &&
+                (<CallExpression>expression).expression.kind === SyntaxKind.Identifier &&
+                (<Identifier>(<CallExpression>expression).expression).text === "require" &&
+                (<CallExpression>expression).arguments.length === 1 &&
+                (<CallExpression>expression).arguments[0].kind === SyntaxKind.StringLiteral;
+    }
+
+    /**
+     * Returns true if the node is an assignment to a property on the identifier 'exports'.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    export function isExportsPropertyAssignment(expression: Node): boolean {
+        // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === SyntaxKind.BinaryExpression) &&
+            ((<BinaryExpression>expression).operatorToken.kind === SyntaxKind.EqualsToken) &&
+            ((<BinaryExpression>expression).left.kind === SyntaxKind.PropertyAccessExpression) &&
+            ((<PropertyAccessExpression>(<BinaryExpression>expression).left).expression.kind === SyntaxKind.Identifier) &&
+            ((<Identifier>((<PropertyAccessExpression>(<BinaryExpression>expression).left).expression)).text === "exports");
+    }
+
+    /**
+     * Returns true if the node is an assignment to the property access expression 'module.exports'.
+     * This function does not test if the node is in a JavaScript file or not.
+    */
+    export function isModuleExportsAssignment(expression: Node): boolean {
+        // of the form 'module.exports = expr' where 'expr' is arbitrary
+        return isInJavaScriptFile(expression) &&
+            (expression.kind === SyntaxKind.BinaryExpression) &&
+            ((<BinaryExpression>expression).operatorToken.kind === SyntaxKind.EqualsToken) &&
+            ((<BinaryExpression>expression).left.kind === SyntaxKind.PropertyAccessExpression) &&
+            ((<PropertyAccessExpression>(<BinaryExpression>expression).left).expression.kind === SyntaxKind.Identifier) &&
+            ((<Identifier>((<PropertyAccessExpression>(<BinaryExpression>expression).left).expression)).text === "module") &&
+            ((<PropertyAccessExpression>(<BinaryExpression>expression).left).name.text === "exports");
+    }
+
     export function getExternalModuleName(node: Node): Expression {
         if (node.kind === SyntaxKind.ImportDeclaration) {
             return (<ImportDeclaration>node).moduleSpecifier;
         }
         if (node.kind === SyntaxKind.ImportEqualsDeclaration) {
-            let reference = (<ImportEqualsDeclaration>node).moduleReference;
+            const reference = (<ImportEqualsDeclaration>node).moduleReference;
             if (reference.kind === SyntaxKind.ExternalModuleReference) {
                 return (<ExternalModuleReference>reference).expression;
             }
@@ -1071,7 +1150,7 @@ namespace ts {
 
     function getJSDocTag(node: Node, kind: SyntaxKind): JSDocTag {
         if (node && node.jsDocComment) {
-            for (let tag of node.jsDocComment.tags) {
+            for (const tag of node.jsDocComment.tags) {
                 if (tag.kind === kind) {
                     return tag;
                 }
@@ -1095,14 +1174,14 @@ namespace ts {
         if (parameter.name && parameter.name.kind === SyntaxKind.Identifier) {
             // If it's a parameter, see if the parent has a jsdoc comment with an @param
             // annotation.
-            let parameterName = (<Identifier>parameter.name).text;
+            const parameterName = (<Identifier>parameter.name).text;
 
-            let docComment = parameter.parent.jsDocComment;
+            const docComment = parameter.parent.jsDocComment;
             if (docComment) {
                 return <JSDocParameterTag>forEach(docComment.tags, t => {
                     if (t.kind === SyntaxKind.JSDocParameterTag) {
-                        let parameterTag = <JSDocParameterTag>t;
-                        let name = parameterTag.preParameterName || parameterTag.postParameterName;
+                        const parameterTag = <JSDocParameterTag>t;
+                        const name = parameterTag.preParameterName || parameterTag.postParameterName;
                         if (name.text === parameterName) {
                             return t;
                         }
@@ -1123,7 +1202,7 @@ namespace ts {
                     return true;
                 }
 
-                let paramTag = getCorrespondingJSDocParameterTag(node);
+                const paramTag = getCorrespondingJSDocParameterTag(node);
                 if (paramTag && paramTag.typeExpression) {
                     return paramTag.typeExpression.type.kind === SyntaxKind.JSDocVariadicType;
                 }
@@ -1151,6 +1230,14 @@ namespace ts {
         return !!node && (node.kind === SyntaxKind.ArrayBindingPattern || node.kind === SyntaxKind.ObjectBindingPattern);
     }
 
+    export function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
+        while (node) {
+            if (node === ancestor) return true;
+            node = node.parent;
+        }
+        return false;
+    }
+
     export function isInAmbientContext(node: Node): boolean {
         while (node) {
             if (node.flags & (NodeFlags.Ambient | NodeFlags.DeclarationFile)) {
@@ -1212,7 +1299,7 @@ namespace ts {
             case SyntaxKind.LabeledStatement:
             case SyntaxKind.ReturnStatement:
             case SyntaxKind.SwitchStatement:
-            case SyntaxKind.ThrowKeyword:
+            case SyntaxKind.ThrowStatement:
             case SyntaxKind.TryStatement:
             case SyntaxKind.VariableStatement:
             case SyntaxKind.WhileStatement:
@@ -1240,12 +1327,12 @@ namespace ts {
     }
 
     // True if the given identifier, string literal, or number literal is the name of a declaration node
-    export function isDeclarationName(name: Node): boolean {
+    export function isDeclarationName(name: Node): name is Identifier | StringLiteral | LiteralExpression {
         if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) {
             return false;
         }
 
-        let parent = name.parent;
+        const parent = name.parent;
         if (parent.kind === SyntaxKind.ImportSpecifier || parent.kind === SyntaxKind.ExportSpecifier) {
             if ((<ImportOrExportSpecifier>parent).propertyName) {
                 return true;
@@ -1312,23 +1399,23 @@ namespace ts {
     }
 
     export function getClassExtendsHeritageClauseElement(node: ClassLikeDeclaration) {
-        let heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ExtendsKeyword);
+        const heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ExtendsKeyword);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
 
     export function getClassImplementsHeritageClauseElements(node: ClassLikeDeclaration) {
-        let heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ImplementsKeyword);
+        const heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ImplementsKeyword);
         return heritageClause ? heritageClause.types : undefined;
     }
 
     export function getInterfaceBaseTypeNodes(node: InterfaceDeclaration) {
-        let heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ExtendsKeyword);
+        const heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ExtendsKeyword);
         return heritageClause ? heritageClause.types : undefined;
     }
 
     export function getHeritageClause(clauses: NodeArray<HeritageClause>, kind: SyntaxKind) {
         if (clauses) {
-            for (let clause of clauses) {
+            for (const clause of clauses) {
                 if (clause.token === kind) {
                     return clause;
                 }
@@ -1340,8 +1427,7 @@ namespace ts {
 
     export function tryResolveScriptReference(host: ScriptReferenceHost, sourceFile: SourceFile, reference: FileReference) {
         if (!host.getCompilerOptions().noResolve) {
-            let referenceFileName = isRootedDiskPath(reference.fileName) ? reference.fileName : combinePaths(getDirectoryPath(sourceFile.fileName), reference.fileName);
-            referenceFileName = getNormalizedAbsolutePath(referenceFileName, host.getCurrentDirectory());
+            const referenceFileName = isRootedDiskPath(reference.fileName) ? reference.fileName : combinePaths(getDirectoryPath(sourceFile.fileName), reference.fileName);
             return host.getSourceFile(referenceFileName);
         }
     }
@@ -1357,19 +1443,19 @@ namespace ts {
     }
 
     export function getFileReferenceFromReferencePath(comment: string, commentRange: CommentRange): ReferencePathMatchResult {
-        let simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
-        let isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.exec(comment)) {
-            if (isNoDefaultLibRegEx.exec(comment)) {
+        const simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
+        const isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
                 return {
                     isNoDefaultLib: true
                 };
             }
             else {
-                let matchResult = fullTripleSlashReferencePathRegEx.exec(comment);
+                const matchResult = fullTripleSlashReferencePathRegEx.exec(comment);
                 if (matchResult) {
-                    let start = commentRange.pos;
-                    let end = commentRange.end;
+                    const start = commentRange.pos;
+                    const end = commentRange.end;
                     return {
                         fileReference: {
                             pos: start,
@@ -1403,6 +1489,10 @@ namespace ts {
         return isFunctionLike(node) && (node.flags & NodeFlags.Async) !== 0 && !isAccessor(node);
     }
 
+    export function isStringOrNumericLiteral(kind: SyntaxKind): boolean {
+        return kind === SyntaxKind.StringLiteral || kind === SyntaxKind.NumericLiteral;
+    }
+
     /**
      * A declaration has a dynamic name if both of the following are true:
      *   1. The declaration has a computed property name
@@ -1411,9 +1501,13 @@ namespace ts {
      *      Symbol.
      */
     export function hasDynamicName(declaration: Declaration): boolean {
-        return declaration.name &&
-            declaration.name.kind === SyntaxKind.ComputedPropertyName &&
-            !isWellKnownSymbolSyntactically((<ComputedPropertyName>declaration.name).expression);
+        return declaration.name && isDynamicName(declaration.name);
+    }
+
+    export function isDynamicName(name: DeclarationName): boolean {
+        return name.kind === SyntaxKind.ComputedPropertyName &&
+            !isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind) &&
+            !isWellKnownSymbolSyntactically((<ComputedPropertyName>name).expression);
     }
 
     /**
@@ -1430,9 +1524,9 @@ namespace ts {
             return (<Identifier | LiteralExpression>name).text;
         }
         if (name.kind === SyntaxKind.ComputedPropertyName) {
-            let nameExpression = (<ComputedPropertyName>name).expression;
+            const nameExpression = (<ComputedPropertyName>name).expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
-                let rightHandSideName = (<PropertyAccessExpression>nameExpression).name.text;
+                const rightHandSideName = (<PropertyAccessExpression>nameExpression).name.text;
                 return getPropertyNameForKnownSymbolName(rightHandSideName);
             }
         }
@@ -1451,7 +1545,7 @@ namespace ts {
         return node.kind === SyntaxKind.Identifier && (<Identifier>node).text === "Symbol";
     }
 
-    export function isModifier(token: SyntaxKind): boolean {
+    export function isModifierKind(token: SyntaxKind): boolean {
         switch (token) {
             case SyntaxKind.AbstractKeyword:
             case SyntaxKind.AsyncKeyword:
@@ -1469,7 +1563,7 @@ namespace ts {
     }
 
     export function isParameterDeclaration(node: VariableLikeDeclaration) {
-        let root = getRootDeclaration(node);
+        const root = getRootDeclaration(node);
         return root.kind === SyntaxKind.Parameter;
     }
 
@@ -1486,12 +1580,12 @@ namespace ts {
 
     export function cloneEntityName(node: EntityName): EntityName {
         if (node.kind === SyntaxKind.Identifier) {
-            let clone = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+            const clone = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
             clone.text = (<Identifier>node).text;
             return clone;
         }
         else {
-            let clone = <QualifiedName>createSynthesizedNode(SyntaxKind.QualifiedName);
+            const clone = <QualifiedName>createSynthesizedNode(SyntaxKind.QualifiedName);
             clone.left = cloneEntityName((<QualifiedName>node).left);
             clone.left.parent = clone;
             clone.right = <Identifier>cloneEntityName((<QualifiedName>node).right);
@@ -1505,13 +1599,13 @@ namespace ts {
     }
 
     export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node {
-        let node = <SynthesizedNode>createNode(kind);
+        const node = <SynthesizedNode>createNode(kind, /* pos */ -1, /* end */ -1);
         node.startsOnNewLine = startsOnNewLine;
         return node;
     }
 
     export function createSynthesizedNodeArray(): NodeArray<any> {
-        let array = <NodeArray<any>>[];
+        const array = <NodeArray<any>>[];
         array.pos = -1;
         array.end = -1;
         return array;
@@ -1519,7 +1613,7 @@ namespace ts {
 
     export function createDiagnosticCollection(): DiagnosticCollection {
         let nonFileDiagnostics: Diagnostic[] = [];
-        let fileDiagnostics: Map<Diagnostic[]> = {};
+        const fileDiagnostics: Map<Diagnostic[]> = {};
 
         let diagnosticsModified = false;
         let modificationCount = 0;
@@ -1541,7 +1635,7 @@ namespace ts {
                 return;
             }
 
-            for (let diagnostic of fileDiagnostics[newFile.fileName]) {
+            for (const diagnostic of fileDiagnostics[newFile.fileName]) {
                 diagnostic.file = newFile;
             }
         }
@@ -1575,14 +1669,14 @@ namespace ts {
                 return fileDiagnostics[fileName] || [];
             }
 
-            let allDiagnostics: Diagnostic[] = [];
+            const allDiagnostics: Diagnostic[] = [];
             function pushDiagnostic(d: Diagnostic) {
                 allDiagnostics.push(d);
             }
 
             forEach(nonFileDiagnostics, pushDiagnostic);
 
-            for (let key in fileDiagnostics) {
+            for (const key in fileDiagnostics) {
                 if (hasProperty(fileDiagnostics, key)) {
                     forEach(fileDiagnostics[key], pushDiagnostic);
                 }
@@ -1599,7 +1693,7 @@ namespace ts {
             diagnosticsModified = false;
             nonFileDiagnostics = sortAndDeduplicateDiagnostics(nonFileDiagnostics);
 
-            for (let key in fileDiagnostics) {
+            for (const key in fileDiagnostics) {
                 if (hasProperty(fileDiagnostics, key)) {
                     fileDiagnostics[key] = sortAndDeduplicateDiagnostics(fileDiagnostics[key]);
                 }
@@ -1612,8 +1706,8 @@ namespace ts {
     // the language service. These characters should be escaped when printing, and if any characters are added,
     // the map below must be updated. Note that this regexp *does not* include the 'delete' character.
     // There is no reason for this other than that JSON.stringify does not handle it either.
-    let escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
-    let escapedCharsMap: Map<string> = {
+    const escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    const escapedCharsMap: Map<string> = {
         "\0": "\\0",
         "\t": "\\t",
         "\v": "\\v",
@@ -1628,6 +1722,7 @@ namespace ts {
         "\u0085": "\\u0085"  // nextLine
     };
 
+
     /**
      * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
      * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine)
@@ -1644,17 +1739,17 @@ namespace ts {
     }
 
     export function isIntrinsicJsxName(name: string) {
-        let ch = name.substr(0, 1);
+        const ch = name.substr(0, 1);
         return ch.toLowerCase() === ch;
     }
 
     function get16BitUnicodeEscapeSequence(charCode: number): string {
-        let hexCharCode = charCode.toString(16).toUpperCase();
-        let paddedHexCode = ("0000" + hexCharCode).slice(-4);
+        const hexCharCode = charCode.toString(16).toUpperCase();
+        const paddedHexCode = ("0000" + hexCharCode).slice(-4);
         return "\\u" + paddedHexCode;
     }
 
-    let nonAsciiCharacters = /[^\u0000-\u007F]/g;
+    const nonAsciiCharacters = /[^\u0000-\u007F]/g;
     export function escapeNonAsciiCharacters(s: string): string {
         // Replace non-ASCII characters with '\uNNNN' escapes if any exist.
         // Otherwise just return the original string.
@@ -1665,7 +1760,7 @@ namespace ts {
 
     export interface EmitTextWriter {
         write(s: string): void;
-        writeTextOfNode(sourceFile: SourceFile, node: Node): void;
+        writeTextOfNode(text: string, node: Node): void;
         writeLine(): void;
         increaseIndent(): void;
         decreaseIndent(): void;
@@ -1676,9 +1771,10 @@ namespace ts {
         getLine(): number;
         getColumn(): number;
         getIndent(): number;
+        reset(): void;
     }
 
-    let indentStrings: string[] = ["", "    "];
+    const indentStrings: string[] = ["", "    "];
     export function getIndentString(level: number) {
         if (indentStrings[level] === undefined) {
             indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
@@ -1691,11 +1787,11 @@ namespace ts {
     }
 
     export function createTextWriter(newLine: String): EmitTextWriter {
-        let output = "";
-        let indent = 0;
-        let lineStart = true;
-        let lineCount = 0;
-        let linePos = 0;
+        let output: string;
+        let indent: number;
+        let lineStart: boolean;
+        let lineCount: number;
+        let linePos: number;
 
         function write(s: string) {
             if (s && s.length) {
@@ -1707,6 +1803,14 @@ namespace ts {
             }
         }
 
+        function reset(): void {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
+
         function rawWrite(s: string) {
             if (s !== undefined) {
                 if (lineStart) {
@@ -1719,7 +1823,7 @@ namespace ts {
         function writeLiteral(s: string) {
             if (s && s.length) {
                 write(s);
-                let lineStartsOfS = computeLineStarts(s);
+                const lineStartsOfS = computeLineStarts(s);
                 if (lineStartsOfS.length > 1) {
                     lineCount = lineCount + lineStartsOfS.length - 1;
                     linePos = output.length - s.length + lastOrUndefined(lineStartsOfS);
@@ -1736,10 +1840,12 @@ namespace ts {
             }
         }
 
-        function writeTextOfNode(sourceFile: SourceFile, node: Node) {
-            write(getSourceTextOfNodeFromSourceFile(sourceFile, node));
+        function writeTextOfNode(text: string, node: Node) {
+            write(getTextOfNodeFromSourceText(text, node));
         }
 
+        reset();
+
         return {
             write,
             rawWrite,
@@ -1753,11 +1859,21 @@ namespace ts {
             getLine: () => lineCount + 1,
             getColumn: () => lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1,
             getText: () => output,
+            reset
         };
     }
 
+    /**
+     * Resolves a local path to a path which is absolute to the base of the emit
+     */
+    export function getExternalModuleNameFromPath(host: EmitHost, fileName: string): string {
+        const dir = host.getCurrentDirectory();
+        const relativePath = getRelativePathToDirectoryOrUrl(dir, fileName, dir, f => host.getCanonicalFileName(f), /*isAbsolutePathAnUrl*/ false);
+        return removeFileExtension(relativePath);
+    }
+
     export function getOwnEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost, extension: string) {
-        let compilerOptions = host.getCompilerOptions();
+        const compilerOptions = host.getCompilerOptions();
         let emitOutputFilePathWithoutExtension: string;
         if (compilerOptions.outDir) {
             emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
@@ -1785,6 +1901,10 @@ namespace ts {
         return getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
 
+    export function getLineOfLocalPositionFromLineMap(lineMap: number[], pos: number) {
+        return computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+
     export function getFirstConstructorWithBody(node: ClassLikeDeclaration): ConstructorDeclaration {
         return forEach(node.members, member => {
             if (member.kind === SyntaxKind.Constructor && nodeIsPresent((<ConstructorDeclaration>member).body)) {
@@ -1830,8 +1950,8 @@ namespace ts {
             forEach(declarations, (member: Declaration) => {
                 if ((member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor)
                     && (member.flags & NodeFlags.Static) === (accessor.flags & NodeFlags.Static)) {
-                    let memberName = getPropertyNameForPropertyNameNode(member.name);
-                    let accessorName = getPropertyNameForPropertyNameNode(accessor.name);
+                    const memberName = getPropertyNameForPropertyNameNode(member.name);
+                    const accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
                         if (!firstAccessor) {
                             firstAccessor = <AccessorDeclaration>member;
@@ -1859,23 +1979,23 @@ namespace ts {
         };
     }
 
-    export function emitNewLineBeforeLeadingComments(currentSourceFile: SourceFile, writer: EmitTextWriter, node: TextRange, leadingComments: CommentRange[]) {
+    export function emitNewLineBeforeLeadingComments(lineMap: number[], writer: EmitTextWriter, node: TextRange, leadingComments: CommentRange[]) {
         // If the leading comments start on different line than the start of node, write new line
         if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
 
-    export function emitComments(currentSourceFile: SourceFile, writer: EmitTextWriter, comments: CommentRange[], trailingSeparator: boolean, newLine: string,
-        writeComment: (currentSourceFile: SourceFile, writer: EmitTextWriter, comment: CommentRange, newLine: string) => void) {
+    export function emitComments(text: string, lineMap: number[], writer: EmitTextWriter, comments: CommentRange[], trailingSeparator: boolean, newLine: string,
+        writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) => void) {
         let emitLeadingSpace = !trailingSeparator;
         forEach(comments, comment => {
             if (emitLeadingSpace) {
                 writer.write(" ");
                 emitLeadingSpace = false;
             }
-            writeComment(currentSourceFile, writer, comment, newLine);
+            writeComment(text, lineMap, writer, comment, newLine);
             if (comment.hasTrailingNewLine) {
                 writer.writeLine();
             }
@@ -1889,24 +2009,93 @@ namespace ts {
         });
     }
 
-    export function writeCommentRange(currentSourceFile: SourceFile, writer: EmitTextWriter, comment: CommentRange, newLine: string) {
-        if (currentSourceFile.text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk) {
-            let firstCommentLineAndCharacter = getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
-            let lineCount = getLineStarts(currentSourceFile).length;
+    /**
+     * Detached comment is a comment at the top of file or function body that is separated from
+     * the next statement by space.
+     */
+    export function emitDetachedComments(text: string, lineMap: number[], writer: EmitTextWriter,
+        writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) => void,
+        node: TextRange, newLine: string, removeComments: boolean) {
+        let leadingComments: CommentRange[];
+        let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
+        if (removeComments) {
+            // removeComments is true, only reserve pinned comment at the top of file
+            // For example:
+            //      /*! Pinned Comment */
+            //
+            //      var x = 10;
+            if (node.pos === 0) {
+                leadingComments = filter(getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            // removeComments is false, just get detached as normal and bypass the process to filter comment
+            leadingComments = getLeadingCommentRanges(text, node.pos);
+        }
+
+        if (leadingComments) {
+            const detachedComments: CommentRange[] = [];
+            let lastComment: CommentRange;
+
+            for (const comment of leadingComments) {
+                if (lastComment) {
+                    const lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    const commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+
+                    if (commentLine >= lastCommentLine + 2) {
+                        // There was a blank line between the last comment and this comment.  This
+                        // comment is not part of the copyright comments.  Return what we have so
+                        // far.
+                        break;
+                    }
+                }
+
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+
+            if (detachedComments.length) {
+                // All comments look like they could have been part of the copyright header.  Make
+                // sure there is at least one blank line between it and the node.  If not, it's not
+                // a copyright header.
+                const lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastOrUndefined(detachedComments).end);
+                const nodeLine = getLineOfLocalPositionFromLineMap(lineMap, skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    // Valid detachedComments
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+
+        return currentDetachedCommentInfo;
+
+        function isPinnedComment(comment: CommentRange) {
+            return text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
+                text.charCodeAt(comment.pos + 2) === CharacterCodes.exclamation;
+        }
+
+    }
+
+    export function writeCommentRange(text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) {
+        if (text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk) {
+            const firstCommentLineAndCharacter = computeLineAndCharacterOfPosition(lineMap, comment.pos);
+            const lineCount = lineMap.length;
             let firstCommentLineIndent: number;
             for (let pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
-                let nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                const nextLineStart = (currentLine + 1) === lineCount
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
 
                 if (pos !== comment.pos) {
                     // If we are not emitting first line, we need to write the spaces to adjust the alignment
                     if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
                     }
 
                     // These are number of spaces writer is going to write at current indent
-                    let currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
+                    const currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
 
                     // Number of spaces we want to be writing
                     // eg: Assume writer indent
@@ -1922,10 +2111,10 @@ namespace ts {
                     //            More right indented comment */                  --4 = 8 - 4 + 11
                     //     class c { }
                     // }
-                    let spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
+                    const spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
                     if (spacesToEmit > 0) {
                         let numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
-                        let indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
+                        const indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
 
                         // Write indent size string ( in eg 1: = "", 2: "" , 3: string with 8 spaces 4: string with 12 spaces
                         writer.rawWrite(indentSizeSpaceString);
@@ -1943,47 +2132,47 @@ namespace ts {
                 }
 
                 // Write the comment line text
-                writeTrimmedCurrentLine(pos, nextLineStart);
+                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
 
                 pos = nextLineStart;
             }
         }
         else {
             // Single line comment of style //....
-            writer.write(currentSourceFile.text.substring(comment.pos, comment.end));
+            writer.write(text.substring(comment.pos, comment.end));
         }
+    }
 
-        function writeTrimmedCurrentLine(pos: number, nextLineStart: number) {
-            let end = Math.min(comment.end, nextLineStart - 1);
-            let currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-            if (currentLineText) {
-                // trimmed forward and ending spaces text
-                writer.write(currentLineText);
-                if (end !== comment.end) {
-                    writer.writeLine();
-                }
+    function writeTrimmedCurrentLine(text: string, comment: CommentRange, writer: EmitTextWriter, newLine: string, pos: number, nextLineStart: number) {
+        const end = Math.min(comment.end, nextLineStart - 1);
+        const currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            // trimmed forward and ending spaces text
+            writer.write(currentLineText);
+            if (end !== comment.end) {
+                writer.writeLine();
+            }
+        }
+        else {
+            // Empty string - make sure we write empty line
+            writer.writeLiteral(newLine);
+        }
+    }
+
+    function calculateIndent(text: string, pos: number, end: number) {
+        let currentLineIndent = 0;
+        for (; pos < end && isWhiteSpace(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === CharacterCodes.tab) {
+                // Tabs = TabSize = indent size and go to next tabStop
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
             }
             else {
-                // Empty string - make sure we write empty line
-                writer.writeLiteral(newLine);
+                // Single space
+                currentLineIndent++;
             }
         }
 
-        function calculateIndent(pos: number, end: number) {
-            let currentLineIndent = 0;
-            for (; pos < end && isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) {
-                if (currentSourceFile.text.charCodeAt(pos) === CharacterCodes.tab) {
-                    // Tabs = TabSize = indent size and go to next tabStop
-                    currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-                }
-                else {
-                    // Single space
-                    currentLineIndent++;
-                }
-            }
-
-            return currentLineIndent;
-        }
+        return currentLineIndent;
     }
 
     export function modifierToFlag(token: SyntaxKind): NodeFlags {
@@ -2069,7 +2258,7 @@ namespace ts {
     }
 
     export function isEmptyObjectLiteralOrArrayLiteral(expression: Node): boolean {
-        let kind = expression.kind;
+        const kind = expression.kind;
         if (kind === SyntaxKind.ObjectLiteralExpression) {
             return (<ObjectLiteralExpression>expression).properties.length === 0;
         }
@@ -2083,12 +2272,12 @@ namespace ts {
         return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & NodeFlags.Default) ? symbol.valueDeclaration.localSymbol : undefined;
     }
 
-    export function isJavaScript(fileName: string) {
-        return fileExtensionIs(fileName, ".js");
+    export function hasJavaScriptFileExtension(fileName: string) {
+        return fileExtensionIs(fileName, ".js") || fileExtensionIs(fileName, ".jsx");
     }
 
-    export function isTsx(fileName: string) {
-        return fileExtensionIs(fileName, ".tsx");
+    export function allowsJsxExpressions(fileName: string) {
+        return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx");
     }
 
     /**
@@ -2096,11 +2285,11 @@ namespace ts {
      * representing the UTF-8 encoding of the character, and return the expanded char code list.
      */
     function getExpandedCharCodes(input: string): number[] {
-        let output: number[] = [];
-        let length = input.length;
+        const output: number[] = [];
+        const length = input.length;
 
         for (let i = 0; i < length; i++) {
-            let charCode = input.charCodeAt(i);
+            const charCode = input.charCodeAt(i);
 
             // handel utf8
             if (charCode < 0x80) {
@@ -2136,9 +2325,9 @@ namespace ts {
      */
     export function convertToBase64(input: string): string {
         let result = "";
-        let charCodes = getExpandedCharCodes(input);
+        const charCodes = getExpandedCharCodes(input);
         let i = 0;
-        let length = charCodes.length;
+        const length = charCodes.length;
         let byte1: number, byte2: number, byte3: number, byte4: number;
 
         while (i < length) {
@@ -2167,6 +2356,12 @@ namespace ts {
         return result;
     }
 
+    export function convertToRelativePath(absoluteOrRelativePath: string, basePath: string, getCanonicalFileName: (path: string) => string): string {
+        return !isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /* isAbsolutePathAnUrl */ false);
+    }
+
     const carriageReturnLineFeed = "\r\n";
     const lineFeed = "\n";
     export function getNewLineCharacter(options: CompilerOptions): string {
@@ -2206,14 +2401,14 @@ namespace ts {
     }
 
     export function textSpanOverlapsWith(span: TextSpan, other: TextSpan) {
-        let overlapStart = Math.max(span.start, other.start);
-        let overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
+        const overlapStart = Math.max(span.start, other.start);
+        const overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
         return overlapStart < overlapEnd;
     }
 
     export function textSpanOverlap(span1: TextSpan, span2: TextSpan) {
-        let overlapStart = Math.max(span1.start, span2.start);
-        let overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        const overlapStart = Math.max(span1.start, span2.start);
+        const overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
         if (overlapStart < overlapEnd) {
             return createTextSpanFromBounds(overlapStart, overlapEnd);
         }
@@ -2225,13 +2420,13 @@ namespace ts {
     }
 
     export function textSpanIntersectsWith(span: TextSpan, start: number, length: number) {
-        let end = start + length;
+        const end = start + length;
         return start <= textSpanEnd(span) && end >= span.start;
     }
 
     export function decodedTextSpanIntersectsWith(start1: number, length1: number, start2: number, length2: number) {
-        let end1 = start1 + length1;
-        let end2 = start2 + length2;
+        const end1 = start1 + length1;
+        const end2 = start2 + length2;
         return start2 <= end1 && end2 >= start1;
     }
 
@@ -2240,8 +2435,8 @@ namespace ts {
     }
 
     export function textSpanIntersection(span1: TextSpan, span2: TextSpan) {
-        let intersectStart = Math.max(span1.start, span2.start);
-        let intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        const intersectStart = Math.max(span1.start, span2.start);
+        const intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
         if (intersectStart <= intersectEnd) {
             return createTextSpanFromBounds(intersectStart, intersectEnd);
         }
@@ -2300,14 +2495,14 @@ namespace ts {
 
         // We change from talking about { { oldStart, oldLength }, newLength } to { oldStart, oldEnd, newEnd }
         // as it makes things much easier to reason about.
-        let change0 = changes[0];
+        const change0 = changes[0];
 
         let oldStartN = change0.span.start;
         let oldEndN = textSpanEnd(change0.span);
         let newEndN = oldStartN + change0.newLength;
 
         for (let i = 1; i < changes.length; i++) {
-            let nextChange = changes[i];
+            const nextChange = changes[i];
 
             // Consider the following case:
             // i.e. two edits.  The first represents the text change range { { 10, 50 }, 30 }.  i.e. The span starting
@@ -2389,13 +2584,13 @@ namespace ts {
             //      newEnd3  : Max(newEnd2, newEnd2 + (newEnd1 - oldEnd2))
             // }
 
-            let oldStart1 = oldStartN;
-            let oldEnd1 = oldEndN;
-            let newEnd1 = newEndN;
+            const oldStart1 = oldStartN;
+            const oldEnd1 = oldEndN;
+            const newEnd1 = newEndN;
 
-            let oldStart2 = nextChange.span.start;
-            let oldEnd2 = textSpanEnd(nextChange.span);
-            let newEnd2 = oldStart2 + nextChange.newLength;
+            const oldStart2 = nextChange.span.start;
+            const oldEnd2 = textSpanEnd(nextChange.span);
+            const newEnd2 = oldStart2 + nextChange.newLength;
 
             oldStartN = Math.min(oldStart1, oldStart2);
             oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
@@ -2414,16 +2609,4 @@ namespace ts {
             }
         }
     }
-
-    export function arrayStructurallyIsEqualTo<T>(array1: Array<T>, array2: Array<T>): boolean {
-        if (!array1 || !array2) {
-            return false;
-        }
-
-        if (array1.length !== array2.length) {
-            return false;
-        }
-
-        return arrayIsEqualTo(array1.sort(), array2.sort());
-    }
 }
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index 108c6f4518a..425fa888013 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -40,89 +40,76 @@ class CompilerBaselineRunner extends RunnerBase {
         this.basePath += "/" + this.testSuiteName;
     }
 
+    private makeUnitName(name: string, root: string) {
+        return ts.isRootedDiskPath(name) ? name : ts.combinePaths(root, name);
+    };
+
     public checkTestCodeOutput(fileName: string) {
         describe("compiler tests for " + fileName, () => {
             // Mocha holds onto the closure environment of the describe callback even after the test is done.
             // Everything declared here should be cleared out in the "after" callback.
             let justName: string;
-            let content: string;
-            let testCaseContent: { settings: Harness.TestCaseParser.CompilerSettings; testUnitData: Harness.TestCaseParser.TestUnitData[]; };
-
-            let units: Harness.TestCaseParser.TestUnitData[];
-            let tcSettings: Harness.TestCaseParser.CompilerSettings;
 
             let lastUnit: Harness.TestCaseParser.TestUnitData;
-            let rootDir: string;
+            let harnessSettings: Harness.TestCaseParser.CompilerSettings;
 
             let result: Harness.Compiler.CompilerResult;
-            let program: ts.Program;
             let options: ts.CompilerOptions;
             // equivalent to the files that will be passed on the command line
-            let toBeCompiled: { unitName: string; content: string }[];
+            let toBeCompiled: Harness.Compiler.TestFile[];
             // equivalent to other files on the file system not directly passed to the compiler (ie things that are referenced by other files)
-            let otherFiles: { unitName: string; content: string }[];
-            let harnessCompiler: Harness.Compiler.HarnessCompiler;
+            let otherFiles: Harness.Compiler.TestFile[];
 
             before(() => {
                 justName = fileName.replace(/^.*[\\\/]/, ""); // strips the fileName from the path.
-                content = Harness.IO.readFile(fileName);
-                testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName);
-                units = testCaseContent.testUnitData;
-                tcSettings = testCaseContent.settings;
+                const content = Harness.IO.readFile(fileName);
+                const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName);
+                const units = testCaseContent.testUnitData;
+                harnessSettings = testCaseContent.settings;
                 lastUnit = units[units.length - 1];
-                rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/";
-                harnessCompiler = Harness.Compiler.getCompiler();
+                const rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/";
                 // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test)
                 // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references,
                 // otherwise, assume all files are just meant to be in the same compilation session without explicit references to one another.
                 toBeCompiled = [];
                 otherFiles = [];
                 if (/require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) {
-                    toBeCompiled.push({ unitName: rootDir + lastUnit.name, content: lastUnit.content });
+                    toBeCompiled.push({ unitName: this.makeUnitName(lastUnit.name, rootDir), content: lastUnit.content });
                     units.forEach(unit => {
                         if (unit.name !== lastUnit.name) {
-                            otherFiles.push({ unitName: rootDir + unit.name, content: unit.content });
+                            otherFiles.push({ unitName: this.makeUnitName(unit.name, rootDir), content: unit.content });
                         }
                     });
                 }
                 else {
                     toBeCompiled = units.map(unit => {
-                        return { unitName: rootDir + unit.name, content: unit.content };
+                        return { unitName: this.makeUnitName(unit.name, rootDir), content: unit.content };
                     });
                 }
 
-                options = harnessCompiler.compileFiles(toBeCompiled, otherFiles, function (compileResult, _program) {
-                    result = compileResult;
-                    // The program will be used by typeWriter
-                    program = _program;
-                }, function (settings) {
-                        harnessCompiler.setCompilerSettings(tcSettings);
-                    });
+                const output = Harness.Compiler.compileFiles(
+                    toBeCompiled, otherFiles, harnessSettings, /* options */ undefined, /* currentDirectory */ undefined);
+
+                options = output.options;
+                result = output.result;
             });
 
             after(() => {
                 // Mocha holds onto the closure environment of the describe callback even after the test is done.
                 // Therefore we have to clean out large objects after the test is done.
                 justName = undefined;
-                content = undefined;
-                testCaseContent = undefined;
-                units = undefined;
-                tcSettings = undefined;
                 lastUnit = undefined;
-                rootDir = undefined;
                 result = undefined;
-                program = undefined;
                 options = undefined;
                 toBeCompiled = undefined;
                 otherFiles = undefined;
-                harnessCompiler = undefined;
             });
 
             function getByteOrderMarkText(file: Harness.Compiler.GeneratedFile): string {
                 return file.writeByteOrderMark ? "\u00EF\u00BB\u00BF" : "";
             }
 
-            function getErrorBaseline(toBeCompiled: { unitName: string; content: string }[], otherFiles: { unitName: string; content: string }[], result: Harness.Compiler.CompilerResult) {
+            function getErrorBaseline(toBeCompiled: Harness.Compiler.TestFile[], otherFiles: Harness.Compiler.TestFile[], result: Harness.Compiler.CompilerResult) {
                 return Harness.Compiler.getErrorBaseline(toBeCompiled.concat(otherFiles), result.errors);
             }
 
@@ -140,7 +127,7 @@ class CompilerBaselineRunner extends RunnerBase {
             it("Correct sourcemap content for " + fileName, () => {
                 if (options.sourceMap || options.inlineSourceMap) {
                     Harness.Baseline.runBaseline("Correct sourcemap content for " + fileName, justName.replace(/\.tsx?$/, ".sourcemap.txt"), () => {
-                        let record = result.getSourceMapRecord();
+                        const record = result.getSourceMapRecord();
                         if (options.noEmitOnError && result.errors.length !== 0 && record === undefined) {
                             // Because of the noEmitOnError option no files are created. We need to return null because baselining isn"t required.
                             return null;
@@ -159,7 +146,7 @@ class CompilerBaselineRunner extends RunnerBase {
                     // check js output
                     Harness.Baseline.runBaseline("Correct JS output for " + fileName, justName.replace(/\.tsx?/, ".js"), () => {
                         let tsCode = "";
-                        let tsSources = otherFiles.concat(toBeCompiled);
+                        const tsSources = otherFiles.concat(toBeCompiled);
                         if (tsSources.length > 1) {
                             tsCode += "//// [" + fileName + "] ////\r\n\r\n";
                         }
@@ -184,9 +171,9 @@ class CompilerBaselineRunner extends RunnerBase {
                             }
                         }
 
-                        let declFileCompilationResult = harnessCompiler.compileDeclarationFiles(toBeCompiled, otherFiles, result, function (settings) {
-                            harnessCompiler.setCompilerSettings(tcSettings);
-                        }, options);
+                        const declFileCompilationResult =
+                            Harness.Compiler.compileDeclarationFiles(
+                                toBeCompiled, otherFiles, result, harnessSettings, options, /*currentDirectory*/ undefined);
 
                         if (declFileCompilationResult && declFileCompilationResult.declResult.errors.length) {
                             jsCode += "\r\n\r\n//// [DtsFileErrors]\r\n";
@@ -257,15 +244,16 @@ class CompilerBaselineRunner extends RunnerBase {
                     // These types are equivalent, but depend on what order the compiler observed
                     // certain parts of the program.
 
-                    let allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName));
+                    const program = result.program;
+                    const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName));
 
-                    let fullWalker = new TypeWriterWalker(program, /*fullTypeCheck:*/ true);
-                    let pullWalker = new TypeWriterWalker(program, /*fullTypeCheck:*/ false);
+                    const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true);
+                    const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ false);
 
-                    let fullResults: ts.Map<TypeWriterResult[]> = {};
-                    let pullResults: ts.Map<TypeWriterResult[]> = {};
+                    const fullResults: ts.Map<TypeWriterResult[]> = {};
+                    const pullResults: ts.Map<TypeWriterResult[]> = {};
 
-                    for (let sourceFile of allFiles) {
+                    for (const sourceFile of allFiles) {
                         fullResults[sourceFile.unitName] = fullWalker.getTypeAndSymbols(sourceFile.unitName);
                         pullResults[sourceFile.unitName] = fullWalker.getTypeAndSymbols(sourceFile.unitName);
                     }
@@ -274,14 +262,14 @@ class CompilerBaselineRunner extends RunnerBase {
                     // The second gives symbols for all identifiers.
                     let e1: Error, e2: Error;
                     try {
-                        checkBaseLines(/*isSymbolBaseLine:*/ false);
+                        checkBaseLines(/*isSymbolBaseLine*/ false);
                     }
                     catch (e) {
                         e1 = e;
                     }
 
                     try {
-                        checkBaseLines(/*isSymbolBaseLine:*/ true);
+                        checkBaseLines(/*isSymbolBaseLine*/ true);
                     }
                     catch (e) {
                         e2 = e;
@@ -294,11 +282,11 @@ class CompilerBaselineRunner extends RunnerBase {
                     return;
 
                     function checkBaseLines(isSymbolBaseLine: boolean) {
-                        let fullBaseLine = generateBaseLine(fullResults, isSymbolBaseLine);
-                        let pullBaseLine = generateBaseLine(pullResults, isSymbolBaseLine);
+                        const fullBaseLine = generateBaseLine(fullResults, isSymbolBaseLine);
+                        const pullBaseLine = generateBaseLine(pullResults, isSymbolBaseLine);
 
-                        let fullExtension = isSymbolBaseLine ? ".symbols" : ".types";
-                        let pullExtension = isSymbolBaseLine ? ".symbols.pull" : ".types.pull";
+                        const fullExtension = isSymbolBaseLine ? ".symbols" : ".types";
+                        const pullExtension = isSymbolBaseLine ? ".symbols.pull" : ".types.pull";
 
                         if (fullBaseLine !== pullBaseLine) {
                             Harness.Baseline.runBaseline("Correct full information for " + fileName, justName.replace(/\.tsx?/, fullExtension), () => fullBaseLine);
@@ -310,24 +298,24 @@ class CompilerBaselineRunner extends RunnerBase {
                     }
 
                     function generateBaseLine(typeWriterResults: ts.Map<TypeWriterResult[]>, isSymbolBaseline: boolean): string {
-                        let typeLines: string[] = [];
-                        let typeMap: { [fileName: string]: { [lineNum: number]: string[]; } } = {};
+                        const typeLines: string[] = [];
+                        const typeMap: { [fileName: string]: { [lineNum: number]: string[]; } } = {};
 
                         allFiles.forEach(file => {
-                            let codeLines = file.content.split("\n");
+                            const codeLines = file.content.split("\n");
                             typeWriterResults[file.unitName].forEach(result => {
                                 if (isSymbolBaseline && !result.symbol) {
                                     return;
                                 }
 
-                                let typeOrSymbolString = isSymbolBaseline ? result.symbol : result.type;
-                                let formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + typeOrSymbolString;
+                                const typeOrSymbolString = isSymbolBaseline ? result.symbol : result.type;
+                                const formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + typeOrSymbolString;
                                 if (!typeMap[file.unitName]) {
                                     typeMap[file.unitName] = {};
                                 }
 
                                 let typeInfo = [formattedLine];
-                                let existingTypeInfo = typeMap[file.unitName][result.line];
+                                const existingTypeInfo = typeMap[file.unitName][result.line];
                                 if (existingTypeInfo) {
                                     typeInfo = existingTypeInfo.concat(typeInfo);
                                 }
@@ -336,10 +324,10 @@ class CompilerBaselineRunner extends RunnerBase {
 
                             typeLines.push("=== " + file.unitName + " ===\r\n");
                             for (let i = 0; i < codeLines.length; i++) {
-                                let currentCodeLine = codeLines[i];
+                                const currentCodeLine = codeLines[i];
                                 typeLines.push(currentCodeLine + "\r\n");
                                 if (typeMap[file.unitName]) {
-                                    let typeInfo = typeMap[file.unitName][i];
+                                    const typeInfo = typeMap[file.unitName][i];
                                     if (typeInfo) {
                                         typeInfo.forEach(ty => {
                                             typeLines.push(">" + ty + "\r\n");
@@ -367,13 +355,12 @@ class CompilerBaselineRunner extends RunnerBase {
     public initializeTests() {
         describe(this.testSuiteName + " tests", () => {
             describe("Setup compiler for compiler baselines", () => {
-                let harnessCompiler = Harness.Compiler.getCompiler();
                 this.parseOptions();
             });
 
             // this will set up a series of describe/it blocks to run between the setup and cleanup phases
             if (this.tests.length === 0) {
-                let testFiles = this.enumerateFiles(this.basePath, /\.tsx?$/, { recursive: true });
+                const testFiles = this.enumerateFiles(this.basePath, /\.tsx?$/, { recursive: true });
                 testFiles.forEach(fn => {
                     fn = fn.replace(/\\/g, "/");
                     this.checkTestCodeOutput(fn);
@@ -392,7 +379,7 @@ class CompilerBaselineRunner extends RunnerBase {
             this.decl = false;
             this.output = false;
 
-            let opts = this.options.split(",");
+            const opts = this.options.split(",");
             for (let i = 0; i < opts.length; i++) {
                 switch (opts[i]) {
                     case "error":
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 457ece7e132..5f48a885395 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -48,12 +48,6 @@ namespace FourSlash {
         ranges: Range[];
     }
 
-    export interface TestXmlData {
-        invalidReason: string;
-        originalName: string;
-        actions: string[];
-    }
-
     interface MemberListData {
         result: {
             maybeInaccurate: boolean;
@@ -84,14 +78,14 @@ namespace FourSlash {
         marker?: Marker;
     }
 
-    interface ILocationInformation {
+    interface LocationInformation {
         position: number;
         sourcePosition: number;
         sourceLine: number;
         sourceColumn: number;
     }
 
-    interface IRangeLocationInformation extends ILocationInformation {
+    interface RangeLocationInformation extends LocationInformation {
         marker?: Marker;
     }
 
@@ -102,7 +96,7 @@ namespace FourSlash {
 
     export import IndentStyle = ts.IndentStyle;
 
-    let entityMap: ts.Map<string> = {
+    const entityMap: ts.Map<string> = {
         "&": "&amp;",
         "\"": "&quot;",
         "'": "&#39;",
@@ -118,7 +112,7 @@ namespace FourSlash {
     // Name of testcase metadata including ts.CompilerOptions properties that will be used by globalOptions
     // To add additional option, add property into the testOptMetadataNames, refer the property in either globalMetadataNames or fileMetadataNames
     // Add cases into convertGlobalOptionsToCompilationsSettings function for the compiler to acknowledge such option from meta data
-    let metadataOptionNames = {
+    const metadataOptionNames = {
         baselineFile: "BaselineFile",
         emitThisFile: "emitThisFile",  // This flag is used for testing getEmitOutput feature. It allows test-cases to indicate what file to be output in multiple files project
         fileName: "Filename",
@@ -126,19 +120,14 @@ namespace FourSlash {
     };
 
     // List of allowed metadata names
-    let fileMetadataNames = [metadataOptionNames.fileName, metadataOptionNames.emitThisFile, metadataOptionNames.resolveReference];
+    const fileMetadataNames = [metadataOptionNames.fileName, metadataOptionNames.emitThisFile, metadataOptionNames.resolveReference];
 
     function convertGlobalOptionsToCompilerOptions(globalOptions: Harness.TestCaseParser.CompilerSettings): ts.CompilerOptions {
-        let settings: ts.CompilerOptions = { target: ts.ScriptTarget.ES5 };
+        const settings: ts.CompilerOptions = { target: ts.ScriptTarget.ES5 };
         Harness.Compiler.setCompilerOptionsFromHarnessSetting(globalOptions, settings);
         return settings;
     }
 
-    export let currentTestState: TestState = null;
-    function assertionMessage(msg: string) {
-        return "\nMarker: " + currentTestState.lastKnownMarker + "\nChecking: " + msg + "\n\n";
-    }
-
     export class TestCancellationToken implements ts.HostCancellationToken {
         // 0 - cancelled
         // >0 - not cancelled
@@ -216,17 +205,26 @@ namespace FourSlash {
 
         public formatCodeOptions: ts.FormatCodeOptions;
 
-        private scenarioActions: string[] = [];
-        private taoInvalidReason: string = null;
-
         private inputFiles: ts.Map<string> = {};  // Map between inputFile's fileName and its content for easily looking up when resolving references
 
         // Add input file which has matched file name with the given reference-file path.
         // This is necessary when resolveReference flag is specified
-        private addMatchedInputFile(referenceFilePath: string) {
-            let inputFile = this.inputFiles[referenceFilePath];
-            if (inputFile && !Harness.isLibraryFile(referenceFilePath)) {
-                this.languageServiceAdapterHost.addScript(referenceFilePath, inputFile);
+        private addMatchedInputFile(referenceFilePath: string, extensions: string[]) {
+            const inputFiles = this.inputFiles;
+            const languageServiceAdapterHost = this.languageServiceAdapterHost;
+            if (!extensions) {
+                tryAdd(referenceFilePath);
+            }
+            else {
+                tryAdd(referenceFilePath) || ts.forEach(extensions, ext => tryAdd(referenceFilePath + ext));
+            }
+
+            function tryAdd(path: string) {
+                const inputFile = inputFiles[path];
+                if (inputFile && !Harness.isLibraryFile(path)) {
+                    languageServiceAdapterHost.addScript(path, inputFile);
+                    return true;
+                }
             }
         }
 
@@ -248,8 +246,8 @@ namespace FourSlash {
         constructor(private basePath: string, private testType: FourSlashTestType, public testData: FourSlashData) {
             // Create a new Services Adapter
             this.cancellationToken = new TestCancellationToken();
-            let compilationOptions = convertGlobalOptionsToCompilerOptions(this.testData.globalOptions);
-            let languageServiceAdapter = this.getLanguageServiceAdapter(testType, this.cancellationToken, compilationOptions);
+            const compilationOptions = convertGlobalOptionsToCompilerOptions(this.testData.globalOptions);
+            const languageServiceAdapter = this.getLanguageServiceAdapter(testType, this.cancellationToken, compilationOptions);
             this.languageServiceAdapterHost = languageServiceAdapter.getHost();
             this.languageService = languageServiceAdapter.getLanguageService();
 
@@ -272,23 +270,23 @@ namespace FourSlash {
                 // Add the entry-point file itself into the languageServiceShimHost
                 this.languageServiceAdapterHost.addScript(startResolveFileRef.fileName, startResolveFileRef.content);
 
-                let resolvedResult = languageServiceAdapter.getPreProcessedFileInfo(startResolveFileRef.fileName, startResolveFileRef.content);
-                let referencedFiles: ts.FileReference[] = resolvedResult.referencedFiles;
-                let importedFiles: ts.FileReference[] = resolvedResult.importedFiles;
+                const resolvedResult = languageServiceAdapter.getPreProcessedFileInfo(startResolveFileRef.fileName, startResolveFileRef.content);
+                const referencedFiles: ts.FileReference[] = resolvedResult.referencedFiles;
+                const importedFiles: ts.FileReference[] = resolvedResult.importedFiles;
 
                 // Add triple reference files into language-service host
                 ts.forEach(referencedFiles, referenceFile => {
                     // Fourslash insert tests/cases/fourslash into inputFile.unitName so we will properly append the same base directory to refFile path
-                    let referenceFilePath = this.basePath + "/" + referenceFile.fileName;
-                    this.addMatchedInputFile(referenceFilePath);
+                    const referenceFilePath = this.basePath + "/" + referenceFile.fileName;
+                    this.addMatchedInputFile(referenceFilePath, /* extensions */ undefined);
                 });
 
                 // Add import files into language-service host
                 ts.forEach(importedFiles, importedFile => {
                     // Fourslash insert tests/cases/fourslash into inputFile.unitName and import statement doesn't require ".ts"
                     // so convert them before making appropriate comparison
-                    let importedFilePath = this.basePath + "/" + importedFile.fileName + ".ts";
-                    this.addMatchedInputFile(importedFilePath);
+                    const importedFilePath = this.basePath + "/" + importedFile.fileName;
+                    this.addMatchedInputFile(importedFilePath, compilationOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions);
                 });
 
                 // Check if no-default-lib flag is false and if so add default library
@@ -324,9 +322,8 @@ namespace FourSlash {
             };
 
             this.testData.files.forEach(file => {
-                let fileName = file.fileName.replace(Harness.IO.directoryName(file.fileName), "").substr(1);
-                let fileNameWithoutExtension = fileName.substr(0, fileName.lastIndexOf("."));
-                this.scenarioActions.push("<CreateFileOnDisk FileId=\"" + fileName + "\" FileNameWithoutExtension=\"" + fileNameWithoutExtension + "\" FileExtension=\".ts\"><![CDATA[" + file.content + "]]></CreateFileOnDisk>");
+                const fileName = file.fileName.replace(Harness.IO.directoryName(file.fileName), "").substr(1);
+                const fileNameWithoutExtension = fileName.substr(0, fileName.lastIndexOf("."));
             });
 
             // Open the first file by default
@@ -334,18 +331,18 @@ namespace FourSlash {
         }
 
         private getFileContent(fileName: string): string {
-            let script = this.languageServiceAdapterHost.getScriptInfo(fileName);
+            const script = this.languageServiceAdapterHost.getScriptInfo(fileName);
             return script.content;
         }
 
         // Entry points from fourslash.ts
         public goToMarker(name = "") {
-            let marker = this.getMarkerByName(name);
+            const marker = this.getMarkerByName(name);
             if (this.activeFile.fileName !== marker.fileName) {
                 this.openFile(marker.fileName);
             }
 
-            let content = this.getFileContent(marker.fileName);
+            const content = this.getFileContent(marker.fileName);
             if (marker.position === -1 || marker.position > content.length) {
                 throw new Error(`Marker "${name}" has been invalidated by unrecoverable edits to the file.`);
             }
@@ -355,47 +352,32 @@ namespace FourSlash {
 
         public goToPosition(pos: number) {
             this.currentCaretPosition = pos;
-
-            let lineStarts = ts.computeLineStarts(this.getFileContent(this.activeFile.fileName));
-            let lineCharPos = ts.computeLineAndCharacterOfPosition(lineStarts, pos);
-            this.scenarioActions.push(`<MoveCaretToLineAndChar LineNumber=${ lineCharPos.line + 1 } CharNumber=${ lineCharPos.character + 1 } />`);
         }
 
         public moveCaretRight(count = 1) {
             this.currentCaretPosition += count;
             this.currentCaretPosition = Math.min(this.currentCaretPosition, this.getFileContent(this.activeFile.fileName).length);
-            if (count > 0) {
-                this.scenarioActions.push(`<MoveCaretRight NumberOfChars="${count}" />`);
-            }
-            else {
-                this.scenarioActions.push(`<MoveCaretLeft NumberOfChars="${-count}" />`);
-            }
         }
 
         // Opens a file given its 0-based index or fileName
-        public openFile(index: number): void;
-        public openFile(name: string): void;
-        public openFile(indexOrName: any) {
-            let fileToOpen: FourSlashFile = this.findFile(indexOrName);
+        public openFile(index: number, content?: string): void;
+        public openFile(name: string, content?: string): void;
+        public openFile(indexOrName: any, content?: string) {
+            const fileToOpen: FourSlashFile = this.findFile(indexOrName);
             fileToOpen.fileName = ts.normalizeSlashes(fileToOpen.fileName);
             this.activeFile = fileToOpen;
-            let fileName = fileToOpen.fileName.replace(Harness.IO.directoryName(fileToOpen.fileName), "").substr(1);
-            this.scenarioActions.push(`<OpenFile FileName="" SrcFileId="${fileName}" FileId="${fileName}" />`);
-
             // Let the host know that this file is now open
-            this.languageServiceAdapterHost.openFile(fileToOpen.fileName);
+            this.languageServiceAdapterHost.openFile(fileToOpen.fileName, content);
         }
 
         public verifyErrorExistsBetweenMarkers(startMarkerName: string, endMarkerName: string, negative: boolean) {
-            let startMarker = this.getMarkerByName(startMarkerName);
-            let endMarker = this.getMarkerByName(endMarkerName);
-            let predicate = function (errorMinChar: number, errorLimChar: number, startPos: number, endPos: number) {
+            const startMarker = this.getMarkerByName(startMarkerName);
+            const endMarker = this.getMarkerByName(endMarkerName);
+            const predicate = function (errorMinChar: number, errorLimChar: number, startPos: number, endPos: number) {
                 return ((errorMinChar === startPos) && (errorLimChar === endPos)) ? true : false;
             };
 
-            let exists = this.anyErrorInRange(predicate, startMarker, endMarker);
-
-            this.taoInvalidReason = "verifyErrorExistsBetweenMarkers NYI";
+            const exists = this.anyErrorInRange(predicate, startMarker, endMarker);
 
             if (exists !== negative) {
                 this.printErrorLog(negative, this.getAllDiagnostics());
@@ -409,14 +391,18 @@ namespace FourSlash {
         }
 
         private messageAtLastKnownMarker(message: string) {
-            return "Marker: " + currentTestState.lastKnownMarker + "\n" + message;
+            return "Marker: " + this.lastKnownMarker + "\n" + message;
+        }
+
+        private assertionMessageAtLastKnownMarker(msg: string) {
+            return "\nMarker: " + this.lastKnownMarker + "\nChecking: " + msg + "\n\n";
         }
 
         private getDiagnostics(fileName: string): ts.Diagnostic[] {
-            let syntacticErrors = this.languageService.getSyntacticDiagnostics(fileName);
-            let semanticErrors = this.languageService.getSemanticDiagnostics(fileName);
+            const syntacticErrors = this.languageService.getSyntacticDiagnostics(fileName);
+            const semanticErrors = this.languageService.getSemanticDiagnostics(fileName);
 
-            let diagnostics: ts.Diagnostic[] = [];
+            const diagnostics: ts.Diagnostic[] = [];
             diagnostics.push.apply(diagnostics, syntacticErrors);
             diagnostics.push.apply(diagnostics, semanticErrors);
 
@@ -424,9 +410,9 @@ namespace FourSlash {
         }
 
         private getAllDiagnostics(): ts.Diagnostic[] {
-            let diagnostics: ts.Diagnostic[] = [];
+            const diagnostics: ts.Diagnostic[] = [];
 
-            let fileNames = this.languageServiceAdapterHost.getFilenames();
+            const fileNames = this.languageServiceAdapterHost.getFilenames();
             for (let i = 0, n = fileNames.length; i < n; i++) {
                 diagnostics.push.apply(this.getDiagnostics(fileNames[i]));
             }
@@ -435,7 +421,7 @@ namespace FourSlash {
         }
 
         public verifyErrorExistsAfterMarker(markerName: string, negative: boolean, after: boolean) {
-            let marker: Marker = this.getMarkerByName(markerName);
+            const marker: Marker = this.getMarkerByName(markerName);
             let predicate: (errorMinChar: number, errorLimChar: number, startPos: number, endPos: number) => boolean;
 
             if (after) {
@@ -449,10 +435,8 @@ namespace FourSlash {
                 };
             }
 
-            this.taoInvalidReason = "verifyErrorExistsAfterMarker NYI";
-
-            let exists = this.anyErrorInRange(predicate, marker);
-            let diagnostics = this.getAllDiagnostics();
+            const exists = this.anyErrorInRange(predicate, marker);
+            const diagnostics = this.getAllDiagnostics();
 
             if (exists !== negative) {
                 this.printErrorLog(negative, diagnostics);
@@ -462,10 +446,10 @@ namespace FourSlash {
 
         private anyErrorInRange(predicate: (errorMinChar: number, errorLimChar: number, startPos: number, endPos: number) => boolean, startMarker: Marker, endMarker?: Marker) {
 
-            let errors = this.getDiagnostics(startMarker.fileName);
+            const errors = this.getDiagnostics(startMarker.fileName);
             let exists = false;
 
-            let startPos = startMarker.position;
+            const startPos = startMarker.position;
             let endPos: number = undefined;
             if (endMarker !== undefined) {
                 endPos = endMarker.position;
@@ -496,54 +480,42 @@ namespace FourSlash {
         }
 
         public verifyNumberOfErrorsInCurrentFile(expected: number) {
-            let errors = this.getDiagnostics(this.activeFile.fileName);
-            let actual = errors.length;
-
-            this.scenarioActions.push(`<CheckErrorList ExpectedNumOfErrors="${expected}" />`);
+            const errors = this.getDiagnostics(this.activeFile.fileName);
+            const actual = errors.length;
 
             if (actual !== expected) {
-                this.printErrorLog(false, errors);
-                let errorMsg = "Actual number of errors (" + actual + ") does not match expected number (" + expected + ")";
+                this.printErrorLog(/*expectErrors*/ false, errors);
+                const errorMsg = "Actual number of errors (" + actual + ") does not match expected number (" + expected + ")";
                 Harness.IO.log(errorMsg);
                 this.raiseError(errorMsg);
             }
         }
 
         public verifyEval(expr: string, value: any) {
-            let emit = this.languageService.getEmitOutput(this.activeFile.fileName);
+            const emit = this.languageService.getEmitOutput(this.activeFile.fileName);
             if (emit.outputFiles.length !== 1) {
                 throw new Error("Expected exactly one output from emit of " + this.activeFile.fileName);
             }
 
-            this.taoInvalidReason = "verifyEval impossible";
-
-            let evaluation = new Function(`${emit.outputFiles[0].text};\r\nreturn (${expr});`)();
+            const evaluation = new Function(`${emit.outputFiles[0].text};\r\nreturn (${expr});`)();
             if (evaluation !== value) {
                 this.raiseError(`Expected evaluation of expression "${expr}" to equal "${value}", but got "${evaluation}"`);
             }
         }
 
         public verifyGetEmitOutputForCurrentFile(expected: string): void {
-            let emit = this.languageService.getEmitOutput(this.activeFile.fileName);
+            const emit = this.languageService.getEmitOutput(this.activeFile.fileName);
             if (emit.outputFiles.length !== 1) {
                 throw new Error("Expected exactly one output from emit of " + this.activeFile.fileName);
             }
-            this.taoInvalidReason = "verifyGetEmitOutputForCurrentFile impossible";
-            let actual = emit.outputFiles[0].text;
+            const actual = emit.outputFiles[0].text;
             if (actual !== expected) {
                 this.raiseError(`Expected emit output to be "${expected}", but got "${actual}"`);
             }
         }
 
         public verifyMemberListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
-            this.scenarioActions.push("<ShowCompletionList />");
-            this.scenarioActions.push(`<VerifyCompletionContainsItem ItemName="${symbol}"/>`);
-
-            if (text || documentation || kind) {
-                this.taoInvalidReason = "verifyMemberListContains only supports the \"symbol\" parameter";
-            }
-
-            let members = this.getMemberListAtCaret();
+            const members = this.getMemberListAtCaret();
             if (members) {
                 this.assertItemInCompletionList(members.entries, symbol, text, documentation, kind);
             }
@@ -553,24 +525,15 @@ namespace FourSlash {
         }
 
         public verifyMemberListCount(expectedCount: number, negative: boolean) {
-            if (expectedCount === 0) {
-                if (negative) {
-                    this.verifyMemberListIsEmpty(false);
-                    return;
-                }
-                else {
-                    this.scenarioActions.push("<ShowCompletionList />");
-                }
-            }
-            else {
-                this.scenarioActions.push("<ShowCompletionList />");
-                this.scenarioActions.push(`<VerifyCompletionItemsCount Count="${expectedCount}" ${(negative ? "ExpectsFailure=\"true\" " : "")}/>`);
+            if (expectedCount === 0 && negative) {
+                this.verifyMemberListIsEmpty(/*negative*/ false);
+                return;
             }
 
-            let members = this.getMemberListAtCaret();
+            const members = this.getMemberListAtCaret();
 
             if (members) {
-                let match = members.entries.length === expectedCount;
+                const match = members.entries.length === expectedCount;
 
                 if ((!match && !negative) || (match && negative)) {
                     this.raiseError("Member list count was " + members.entries.length + ". Expected " + expectedCount);
@@ -582,20 +545,15 @@ namespace FourSlash {
         }
 
         public verifyMemberListDoesNotContain(symbol: string) {
-            this.scenarioActions.push("<ShowCompletionList />");
-            this.scenarioActions.push(`<VerifyCompletionDoesNotContainItem ItemName="${escapeXmlAttributeValue(symbol)}" />`);
-
-            let members = this.getMemberListAtCaret();
+            const members = this.getMemberListAtCaret();
             if (members && members.entries.filter(e => e.name === symbol).length !== 0) {
                 this.raiseError(`Member list did contain ${symbol}`);
             }
         }
 
         public verifyCompletionListItemsCountIsGreaterThan(count: number, negative: boolean) {
-            this.taoInvalidReason = "verifyCompletionListItemsCountIsGreaterThan NYI";
-
-            let completions = this.getCompletionListAtCaret();
-            let itemsCount = completions.entries.length;
+            const completions = this.getCompletionListAtCaret();
+            const itemsCount = completions.entries.length;
 
             if (negative) {
                 if (itemsCount > count) {
@@ -610,14 +568,7 @@ namespace FourSlash {
         }
 
         public verifyMemberListIsEmpty(negative: boolean) {
-            if (negative) {
-                this.scenarioActions.push("<ShowCompletionList />");
-            }
-            else {
-                this.scenarioActions.push("<ShowCompletionList ExpectsFailure=\"true\" />");
-            }
-
-            let members = this.getMemberListAtCaret();
+            const members = this.getMemberListAtCaret();
             if ((!members || members.entries.length === 0) && negative) {
                 this.raiseError("Member list is empty at Caret");
             }
@@ -635,9 +586,7 @@ namespace FourSlash {
         }
 
         public verifyCompletionListIsEmpty(negative: boolean) {
-            this.scenarioActions.push("<ShowCompletionList ExpectsFailure=\"true\" />");
-
-            let completions = this.getCompletionListAtCaret();
+            const completions = this.getCompletionListAtCaret();
             if ((!completions || completions.entries.length === 0) && negative) {
                 this.raiseError("Completion list is empty at caret at position " + this.activeFile.fileName + " " + this.currentCaretPosition);
             }
@@ -654,7 +603,7 @@ namespace FourSlash {
 
 
         public verifyCompletionListAllowsNewIdentifier(negative: boolean) {
-            let completions = this.getCompletionListAtCaret();
+            const completions = this.getCompletionListAtCaret();
 
             if ((completions && !completions.isNewIdentifierLocation) && !negative) {
                 this.raiseError("Expected builder completion entry");
@@ -665,7 +614,7 @@ namespace FourSlash {
         }
 
         public verifyCompletionListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
-            let completions = this.getCompletionListAtCaret();
+            const completions = this.getCompletionListAtCaret();
             if (completions) {
                 this.assertItemInCompletionList(completions.entries, symbol, text, documentation, kind);
             }
@@ -685,11 +634,11 @@ namespace FourSlash {
          * @param expectedKind the kind of symbol (see ScriptElementKind)
          */
         public verifyCompletionListDoesNotContain(symbol: string, expectedText?: string, expectedDocumentation?: string, expectedKind?: string) {
-            let that = this;
+            const that = this;
             function filterByTextOrDocumentation(entry: ts.CompletionEntry) {
-                let details = that.getCompletionEntryDetails(entry.name);
-                let documentation = ts.displayPartsToString(details.documentation);
-                let text = ts.displayPartsToString(details.displayParts);
+                const details = that.getCompletionEntryDetails(entry.name);
+                const documentation = ts.displayPartsToString(details.documentation);
+                const text = ts.displayPartsToString(details.displayParts);
                 if (expectedText && expectedDocumentation) {
                     return (documentation === expectedDocumentation && text === expectedText) ? true : false;
                 }
@@ -704,10 +653,8 @@ namespace FourSlash {
                 // and keep it in the list of filtered entry.
                 return true;
             }
-            this.scenarioActions.push("<ShowCompletionList />");
-            this.scenarioActions.push(`<VerifyCompletionDoesNotContainItem ItemName="${escapeXmlAttributeValue(symbol)}" />`);
 
-            let completions = this.getCompletionListAtCaret();
+            const completions = this.getCompletionListAtCaret();
             if (completions) {
                 let filterCompletions = completions.entries.filter(e => e.name === symbol);
                 filterCompletions = expectedKind ? filterCompletions.filter(e => e.kind === expectedKind) : filterCompletions;
@@ -717,7 +664,7 @@ namespace FourSlash {
                     // then these symbols must meet the criterion for Not supposed to be in the list. So we
                     // raise an error
                     let error = "Completion list did contain \'" + symbol + "\'.";
-                    let details = this.getCompletionEntryDetails(filterCompletions[0].name);
+                    const details = this.getCompletionEntryDetails(filterCompletions[0].name);
                     if (expectedText) {
                         error += "Expected text: " + expectedText + " to equal: " + ts.displayPartsToString(details.displayParts) + ".";
                     }
@@ -733,32 +680,28 @@ namespace FourSlash {
         }
 
         public verifyCompletionEntryDetails(entryName: string, expectedText: string, expectedDocumentation?: string, kind?: string) {
-            this.taoInvalidReason = "verifyCompletionEntryDetails NYI";
+            const details = this.getCompletionEntryDetails(entryName);
 
-            let details = this.getCompletionEntryDetails(entryName);
-
-            assert.equal(ts.displayPartsToString(details.displayParts), expectedText, assertionMessage("completion entry details text"));
+            assert.equal(ts.displayPartsToString(details.displayParts), expectedText, this.assertionMessageAtLastKnownMarker("completion entry details text"));
 
             if (expectedDocumentation !== undefined) {
-                assert.equal(ts.displayPartsToString(details.documentation), expectedDocumentation, assertionMessage("completion entry documentation"));
+                assert.equal(ts.displayPartsToString(details.documentation), expectedDocumentation, this.assertionMessageAtLastKnownMarker("completion entry documentation"));
             }
 
             if (kind !== undefined) {
-                assert.equal(details.kind, kind, assertionMessage("completion entry kind"));
+                assert.equal(details.kind, kind, this.assertionMessageAtLastKnownMarker("completion entry kind"));
             }
         }
 
         public verifyReferencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean) {
-            this.taoInvalidReason = "verifyReferencesAtPositionListContains NYI";
-
-            let references = this.getReferencesAtCaret();
+            const references = this.getReferencesAtCaret();
 
             if (!references || references.length === 0) {
                 this.raiseError("verifyReferencesAtPositionListContains failed - found 0 references, expected at least one.");
             }
 
             for (let i = 0; i < references.length; i++) {
-                let reference = references[i];
+                const reference = references[i];
                 if (reference && reference.fileName === fileName && reference.textSpan.start === start && ts.textSpanEnd(reference.textSpan) === end) {
                     if (typeof isWriteAccess !== "undefined" && reference.isWriteAccess !== isWriteAccess) {
                         this.raiseError(`verifyReferencesAtPositionListContains failed - item isWriteAccess value does not match, actual: ${reference.isWriteAccess}, expected: ${isWriteAccess}.`);
@@ -767,18 +710,16 @@ namespace FourSlash {
                 }
             }
 
-            let missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
+            const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
             this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(references)})`);
         }
 
         public verifyReferencesCountIs(count: number, localFilesOnly = true) {
-            this.taoInvalidReason = "verifyReferences NYI";
-
-            let references = this.getReferencesAtCaret();
+            const references = this.getReferencesAtCaret();
             let referencesCount = 0;
 
             if (localFilesOnly) {
-                let localFiles = this.testData.files.map<string>(file => file.fileName);
+                const localFiles = this.testData.files.map<string>(file => file.fileName);
                 // Count only the references in local files. Filter the ones in lib and other files.
                 ts.forEach(references, entry => {
                     if (localFiles.some((fileName) => fileName === entry.fileName)) {
@@ -791,7 +732,7 @@ namespace FourSlash {
             }
 
             if (referencesCount !== count) {
-                let condition = localFilesOnly ? "excluding libs" : "including libs";
+                const condition = localFilesOnly ? "excluding libs" : "including libs";
                 this.raiseError("Expected references count (" + condition + ") to be " + count + ", but is actually " + referencesCount);
             }
         }
@@ -817,32 +758,25 @@ namespace FourSlash {
         }
 
         public getSyntacticDiagnostics(expected: string) {
-            let diagnostics = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
+            const diagnostics = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
             this.testDiagnostics(expected, diagnostics);
         }
 
         public getSemanticDiagnostics(expected: string) {
-            let diagnostics = this.languageService.getSemanticDiagnostics(this.activeFile.fileName);
+            const diagnostics = this.languageService.getSemanticDiagnostics(this.activeFile.fileName);
             this.testDiagnostics(expected, diagnostics);
         }
 
         private testDiagnostics(expected: string, diagnostics: ts.Diagnostic[]) {
-            let realized = ts.realizeDiagnostics(diagnostics, "\r\n");
-            let actual = JSON.stringify(realized, null, "  ");
+            const realized = ts.realizeDiagnostics(diagnostics, "\r\n");
+            const actual = JSON.stringify(realized, null, "  ");
             assert.equal(actual, expected);
         }
 
         public verifyQuickInfoString(negative: boolean, expectedText?: string, expectedDocumentation?: string) {
-            [expectedText, expectedDocumentation].forEach(str => {
-                if (str) {
-                    this.scenarioActions.push("<ShowQuickInfo />");
-                    this.scenarioActions.push(`<VerifyQuickInfoTextContains IgnoreSpacing="true" Text="${escapeXmlAttributeValue(str)}" ${(negative ? "ExpectsFailure=\"true\" " : "")} />`);
-                }
-            });
-
-            let actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-            let actualQuickInfoText = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.displayParts) : "";
-            let actualQuickInfoDocumentation = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.documentation) : "";
+            const actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actualQuickInfoText = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.displayParts) : "";
+            const actualQuickInfoDocumentation = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.documentation) : "";
 
             if (negative) {
                 if (expectedText !== undefined) {
@@ -859,7 +793,7 @@ namespace FourSlash {
                 }
                 // TODO: should be '==='?
                 if (expectedDocumentation != undefined) {
-                    assert.equal(actualQuickInfoDocumentation, expectedDocumentation, assertionMessage("quick info doc"));
+                    assert.equal(actualQuickInfoDocumentation, expectedDocumentation, this.assertionMessageAtLastKnownMarker("quick info doc"));
                 }
             }
         }
@@ -867,8 +801,6 @@ namespace FourSlash {
         public verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { start: number; length: number; },
             displayParts: ts.SymbolDisplayPart[],
             documentation: ts.SymbolDisplayPart[]) {
-            this.scenarioActions.push("<ShowQuickInfo />");
-            this.scenarioActions.push(`<Verify return values of quickInfo="${JSON.stringify(displayParts)}"/>`);
 
             function getDisplayPartsJson(displayParts: ts.SymbolDisplayPart[]) {
                 let result = "";
@@ -888,7 +820,7 @@ namespace FourSlash {
                 return result;
             }
 
-            let actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             assert.equal(actualQuickInfo.kind, kind, this.messageAtLastKnownMarker("QuickInfo kind"));
             assert.equal(actualQuickInfo.kindModifiers, kindModifiers, this.messageAtLastKnownMarker("QuickInfo kindModifiers"));
             assert.equal(JSON.stringify(actualQuickInfo.textSpan), JSON.stringify(textSpan), this.messageAtLastKnownMarker("QuickInfo textSpan"));
@@ -897,7 +829,7 @@ namespace FourSlash {
         }
 
         public verifyRenameLocations(findInStrings: boolean, findInComments: boolean) {
-            let renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
+            const renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
             if (renameInfo.canRename) {
                 let references = this.languageService.findRenameLocations(
                     this.activeFile.fileName, this.currentCaretPosition, findInStrings, findInComments);
@@ -919,8 +851,8 @@ namespace FourSlash {
                 references = references.sort((r1, r2) => r1.textSpan.start - r2.textSpan.start);
 
                 for (let i = 0, n = ranges.length; i < n; i++) {
-                    let reference = references[i];
-                    let range = ranges[i];
+                    const reference = references[i];
+                    const range = ranges[i];
 
                     if (reference.textSpan.start !== range.start ||
                         ts.textSpanEnd(reference.textSpan) !== range.end) {
@@ -935,9 +867,7 @@ namespace FourSlash {
         }
 
         public verifyQuickInfoExists(negative: boolean) {
-            this.taoInvalidReason = "verifyQuickInfoExists NYI";
-
-            let actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (negative) {
                 if (actualQuickInfo) {
                     this.raiseError("verifyQuickInfoExists failed. Expected quick info NOT to exist");
@@ -951,9 +881,7 @@ namespace FourSlash {
         }
 
         public verifyCurrentSignatureHelpIs(expected: string) {
-            this.taoInvalidReason = "verifyCurrentSignatureHelpIs NYI";
-
-            let help = this.getActiveSignatureHelpItem();
+            const help = this.getActiveSignatureHelpItem();
             assert.equal(
                 ts.displayPartsToString(help.prefixDisplayParts) +
                 help.parameters.map(p => ts.displayPartsToString(p.displayParts)).join(ts.displayPartsToString(help.separatorDisplayParts)) +
@@ -961,76 +889,52 @@ namespace FourSlash {
         }
 
         public verifyCurrentParameterIsletiable(isVariable: boolean) {
-            this.taoInvalidReason = "verifyCurrentParameterIsletiable NYI";
-
-            let signature = this.getActiveSignatureHelpItem();
+            const signature = this.getActiveSignatureHelpItem();
             assert.isNotNull(signature);
             assert.equal(isVariable, signature.isVariadic);
         }
 
         public verifyCurrentParameterHelpName(name: string) {
-            this.taoInvalidReason = "verifyCurrentParameterHelpName NYI";
-
-            let activeParameter = this.getActiveParameter();
-            let activeParameterName = activeParameter.name;
+            const activeParameter = this.getActiveParameter();
+            const activeParameterName = activeParameter.name;
             assert.equal(activeParameterName, name);
         }
 
         public verifyCurrentParameterSpanIs(parameter: string) {
-            this.taoInvalidReason = "verifyCurrentParameterSpanIs NYI";
-
-            let activeSignature = this.getActiveSignatureHelpItem();
-            let activeParameter = this.getActiveParameter();
+            const activeSignature = this.getActiveSignatureHelpItem();
+            const activeParameter = this.getActiveParameter();
             assert.equal(ts.displayPartsToString(activeParameter.displayParts), parameter);
         }
 
         public verifyCurrentParameterHelpDocComment(docComment: string) {
-            this.taoInvalidReason = "verifyCurrentParameterHelpDocComment NYI";
-
-            let activeParameter = this.getActiveParameter();
-            let activeParameterDocComment = activeParameter.documentation;
-            assert.equal(ts.displayPartsToString(activeParameterDocComment), docComment, assertionMessage("current parameter Help DocComment"));
+            const activeParameter = this.getActiveParameter();
+            const activeParameterDocComment = activeParameter.documentation;
+            assert.equal(ts.displayPartsToString(activeParameterDocComment), docComment, this.assertionMessageAtLastKnownMarker("current parameter Help DocComment"));
         }
 
         public verifyCurrentSignatureHelpParameterCount(expectedCount: number) {
-            this.taoInvalidReason = "verifyCurrentSignatureHelpParameterCount NYI";
-
             assert.equal(this.getActiveSignatureHelpItem().parameters.length, expectedCount);
         }
 
-        public verifyCurrentSignatureHelpTypeParameterCount(expectedCount: number) {
-            this.taoInvalidReason = "verifyCurrentSignatureHelpTypeParameterCount NYI";
-
-            // assert.equal(this.getActiveSignatureHelpItem().typeParameters.length, expectedCount);
-        }
-
         public verifyCurrentSignatureHelpDocComment(docComment: string) {
-            this.taoInvalidReason = "verifyCurrentSignatureHelpDocComment NYI";
-
-            let actualDocComment = this.getActiveSignatureHelpItem().documentation;
-            assert.equal(ts.displayPartsToString(actualDocComment), docComment, assertionMessage("current signature help doc comment"));
+            const actualDocComment = this.getActiveSignatureHelpItem().documentation;
+            assert.equal(ts.displayPartsToString(actualDocComment), docComment, this.assertionMessageAtLastKnownMarker("current signature help doc comment"));
         }
 
         public verifySignatureHelpCount(expected: number) {
-            this.scenarioActions.push("<InvokeSignatureHelp />");
-            this.scenarioActions.push(`<VerifySignatureHelpOverloadCountEquals Count="${expected}" />`);
-
-            let help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
-            let actual = help && help.items ? help.items.length : 0;
+            const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
+            const actual = help && help.items ? help.items.length : 0;
             assert.equal(actual, expected);
         }
 
         public verifySignatureHelpArgumentCount(expected: number) {
-            this.taoInvalidReason = "verifySignatureHelpArgumentCount NYI";
-            let signatureHelpItems = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
-            let actual = signatureHelpItems.argumentCount;
+            const signatureHelpItems = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
+            const actual = signatureHelpItems.argumentCount;
             assert.equal(actual, expected);
         }
 
         public verifySignatureHelpPresent(shouldBePresent = true) {
-            this.taoInvalidReason = "verifySignatureHelpPresent NYI";
-
-            let actual = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
+            const actual = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
             if (shouldBePresent) {
                 if (!actual) {
                     this.raiseError("Expected signature help to be present, but it wasn't");
@@ -1050,7 +954,7 @@ namespace FourSlash {
         }
 
         public verifyRenameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) {
-            let renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
+            const renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
             if (!renameInfo.canRename) {
                 this.raiseError("Rename did not succeed");
             }
@@ -1064,7 +968,7 @@ namespace FourSlash {
                 this.raiseError("Expected a single range to be selected in the test file.");
             }
 
-            let expectedRange = this.getRanges()[0];
+            const expectedRange = this.getRanges()[0];
             if (renameInfo.triggerSpan.start !== expectedRange.start ||
                 ts.textSpanEnd(renameInfo.triggerSpan) !== expectedRange.end) {
                 this.raiseError("Expected triggerSpan [" + expectedRange.start + "," + expectedRange.end + ").  Got [" +
@@ -1073,7 +977,7 @@ namespace FourSlash {
         }
 
         public verifyRenameInfoFailed(message?: string) {
-            let renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
+            const renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
             if (renameInfo.canRename) {
                 this.raiseError("Rename was expected to fail");
             }
@@ -1082,15 +986,15 @@ namespace FourSlash {
         }
 
         private getActiveSignatureHelpItem() {
-            let help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
-            let index = help.selectedItemIndex;
+            const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
+            const index = help.selectedItemIndex;
             return help.items[index];
         }
 
         private getActiveParameter(): ts.SignatureHelpParameter {
-            let help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
-            let item = help.items[help.selectedItemIndex];
-            let currentParam = help.argumentIndex;
+            const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
+            const item = help.items[help.selectedItemIndex];
+            const currentParam = help.argumentIndex;
             return item.parameters[currentParam];
         }
 
@@ -1099,8 +1003,8 @@ namespace FourSlash {
         private spanInfoToString(pos: number, spanInfo: ts.TextSpan, prefixString: string) {
             let resultString = "SpanInfo: " + JSON.stringify(spanInfo);
             if (spanInfo) {
-                let spanString = this.activeFile.content.substr(spanInfo.start, spanInfo.length);
-                let spanLineMap = ts.computeLineStarts(spanString);
+                const spanString = this.activeFile.content.substr(spanInfo.start, spanInfo.length);
+                const spanLineMap = ts.computeLineStarts(spanString);
                 for (let i = 0; i < spanLineMap.length; i++) {
                     if (!i) {
                         resultString += "\n";
@@ -1114,17 +1018,17 @@ namespace FourSlash {
         }
 
         private baselineCurrentFileLocations(getSpanAtPos: (pos: number) => ts.TextSpan): string {
-            let fileLineMap = ts.computeLineStarts(this.activeFile.content);
+            const fileLineMap = ts.computeLineStarts(this.activeFile.content);
             let nextLine = 0;
             let resultString = "";
             let currentLine: string;
             let previousSpanInfo: string;
             let startColumn: number;
             let length: number;
-            let prefixString = "    >";
+            const prefixString = "    >";
 
             let pos = 0;
-            let addSpanInfoString = () => {
+            const addSpanInfoString = () => {
                 if (previousSpanInfo) {
                     resultString += currentLine;
                     let thisLineMarker = repeatString(startColumn, " ") + repeatString(length, "~");
@@ -1147,7 +1051,7 @@ namespace FourSlash {
                     startColumn = 0;
                     length = 0;
                 }
-                let spanInfo = this.spanInfoToString(pos, getSpanAtPos(pos), prefixString);
+                const spanInfo = this.spanInfoToString(pos, getSpanAtPos(pos), prefixString);
                 if (previousSpanInfo && previousSpanInfo !== spanInfo) {
                     addSpanInfoString();
                     previousSpanInfo = spanInfo;
@@ -1172,13 +1076,10 @@ namespace FourSlash {
         }
 
         public getBreakpointStatementLocation(pos: number) {
-            this.taoInvalidReason = "getBreakpointStatementLocation NYI";
             return this.languageService.getBreakpointStatementAtPosition(this.activeFile.fileName, pos);
         }
 
         public baselineCurrentFileBreakpointLocations() {
-            this.taoInvalidReason = "baselineCurrentFileBreakpointLocations impossible";
-
             Harness.Baseline.runBaseline(
                 "Breakpoint Locations for " + this.activeFile.fileName,
                 this.testData.globalOptions[metadataOptionNames.baselineFile],
@@ -1189,13 +1090,12 @@ namespace FourSlash {
         }
 
         public baselineGetEmitOutput() {
-            this.taoInvalidReason = "baselineGetEmitOutput impossible";
             // Find file to be emitted
-            let emitFiles: FourSlashFile[] = [];  // List of FourSlashFile that has emitThisFile flag on
+            const emitFiles: FourSlashFile[] = [];  // List of FourSlashFile that has emitThisFile flag on
 
-            let allFourSlashFiles = this.testData.files;
+            const allFourSlashFiles = this.testData.files;
             for (let idx = 0; idx < allFourSlashFiles.length; ++idx) {
-                let file = allFourSlashFiles[idx];
+                const file = allFourSlashFiles[idx];
                 if (file.fileOptions[metadataOptionNames.emitThisFile] === "true") {
                     // Find a file with the flag emitThisFile turned on
                     emitFiles.push(file);
@@ -1214,20 +1114,20 @@ namespace FourSlash {
                     let resultString = "";
                     // Loop through all the emittedFiles and emit them one by one
                     emitFiles.forEach(emitFile => {
-                        let emitOutput = this.languageService.getEmitOutput(emitFile.fileName);
+                        const emitOutput = this.languageService.getEmitOutput(emitFile.fileName);
                         // Print emitOutputStatus in readable format
                         resultString += "EmitSkipped: " + emitOutput.emitSkipped + Harness.IO.newLine();
 
                         if (emitOutput.emitSkipped) {
                             resultString += "Diagnostics:" + Harness.IO.newLine();
-                            let diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
+                            const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
                             for (let i = 0, n = diagnostics.length; i < n; i++) {
                                 resultString += "  " + diagnostics[0].messageText + Harness.IO.newLine();
                             }
                         }
 
                         emitOutput.outputFiles.forEach((outputFile, idx, array) => {
-                            let fileName = "FileName : " + outputFile.name + Harness.IO.newLine();
+                            const fileName = "FileName : " + outputFile.name + Harness.IO.newLine();
                             resultString = resultString + fileName + outputFile.text;
                         });
                         resultString += Harness.IO.newLine();
@@ -1247,19 +1147,19 @@ namespace FourSlash {
         }
 
         public printCurrentParameterHelp() {
-            let help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
+            const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
             Harness.IO.log(JSON.stringify(help));
         }
 
         public printCurrentQuickInfo() {
-            let quickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const quickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             Harness.IO.log(JSON.stringify(quickInfo));
         }
 
         public printErrorList() {
-            let syntacticErrors = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
-            let semanticErrors = this.languageService.getSemanticDiagnostics(this.activeFile.fileName);
-            let errorList = syntacticErrors.concat(semanticErrors);
+            const syntacticErrors = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
+            const semanticErrors = this.languageService.getSemanticDiagnostics(this.activeFile.fileName);
+            const errorList = syntacticErrors.concat(semanticErrors);
             Harness.IO.log(`Error list (${errorList.length} errors)`);
 
             if (errorList.length) {
@@ -1274,8 +1174,8 @@ namespace FourSlash {
 
         public printCurrentFileState(makeWhitespaceVisible = false, makeCaretVisible = true) {
             for (let i = 0; i < this.testData.files.length; i++) {
-                let file = this.testData.files[i];
-                let active = (this.activeFile === file);
+                const file = this.testData.files[i];
+                const active = (this.activeFile === file);
                 Harness.IO.log(`=== Script (${file.fileName}) ${(active ? "(active, cursor at |)" : "")} ===`);
                 let content = this.getFileContent(file.fileName);
                 if (active) {
@@ -1289,22 +1189,22 @@ namespace FourSlash {
         }
 
         public printCurrentSignatureHelp() {
-            let sigHelp = this.getActiveSignatureHelpItem();
+            const sigHelp = this.getActiveSignatureHelpItem();
             Harness.IO.log(JSON.stringify(sigHelp));
         }
 
         public printMemberListMembers() {
-            let members = this.getMemberListAtCaret();
+            const members = this.getMemberListAtCaret();
             Harness.IO.log(JSON.stringify(members));
         }
 
         public printCompletionListMembers() {
-            let completions = this.getCompletionListAtCaret();
+            const completions = this.getCompletionListAtCaret();
             Harness.IO.log(JSON.stringify(completions));
         }
 
         public printReferences() {
-            let references = this.getReferencesAtCaret();
+            const references = this.getReferencesAtCaret();
             ts.forEach(references, entry => {
                 Harness.IO.log(JSON.stringify(entry));
             });
@@ -1315,12 +1215,10 @@ namespace FourSlash {
         }
 
         public deleteChar(count = 1) {
-            this.scenarioActions.push(`<DeleteCharNext Count="${count}" />`);
-
             let offset = this.currentCaretPosition;
-            let ch = "";
+            const ch = "";
 
-            let checkCadence = (count >> 2) + 1;
+            const checkCadence = (count >> 2) + 1;
 
             for (let i = 0; i < count; i++) {
                 // Make the edit
@@ -1328,14 +1226,14 @@ namespace FourSlash {
                 this.updateMarkersForEdit(this.activeFile.fileName, offset, offset + 1, ch);
 
                 if (i % checkCadence === 0) {
-                    this.checkPostEditInletiants();
+                    this.checkPostEditInvariants();
                 }
 
                 // Handle post-keystroke formatting
                 if (this.enableFormatting) {
-                    let edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
+                    const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
                     if (edits.length) {
-                        offset += this.applyEdits(this.activeFile.fileName, edits, true);
+                        offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
                         // this.checkPostEditInletiants();
                     }
                 }
@@ -1345,23 +1243,19 @@ namespace FourSlash {
             this.currentCaretPosition = offset;
 
             this.fixCaretPosition();
-            this.checkPostEditInletiants();
+            this.checkPostEditInvariants();
         }
 
         public replace(start: number, length: number, text: string) {
-            this.taoInvalidReason = "replace NYI";
-
             this.languageServiceAdapterHost.editScript(this.activeFile.fileName, start, start + length, text);
             this.updateMarkersForEdit(this.activeFile.fileName, start, start + length, text);
-            this.checkPostEditInletiants();
+            this.checkPostEditInvariants();
         }
 
         public deleteCharBehindMarker(count = 1) {
-            this.scenarioActions.push(`<DeleteCharPrevious Count="${count}" />`);
-
             let offset = this.currentCaretPosition;
-            let ch = "";
-            let checkCadence = (count >> 2) + 1;
+            const ch = "";
+            const checkCadence = (count >> 2) + 1;
 
             for (let i = 0; i < count; i++) {
                 offset--;
@@ -1370,14 +1264,14 @@ namespace FourSlash {
                 this.updateMarkersForEdit(this.activeFile.fileName, offset, offset + 1, ch);
 
                 if (i % checkCadence === 0) {
-                    this.checkPostEditInletiants();
+                    this.checkPostEditInvariants();
                 }
 
                 // Handle post-keystroke formatting
                 if (this.enableFormatting) {
-                    let edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
+                    const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
                     if (edits.length) {
-                        offset += this.applyEdits(this.activeFile.fileName, edits, true);
+                        offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
                     }
                 }
             }
@@ -1386,18 +1280,11 @@ namespace FourSlash {
             this.currentCaretPosition = offset;
 
             this.fixCaretPosition();
-            this.checkPostEditInletiants();
+            this.checkPostEditInvariants();
         }
 
         // Enters lines of text at the current caret position
         public type(text: string) {
-            if (text === "") {
-                this.taoInvalidReason = "Test used empty-insert workaround.";
-            }
-            else {
-                this.scenarioActions.push(`<InsertText><![CDATA[${text}]]></InsertText>`);
-            }
-
             return this.typeHighFidelity(text);
         }
 
@@ -1406,12 +1293,12 @@ namespace FourSlash {
         // as much as possible
         private typeHighFidelity(text: string) {
             let offset = this.currentCaretPosition;
-            let prevChar = " ";
-            let checkCadence = (text.length >> 2) + 1;
+            const prevChar = " ";
+            const checkCadence = (text.length >> 2) + 1;
 
             for (let i = 0; i < text.length; i++) {
                 // Make the edit
-                let ch = text.charAt(i);
+                const ch = text.charAt(i);
                 this.languageServiceAdapterHost.editScript(this.activeFile.fileName, offset, offset, ch);
                 this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, offset);
 
@@ -1428,16 +1315,16 @@ namespace FourSlash {
                 }
 
                 if (i % checkCadence === 0) {
-                    this.checkPostEditInletiants();
+                    this.checkPostEditInvariants();
                     // this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
                     // this.languageService.getSemanticDiagnostics(this.activeFile.fileName);
                 }
 
                 // Handle post-keystroke formatting
                 if (this.enableFormatting) {
-                    let edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
+                    const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
                     if (edits.length) {
-                        offset += this.applyEdits(this.activeFile.fileName, edits, true);
+                        offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
                         // this.checkPostEditInletiants();
                     }
                 }
@@ -1447,26 +1334,24 @@ namespace FourSlash {
             this.currentCaretPosition = offset;
 
             this.fixCaretPosition();
-            this.checkPostEditInletiants();
+            this.checkPostEditInvariants();
         }
 
         // Enters text as if the user had pasted it
         public paste(text: string) {
-            this.scenarioActions.push(`<InsertText><![CDATA[${text}]]></InsertText>`);
-
-            let start = this.currentCaretPosition;
+            const start = this.currentCaretPosition;
             let offset = this.currentCaretPosition;
             this.languageServiceAdapterHost.editScript(this.activeFile.fileName, offset, offset, text);
             this.updateMarkersForEdit(this.activeFile.fileName, offset, offset, text);
-            this.checkPostEditInletiants();
+            this.checkPostEditInvariants();
             offset += text.length;
 
             // Handle formatting
             if (this.enableFormatting) {
-                let edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, offset, this.formatCodeOptions);
+                const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, offset, this.formatCodeOptions);
                 if (edits.length) {
-                    offset += this.applyEdits(this.activeFile.fileName, edits, true);
-                    this.checkPostEditInletiants();
+                    offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+                    this.checkPostEditInvariants();
                 }
             }
 
@@ -1474,27 +1359,27 @@ namespace FourSlash {
             this.currentCaretPosition = offset;
             this.fixCaretPosition();
 
-            this.checkPostEditInletiants();
+            this.checkPostEditInvariants();
         }
 
-        private checkPostEditInletiants() {
+        private checkPostEditInvariants() {
             if (this.testType !== FourSlashTestType.Native) {
                 // getSourcefile() results can not be serialized. Only perform these verifications
                 // if running against a native LS object.
                 return;
             }
 
-            let incrementalSourceFile = this.languageService.getSourceFile(this.activeFile.fileName);
+            const incrementalSourceFile = this.languageService.getSourceFile(this.activeFile.fileName);
             Utils.assertInvariants(incrementalSourceFile, /*parent:*/ undefined);
 
-            let incrementalSyntaxDiagnostics = incrementalSourceFile.parseDiagnostics;
+            const incrementalSyntaxDiagnostics = incrementalSourceFile.parseDiagnostics;
 
             // Check syntactic structure
-            let content = this.getFileContent(this.activeFile.fileName);
+            const content = this.getFileContent(this.activeFile.fileName);
 
-            let referenceSourceFile = ts.createLanguageServiceSourceFile(
+            const referenceSourceFile = ts.createLanguageServiceSourceFile(
                 this.activeFile.fileName, createScriptSnapShot(content), ts.ScriptTarget.Latest, /*version:*/ "0", /*setNodeParents:*/ false);
-            let referenceSyntaxDiagnostics = referenceSourceFile.parseDiagnostics;
+            const referenceSyntaxDiagnostics = referenceSourceFile.parseDiagnostics;
 
             Utils.assertDiagnosticsEquals(incrementalSyntaxDiagnostics, referenceSyntaxDiagnostics);
             Utils.assertStructuralEquals(incrementalSourceFile, referenceSourceFile);
@@ -1504,7 +1389,7 @@ namespace FourSlash {
             // The caret can potentially end up between the \r and \n, which is confusing. If
             // that happens, move it back one character
             if (this.currentCaretPosition > 0) {
-                let ch = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition - 1, this.currentCaretPosition);
+                const ch = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition - 1, this.currentCaretPosition);
                 if (ch === "\r") {
                     this.currentCaretPosition--;
                 }
@@ -1517,18 +1402,18 @@ namespace FourSlash {
             let runningOffset = 0;
             edits = edits.sort((a, b) => a.span.start - b.span.start);
             // Get a snapshot of the content of the file so we can make sure any formatting edits didn't destroy non-whitespace characters
-            let oldContent = this.getFileContent(this.activeFile.fileName);
+            const oldContent = this.getFileContent(this.activeFile.fileName);
             for (let j = 0; j < edits.length; j++) {
                 this.languageServiceAdapterHost.editScript(fileName, edits[j].span.start + runningOffset, ts.textSpanEnd(edits[j].span) + runningOffset, edits[j].newText);
                 this.updateMarkersForEdit(fileName, edits[j].span.start + runningOffset, ts.textSpanEnd(edits[j].span) + runningOffset, edits[j].newText);
-                let change = (edits[j].span.start - ts.textSpanEnd(edits[j].span)) + edits[j].newText.length;
+                const change = (edits[j].span.start - ts.textSpanEnd(edits[j].span)) + edits[j].newText.length;
                 runningOffset += change;
                 // TODO: Consider doing this at least some of the time for higher fidelity. Currently causes a failure (bug 707150)
                 // this.languageService.getScriptLexicalStructure(fileName);
             }
 
             if (isFormattingEdit) {
-                let newContent = this.getFileContent(fileName);
+                const newContent = this.getFileContent(fileName);
 
                 if (newContent.replace(/\s/g, "") !== oldContent.replace(/\s/g, "")) {
                     this.raiseError("Formatting operation destroyed non-whitespace content");
@@ -1542,30 +1427,26 @@ namespace FourSlash {
         }
 
         public setFormatOptions(formatCodeOptions: ts.FormatCodeOptions): ts.FormatCodeOptions {
-            let oldFormatCodeOptions = this.formatCodeOptions;
+            const oldFormatCodeOptions = this.formatCodeOptions;
             this.formatCodeOptions = formatCodeOptions;
             return oldFormatCodeOptions;
         }
 
         public formatDocument() {
-            this.scenarioActions.push("<FormatDocument />");
-
-            let edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeOptions);
-            this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, true);
+            const edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeOptions);
+            this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
             this.fixCaretPosition();
         }
 
         public formatSelection(start: number, end: number) {
-            this.taoInvalidReason = "formatSelection NYI";
-
-            let edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeOptions);
-            this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, true);
+            const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeOptions);
+            this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
             this.fixCaretPosition();
         }
 
         private updateMarkersForEdit(fileName: string, minChar: number, limChar: number, text: string) {
             for (let i = 0; i < this.testData.markers.length; i++) {
-                let marker = this.testData.markers[i];
+                const marker = this.testData.markers[i];
                 if (marker.fileName === fileName) {
                     if (marker.position > minChar) {
                         if (marker.position < limChar) {
@@ -1586,19 +1467,12 @@ namespace FourSlash {
         }
 
         public goToEOF() {
-            let len = this.getFileContent(this.activeFile.fileName).length;
+            const len = this.getFileContent(this.activeFile.fileName).length;
             this.goToPosition(len);
         }
 
         public goToDefinition(definitionIndex: number) {
-            if (definitionIndex === 0) {
-                this.scenarioActions.push("<GoToDefinition />");
-            }
-            else {
-                this.taoInvalidReason = "GoToDefinition not supported for non-zero definition indices";
-            }
-
-            let definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!definitions || !definitions.length) {
                 this.raiseError("goToDefinition failed - expected to at least one definition location but got 0");
             }
@@ -1607,20 +1481,13 @@ namespace FourSlash {
                 this.raiseError(`goToDefinition failed - definitionIndex value (${definitionIndex}) exceeds definition list size (${definitions.length})`);
             }
 
-            let definition = definitions[definitionIndex];
+            const definition = definitions[definitionIndex];
             this.openFile(definition.fileName);
             this.currentCaretPosition = definition.textSpan.start;
         }
 
         public goToTypeDefinition(definitionIndex: number) {
-            if (definitionIndex === 0) {
-                this.scenarioActions.push("<GoToTypeDefinition />");
-            }
-            else {
-                this.taoInvalidReason = "GoToTypeDefinition not supported for non-zero definition indices";
-            }
-
-            let definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!definitions || !definitions.length) {
                 this.raiseError("goToTypeDefinition failed - expected to at least one definition location but got 0");
             }
@@ -1629,17 +1496,15 @@ namespace FourSlash {
                 this.raiseError(`goToTypeDefinition failed - definitionIndex value (${definitionIndex}) exceeds definition list size (${definitions.length})`);
             }
 
-            let definition = definitions[definitionIndex];
+            const definition = definitions[definitionIndex];
             this.openFile(definition.fileName);
             this.currentCaretPosition = definition.textSpan.start;
         }
 
         public verifyDefinitionLocationExists(negative: boolean) {
-            this.taoInvalidReason = "verifyDefinitionLocationExists NYI";
+            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
 
-            let definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-
-            let foundDefinitions = definitions && definitions.length;
+            const foundDefinitions = definitions && definitions.length;
 
             if (foundDefinitions && negative) {
                 this.raiseError(`goToDefinition - expected to 0 definition locations but got ${definitions.length}`);
@@ -1650,29 +1515,27 @@ namespace FourSlash {
         }
 
         public verifyDefinitionsCount(negative: boolean, expectedCount: number) {
-            let assertFn = negative ? assert.notEqual : assert.equal;
+            const assertFn = negative ? assert.notEqual : assert.equal;
 
-            let definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-            let actualCount = definitions && definitions.length || 0;
+            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actualCount = definitions && definitions.length || 0;
 
             assertFn(actualCount, expectedCount, this.messageAtLastKnownMarker("Definitions Count"));
         }
 
         public verifyTypeDefinitionsCount(negative: boolean, expectedCount: number) {
-            let assertFn = negative ? assert.notEqual : assert.equal;
+            const assertFn = negative ? assert.notEqual : assert.equal;
 
-            let definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-            let actualCount = definitions && definitions.length || 0;
+            const definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actualCount = definitions && definitions.length || 0;
 
             assertFn(actualCount, expectedCount, this.messageAtLastKnownMarker("Type definitions Count"));
         }
 
         public verifyDefinitionsName(negative: boolean, expectedName: string, expectedContainerName: string) {
-            this.taoInvalidReason = "verifyDefinititionsInfo NYI";
-
-            let definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-            let actualDefinitionName = definitions && definitions.length ? definitions[0].name : "";
-            let actualDefinitionContainerName = definitions && definitions.length ? definitions[0].containerName : "";
+            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actualDefinitionName = definitions && definitions.length ? definitions[0].name : "";
+            const actualDefinitionContainerName = definitions && definitions.length ? definitions[0].containerName : "";
             if (negative) {
                 assert.notEqual(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
                 assert.notEqual(actualDefinitionContainerName, expectedContainerName, this.messageAtLastKnownMarker("Definition Info Container Name"));
@@ -1694,9 +1557,7 @@ namespace FourSlash {
         }
 
         public verifyCaretAtMarker(markerName = "") {
-            this.taoInvalidReason = "verifyCaretAtMarker NYI";
-
-            let pos = this.getMarkerByName(markerName);
+            const pos = this.getMarkerByName(markerName);
             if (pos.fileName !== this.activeFile.fileName) {
                 throw new Error(`verifyCaretAtMarker failed - expected to be in file "${pos.fileName}", but was in file "${this.activeFile.fileName}"`);
             }
@@ -1707,36 +1568,30 @@ namespace FourSlash {
 
         private getIndentation(fileName: string, position: number, indentStyle: ts.IndentStyle): number {
 
-            let formatOptions = ts.clone(this.formatCodeOptions);
+            const formatOptions = ts.clone(this.formatCodeOptions);
             formatOptions.IndentStyle = indentStyle;
 
             return this.languageService.getIndentationAtPosition(fileName, position, formatOptions);
         }
 
         public verifyIndentationAtCurrentPosition(numberOfSpaces: number, indentStyle: ts.IndentStyle = ts.IndentStyle.Smart) {
-            this.taoInvalidReason = "verifyIndentationAtCurrentPosition NYI";
-
-            let actual = this.getIndentation(this.activeFile.fileName, this.currentCaretPosition, indentStyle);
-            let lineCol = this.getLineColStringAtPosition(this.currentCaretPosition);
+            const actual = this.getIndentation(this.activeFile.fileName, this.currentCaretPosition, indentStyle);
+            const lineCol = this.getLineColStringAtPosition(this.currentCaretPosition);
             if (actual !== numberOfSpaces) {
                 this.raiseError(`verifyIndentationAtCurrentPosition failed at ${lineCol} - expected: ${numberOfSpaces}, actual: ${actual}`);
             }
         }
 
         public verifyIndentationAtPosition(fileName: string, position: number, numberOfSpaces: number, indentStyle: ts.IndentStyle = ts.IndentStyle.Smart) {
-            this.taoInvalidReason = "verifyIndentationAtPosition NYI";
-
-            let actual = this.getIndentation(fileName, position, indentStyle);
-            let lineCol = this.getLineColStringAtPosition(position);
+            const actual = this.getIndentation(fileName, position, indentStyle);
+            const lineCol = this.getLineColStringAtPosition(position);
             if (actual !== numberOfSpaces) {
                 this.raiseError(`verifyIndentationAtPosition failed at ${lineCol} - expected: ${numberOfSpaces}, actual: ${actual}`);
             }
         }
 
         public verifyCurrentLineContent(text: string) {
-            this.taoInvalidReason = "verifyCurrentLineContent NYI";
-
-            let actual = this.getCurrentLineContent();
+            const actual = this.getCurrentLineContent();
             if (actual !== text) {
                 throw new Error("verifyCurrentLineContent\n" +
                     "\tExpected: \"" + text + "\"\n" +
@@ -1745,10 +1600,8 @@ namespace FourSlash {
         }
 
         public verifyCurrentFileContent(text: string) {
-            this.taoInvalidReason = "verifyCurrentFileContent NYI";
-
-            let actual = this.getFileContent(this.activeFile.fileName);
-            let replaceNewlines = (str: string) => str.replace(/\r\n/g, "\n");
+            const actual = this.getFileContent(this.activeFile.fileName);
+            const replaceNewlines = (str: string) => str.replace(/\r\n/g, "\n");
             if (replaceNewlines(actual) !== replaceNewlines(text)) {
                 throw new Error("verifyCurrentFileContent\n" +
                     "\tExpected: \"" + text + "\"\n" +
@@ -1757,9 +1610,7 @@ namespace FourSlash {
         }
 
         public verifyTextAtCaretIs(text: string) {
-            this.taoInvalidReason = "verifyCurrentFileContent NYI";
-
-            let actual = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition, this.currentCaretPosition + text.length);
+            const actual = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition, this.currentCaretPosition + text.length);
             if (actual !== text) {
                 throw new Error("verifyTextAtCaretIs\n" +
                     "\tExpected: \"" + text + "\"\n" +
@@ -1768,16 +1619,14 @@ namespace FourSlash {
         }
 
         public verifyCurrentNameOrDottedNameSpanText(text: string) {
-            this.taoInvalidReason = "verifyCurrentNameOrDottedNameSpanText NYI";
-
-            let span = this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, this.currentCaretPosition, this.currentCaretPosition);
+            const span = this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, this.currentCaretPosition, this.currentCaretPosition);
             if (!span) {
                 this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" +
                     "\tExpected: \"" + text + "\"\n" +
                     "\t  Actual: undefined");
             }
 
-            let actual = this.getFileContent(this.activeFile.fileName).substring(span.start, ts.textSpanEnd(span));
+            const actual = this.getFileContent(this.activeFile.fileName).substring(span.start, ts.textSpanEnd(span));
             if (actual !== text) {
                 this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" +
                     "\tExpected: \"" + text + "\"\n" +
@@ -1786,13 +1635,10 @@ namespace FourSlash {
         }
 
         private getNameOrDottedNameSpan(pos: number) {
-            this.taoInvalidReason = "getNameOrDottedNameSpan NYI";
             return this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, pos, pos);
         }
 
         public baselineCurrentFileNameOrDottedNameSpans() {
-            this.taoInvalidReason = "baselineCurrentFileNameOrDottedNameSpans impossible";
-
             Harness.Baseline.runBaseline(
                 "Name OrDottedNameSpans for " + this.activeFile.fileName,
                 this.testData.globalOptions[metadataOptionNames.baselineFile],
@@ -1815,10 +1661,10 @@ namespace FourSlash {
             }
 
             for (let i = 0; i < expected.length; i++) {
-                let expectedClassification = expected[i];
-                let actualClassification = actual[i];
+                const expectedClassification = expected[i];
+                const actualClassification = actual[i];
 
-                let expectedType: string = (<any>ts.ClassificationTypeNames)[expectedClassification.classificationType];
+                const expectedType: string = (<any>ts.ClassificationTypeNames)[expectedClassification.classificationType];
                 if (expectedType !== actualClassification.classificationType) {
                     this.raiseError("verifyClassifications failed - expected classifications type to be " +
                         expectedType + ", but was " +
@@ -1826,11 +1672,11 @@ namespace FourSlash {
                         jsonMismatchString());
                 }
 
-                let expectedSpan = expectedClassification.textSpan;
-                let actualSpan = actualClassification.textSpan;
+                const expectedSpan = expectedClassification.textSpan;
+                const actualSpan = actualClassification.textSpan;
 
                 if (expectedSpan) {
-                    let expectedLength = expectedSpan.end - expectedSpan.start;
+                    const expectedLength = expectedSpan.end - expectedSpan.start;
 
                     if (expectedSpan.start !== actualSpan.start || expectedLength !== actualSpan.length) {
                         this.raiseError("verifyClassifications failed - expected span of text to be " +
@@ -1840,7 +1686,7 @@ namespace FourSlash {
                     }
                 }
 
-                let actualText = this.activeFile.content.substr(actualSpan.start, actualSpan.length);
+                const actualText = this.activeFile.content.substr(actualSpan.start, actualSpan.length);
                 if (expectedClassification.text !== actualText) {
                     this.raiseError("verifyClassifications failed - expected classified text to be " +
                         expectedClassification.text + ", but was " +
@@ -1858,7 +1704,7 @@ namespace FourSlash {
 
         public verifyProjectInfo(expected: string[]) {
             if (this.testType === FourSlashTestType.Server) {
-                let actual = (<ts.server.SessionClient>this.languageService).getProjectInfo(
+                const actual = (<ts.server.SessionClient>this.languageService).getProjectInfo(
                     this.activeFile.fileName,
                     /* needFileNameList */ true
                     );
@@ -1872,31 +1718,29 @@ namespace FourSlash {
         }
 
         public verifySemanticClassifications(expected: { classificationType: string; text: string }[]) {
-            let actual = this.languageService.getSemanticClassifications(this.activeFile.fileName,
+            const actual = this.languageService.getSemanticClassifications(this.activeFile.fileName,
                 ts.createTextSpan(0, this.activeFile.content.length));
 
             this.verifyClassifications(expected, actual);
         }
 
         public verifySyntacticClassifications(expected: { classificationType: string; text: string }[]) {
-            let actual = this.languageService.getSyntacticClassifications(this.activeFile.fileName,
+            const actual = this.languageService.getSyntacticClassifications(this.activeFile.fileName,
                 ts.createTextSpan(0, this.activeFile.content.length));
 
             this.verifyClassifications(expected, actual);
         }
 
         public verifyOutliningSpans(spans: TextSpan[]) {
-            this.taoInvalidReason = "verifyOutliningSpans NYI";
-
-            let actual = this.languageService.getOutliningSpans(this.activeFile.fileName);
+            const actual = this.languageService.getOutliningSpans(this.activeFile.fileName);
 
             if (actual.length !== spans.length) {
                 this.raiseError(`verifyOutliningSpans failed - expected total spans to be ${spans.length}, but was ${actual.length}`);
             }
 
             for (let i = 0; i < spans.length; i++) {
-                let expectedSpan = spans[i];
-                let actualSpan = actual[i];
+                const expectedSpan = spans[i];
+                const actualSpan = actual[i];
                 if (expectedSpan.start !== actualSpan.textSpan.start || expectedSpan.end !== ts.textSpanEnd(actualSpan.textSpan)) {
                     this.raiseError(`verifyOutliningSpans failed - span ${(i + 1)} expected: (${expectedSpan.start},${expectedSpan.end}),  actual: (${actualSpan.textSpan.start},${ts.textSpanEnd(actualSpan.textSpan)})`);
                 }
@@ -1904,7 +1748,7 @@ namespace FourSlash {
         }
 
         public verifyTodoComments(descriptors: string[], spans: TextSpan[]) {
-            let actual = this.languageService.getTodoComments(this.activeFile.fileName,
+            const actual = this.languageService.getTodoComments(this.activeFile.fileName,
                 descriptors.map(d => { return { text: d, priority: 0 }; }));
 
             if (actual.length !== spans.length) {
@@ -1912,9 +1756,9 @@ namespace FourSlash {
             }
 
             for (let i = 0; i < spans.length; i++) {
-                let expectedSpan = spans[i];
-                let actualComment = actual[i];
-                let actualCommentSpan = ts.createTextSpan(actualComment.position, actualComment.message.length);
+                const expectedSpan = spans[i];
+                const actualComment = actual[i];
+                const actualCommentSpan = ts.createTextSpan(actualComment.position, actualComment.message.length);
 
                 if (expectedSpan.start !== actualCommentSpan.start || expectedSpan.end !== ts.textSpanEnd(actualCommentSpan)) {
                     this.raiseError(`verifyOutliningSpans failed - span ${(i + 1)} expected: (${expectedSpan.start},${expectedSpan.end}),  actual: (${actualCommentSpan.start},${ts.textSpanEnd(actualCommentSpan)})`);
@@ -1924,7 +1768,7 @@ namespace FourSlash {
 
         public verifyDocCommentTemplate(expected?: ts.TextInsertion) {
             const name = "verifyDocCommentTemplate";
-            let actual = this.languageService.getDocCommentTemplateAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            const actual = this.languageService.getDocCommentTemplateAtPosition(this.activeFile.fileName, this.currentCaretPosition);
 
             if (expected === undefined) {
                 if (actual) {
@@ -1956,9 +1800,7 @@ namespace FourSlash {
         }
 
         public verifyMatchingBracePosition(bracePosition: number, expectedMatchPosition: number) {
-            this.taoInvalidReason = "verifyMatchingBracePosition NYI";
-
-            let actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition);
+            const actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition);
 
             if (actual.length !== 2) {
                 this.raiseError(`verifyMatchingBracePosition failed - expected result to contain 2 spans, but it had ${actual.length}`);
@@ -1981,9 +1823,7 @@ namespace FourSlash {
         }
 
         public verifyNoMatchingBracePosition(bracePosition: number) {
-            this.taoInvalidReason = "verifyNoMatchingBracePosition NYI";
-
-            let actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition);
+            const actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition);
 
             if (actual.length !== 0) {
                 this.raiseError("verifyNoMatchingBracePosition failed - expected: 0 spans, actual: " + actual.length);
@@ -1995,9 +1835,7 @@ namespace FourSlash {
             Report an error if expected value and actual value do not match.
         */
         public verifyNavigationItemsCount(expected: number, searchValue: string, matchKind?: string) {
-            this.taoInvalidReason = "verifyNavigationItemsCount NYI";
-
-            let items = this.languageService.getNavigateToItems(searchValue);
+            const items = this.languageService.getNavigateToItems(searchValue);
             let actual = 0;
             let item: ts.NavigateToItem = null;
 
@@ -2025,16 +1863,14 @@ namespace FourSlash {
             matchKind: string,
             fileName?: string,
             parentName?: string) {
-            this.taoInvalidReason = "verifyNavigationItemsListContains NYI";
-
-            let items = this.languageService.getNavigateToItems(searchValue);
+            const items = this.languageService.getNavigateToItems(searchValue);
 
             if (!items || items.length === 0) {
                 this.raiseError("verifyNavigationItemsListContains failed - found 0 navigation items, expected at least one.");
             }
 
             for (let i = 0; i < items.length; i++) {
-                let item = items[i];
+                const item = items[i];
                 if (item && item.name === name && item.kind === kind &&
                     (matchKind === undefined || item.matchKind === matchKind) &&
                     (fileName === undefined || item.fileName === fileName) &&
@@ -2045,16 +1881,14 @@ namespace FourSlash {
 
             // if there was an explicit match kind specified, then it should be validated.
             if (matchKind !== undefined) {
-                let missingItem = { name: name, kind: kind, searchValue: searchValue, matchKind: matchKind, fileName: fileName, parentName: parentName };
+                const missingItem = { name: name, kind: kind, searchValue: searchValue, matchKind: matchKind, fileName: fileName, parentName: parentName };
                 this.raiseError(`verifyNavigationItemsListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(items)})`);
             }
         }
 
         public verifyGetScriptLexicalStructureListCount(expected: number) {
-            this.taoInvalidReason = "verifyNavigationItemsListContains impossible";
-
-            let items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
-            let actual = this.getNavigationBarItemsCount(items);
+            const items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
+            const actual = this.getNavigationBarItemsCount(items);
 
             if (expected !== actual) {
                 this.raiseError(`verifyGetScriptLexicalStructureListCount failed - found: ${actual} navigation items, expected: ${expected}.`);
@@ -2074,9 +1908,7 @@ namespace FourSlash {
         }
 
         public verifyGetScriptLexicalStructureListContains(name: string, kind: string) {
-            this.taoInvalidReason = "verifyGetScriptLexicalStructureListContains impossible";
-
-            let items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
+            const items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
 
             if (!items || items.length === 0) {
                 this.raiseError("verifyGetScriptLexicalStructureListContains failed - found 0 navigation items, expected at least one.");
@@ -2086,14 +1918,14 @@ namespace FourSlash {
                 return;
             }
 
-            let missingItem = { name: name, kind: kind };
+            const missingItem = { name: name, kind: kind };
             this.raiseError(`verifyGetScriptLexicalStructureListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(items, null, " ")})`);
         }
 
         private navigationBarItemsContains(items: ts.NavigationBarItem[], name: string, kind: string) {
             if (items) {
                 for (let i = 0; i < items.length; i++) {
-                    let item = items[i];
+                    const item = items[i];
                     if (item && item.text === name && item.kind === kind) {
                         return true;
                     }
@@ -2108,25 +1940,25 @@ namespace FourSlash {
         }
 
         public printNavigationItems(searchValue: string) {
-            let items = this.languageService.getNavigateToItems(searchValue);
-            let length = items && items.length;
+            const items = this.languageService.getNavigateToItems(searchValue);
+            const length = items && items.length;
 
             Harness.IO.log(`NavigationItems list (${length} items)`);
 
             for (let i = 0; i < length; i++) {
-                let item = items[i];
+                const item = items[i];
                 Harness.IO.log(`name: ${item.name}, kind: ${item.kind}, parentName: ${item.containerName}, fileName: ${item.fileName}`);
             }
         }
 
         public printScriptLexicalStructureItems() {
-            let items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
-            let length = items && items.length;
+            const items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
+            const length = items && items.length;
 
             Harness.IO.log(`NavigationItems list (${length} items)`);
 
             for (let i = 0; i < length; i++) {
-                let item = items[i];
+                const item = items[i];
                 Harness.IO.log(`name: ${item.text}, kind: ${item.kind}`);
             }
         }
@@ -2136,15 +1968,13 @@ namespace FourSlash {
         }
 
         public verifyOccurrencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean) {
-            this.taoInvalidReason = "verifyOccurrencesAtPositionListContains NYI";
-
-            let occurrences = this.getOccurrencesAtCurrentPosition();
+            const occurrences = this.getOccurrencesAtCurrentPosition();
 
             if (!occurrences || occurrences.length === 0) {
                 this.raiseError("verifyOccurrencesAtPositionListContains failed - found 0 references, expected at least one.");
             }
 
-            for (let occurrence of occurrences) {
+            for (const occurrence of occurrences) {
                 if (occurrence && occurrence.fileName === fileName && occurrence.textSpan.start === start && ts.textSpanEnd(occurrence.textSpan) === end) {
                     if (typeof isWriteAccess !== "undefined" && occurrence.isWriteAccess !== isWriteAccess) {
                         this.raiseError(`verifyOccurrencesAtPositionListContains failed - item isWriteAccess value does not match, actual: ${occurrence.isWriteAccess}, expected: ${isWriteAccess}.`);
@@ -2153,39 +1983,35 @@ namespace FourSlash {
                 }
             }
 
-            let missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
+            const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
             this.raiseError(`verifyOccurrencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(occurrences)})`);
         }
 
         public verifyOccurrencesAtPositionListCount(expectedCount: number) {
-            this.taoInvalidReason = "verifyOccurrencesAtPositionListCount NYI";
-
-            let occurrences = this.getOccurrencesAtCurrentPosition();
-            let actualCount = occurrences ? occurrences.length : 0;
+            const occurrences = this.getOccurrencesAtCurrentPosition();
+            const actualCount = occurrences ? occurrences.length : 0;
             if (expectedCount !== actualCount) {
                 this.raiseError(`verifyOccurrencesAtPositionListCount failed - actual: ${actualCount}, expected:${expectedCount}`);
             }
         }
 
         private getDocumentHighlightsAtCurrentPosition(fileNamesToSearch: string[]) {
-            let filesToSearch = fileNamesToSearch.map(name => ts.combinePaths(this.basePath, name));
+            const filesToSearch = fileNamesToSearch.map(name => ts.combinePaths(this.basePath, name));
             return this.languageService.getDocumentHighlights(this.activeFile.fileName, this.currentCaretPosition, filesToSearch);
         }
 
         public verifyDocumentHighlightsAtPositionListContains(fileName: string, start: number, end: number, fileNamesToSearch: string[], kind?: string) {
-            this.taoInvalidReason = "verifyDocumentHighlightsAtPositionListContains NYI";
-
-            let documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNamesToSearch);
+            const documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNamesToSearch);
 
             if (!documentHighlights || documentHighlights.length === 0) {
                 this.raiseError("verifyDocumentHighlightsAtPositionListContains failed - found 0 highlights, expected at least one.");
             }
 
-            for (let documentHighlight of documentHighlights) {
+            for (const documentHighlight of documentHighlights) {
                 if (documentHighlight.fileName === fileName) {
-                    let { highlightSpans } = documentHighlight;
+                    const { highlightSpans } = documentHighlight;
 
-                    for (let highlight of highlightSpans) {
+                    for (const highlight of highlightSpans) {
                         if (highlight && highlight.textSpan.start === start && ts.textSpanEnd(highlight.textSpan) === end) {
                             if (typeof kind !== "undefined" && highlight.kind !== kind) {
                                 this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - item "kind" value does not match, actual: ${highlight.kind}, expected: ${kind}.`);
@@ -2196,15 +2022,13 @@ namespace FourSlash {
                 }
             }
 
-            let missingItem = { fileName: fileName, start: start, end: end, kind: kind };
+            const missingItem = { fileName: fileName, start: start, end: end, kind: kind };
             this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(documentHighlights)})`);
         }
 
         public verifyDocumentHighlightsAtPositionListCount(expectedCount: number, fileNamesToSearch: string[]) {
-            this.taoInvalidReason = "verifyDocumentHighlightsAtPositionListCount NYI";
-
-            let documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNamesToSearch);
-            let actualCount = documentHighlights
+            const documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNamesToSearch);
+            const actualCount = documentHighlights
                 ? documentHighlights.reduce((currentCount, { highlightSpans }) => currentCount + highlightSpans.length, 0)
                 : 0;
 
@@ -2215,13 +2039,13 @@ namespace FourSlash {
 
         // Get the text of the entire line the caret is currently at
         private getCurrentLineContent() {
-            let text = this.getFileContent(this.activeFile.fileName);
+            const text = this.getFileContent(this.activeFile.fileName);
 
-            let pos = this.currentCaretPosition;
+            const pos = this.currentCaretPosition;
             let startPos = pos, endPos = pos;
 
             while (startPos > 0) {
-                let ch = text.charCodeAt(startPos - 1);
+                const ch = text.charCodeAt(startPos - 1);
                 if (ch === ts.CharacterCodes.carriageReturn || ch === ts.CharacterCodes.lineFeed) {
                     break;
                 }
@@ -2230,7 +2054,7 @@ namespace FourSlash {
             }
 
             while (endPos < text.length) {
-                let ch = text.charCodeAt(endPos);
+                const ch = text.charCodeAt(endPos);
 
                 if (ch === ts.CharacterCodes.carriageReturn || ch === ts.CharacterCodes.lineFeed) {
                     break;
@@ -2243,36 +2067,29 @@ namespace FourSlash {
         }
 
         private assertItemInCompletionList(items: ts.CompletionEntry[], name: string, text?: string, documentation?: string, kind?: string) {
-            this.scenarioActions.push("<ShowCompletionList />");
-            this.scenarioActions.push(`<VerifyCompletionContainsItem ItemName="${name}"/>`);
-
-            if (text || documentation || kind) {
-                this.taoInvalidReason = "assertItemInCompletionList only supports the \"name\" parameter";
-            }
-
             for (let i = 0; i < items.length; i++) {
-                let item = items[i];
+                const item = items[i];
                 if (item.name === name) {
                     if (documentation != undefined || text !== undefined) {
-                        let details = this.getCompletionEntryDetails(item.name);
+                        const details = this.getCompletionEntryDetails(item.name);
 
                         if (documentation !== undefined) {
-                            assert.equal(ts.displayPartsToString(details.documentation), documentation, assertionMessage("completion item documentation"));
+                            assert.equal(ts.displayPartsToString(details.documentation), documentation, this.assertionMessageAtLastKnownMarker("completion item documentation for " + name));
                         }
                         if (text !== undefined) {
-                            assert.equal(ts.displayPartsToString(details.displayParts), text, assertionMessage("completion item detail text"));
+                            assert.equal(ts.displayPartsToString(details.displayParts), text, this.assertionMessageAtLastKnownMarker("completion item detail text for " + name));
                         }
                     }
 
                     if (kind !== undefined) {
-                        assert.equal(item.kind, kind, assertionMessage("completion item kind"));
+                        assert.equal(item.kind, kind, this.assertionMessageAtLastKnownMarker("completion item kind for " + name));
                     }
 
                     return;
                 }
             }
 
-            let itemsString = items.map((item) => JSON.stringify({ name: item.name, kind: item.kind })).join(",\n");
+            const itemsString = items.map((item) => JSON.stringify({ name: item.name, kind: item.kind })).join(",\n");
 
             this.raiseError(`Expected "${JSON.stringify({ name, text, documentation, kind })}" to be in list [${itemsString}]`);
         }
@@ -2280,7 +2097,7 @@ namespace FourSlash {
         private findFile(indexOrName: any) {
             let result: FourSlashFile = null;
             if (typeof indexOrName === "number") {
-                let index = <number>indexOrName;
+                const index = <number>indexOrName;
                 if (index >= this.testData.files.length) {
                     throw new Error(`File index (${index}) in openFile was out of range. There are only ${this.testData.files.length} files in this test.`);
                 }
@@ -2294,10 +2111,10 @@ namespace FourSlash {
                 // names are stored in the compiler with this relative path, this allows people to use goTo.file on just the fileName
                 name = name.indexOf("/") === -1 ? (this.basePath + "/" + name) : name;
 
-                let availableNames: string[] = [];
+                const availableNames: string[] = [];
                 let foundIt = false;
                 for (let i = 0; i < this.testData.files.length; i++) {
-                    let fn = this.testData.files[i].fileName;
+                    const fn = this.testData.files[i].fileName;
                     if (fn) {
                         if (fn === name) {
                             result = this.testData.files[i];
@@ -2320,15 +2137,15 @@ namespace FourSlash {
         }
 
         private getLineColStringAtPosition(position: number) {
-            let pos = this.languageServiceAdapterHost.positionToLineAndCharacter(this.activeFile.fileName, position);
+            const pos = this.languageServiceAdapterHost.positionToLineAndCharacter(this.activeFile.fileName, position);
             return `line ${(pos.line + 1)}, col ${pos.character}`;
         }
 
         public getMarkerByName(markerName: string) {
-            let markerPos = this.testData.markerPositions[markerName];
+            const markerPos = this.testData.markerPositions[markerName];
             if (markerPos === undefined) {
-                let markerNames: string[] = [];
-                for (let m in this.testData.markerPositions) markerNames.push(m);
+                const markerNames: string[] = [];
+                for (const m in this.testData.markerPositions) markerNames.push(m);
                 throw new Error(`Unknown marker "${markerName}" Available markers: ${markerNames.map(m => "\"" + m + "\"").join(", ")}`);
             }
             else {
@@ -2340,14 +2157,6 @@ namespace FourSlash {
             return text.replace(/ /g, "\u00B7").replace(/\r/g, "\u00B6").replace(/\n/g, "\u2193\n").replace(/\t/g, "\u2192\   ");
         }
 
-        public getTestXmlData(): TestXmlData {
-            return {
-                actions: this.scenarioActions,
-                invalidReason: this.taoInvalidReason,
-                originalName: ""
-            };
-        }
-
         public setCancelled(numberOfCalls: number): void {
             this.cancellationToken.setCancelled(numberOfCalls);
         }
@@ -2358,77 +2167,77 @@ namespace FourSlash {
     }
 
     // TOOD: should these just use the Harness's stdout/stderr?
-    let fsOutput = new Harness.Compiler.WriterAggregator();
-    let fsErrors = new Harness.Compiler.WriterAggregator();
-    export let xmlData: TestXmlData[] = [];
+    const fsOutput = new Harness.Compiler.WriterAggregator();
+    const fsErrors = new Harness.Compiler.WriterAggregator();
     export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {
-        let content = Harness.IO.readFile(fileName);
-        let xml = runFourSlashTestContent(basePath, testType, content, fileName);
-        xmlData.push(xml);
+        const content = Harness.IO.readFile(fileName);
+        runFourSlashTestContent(basePath, testType, content, fileName);
     }
 
-    // We don't want to recompile 'fourslash.ts' for every test, so
-    // here we cache the JS output and reuse it for every test.
-    let fourslashJsOutput: string;
-    {
-        let host = Harness.Compiler.createCompilerHost([{ unitName: Harness.Compiler.fourslashFileName, content: undefined }],
-            (fn, contents) => fourslashJsOutput = contents,
-            ts.ScriptTarget.Latest,
-            Harness.IO.useCaseSensitiveFileNames());
-
-        let program = ts.createProgram([Harness.Compiler.fourslashFileName], { noResolve: true, target: ts.ScriptTarget.ES3 }, host);
-
-        program.emit(host.getSourceFile(Harness.Compiler.fourslashFileName, ts.ScriptTarget.ES3));
-    }
-
-
-    export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): TestXmlData {
+    export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): void {
         // Parse out the files and their metadata
-        let testData = parseTestData(basePath, content, fileName);
+        const testData = parseTestData(basePath, content, fileName);
 
-        currentTestState = new TestState(basePath, testType, testData);
+        const state = new TestState(basePath, testType, testData);
 
         let result = "";
-        let host = Harness.Compiler.createCompilerHost(
-            [
-                { unitName: Harness.Compiler.fourslashFileName, content: undefined },
-                { unitName: fileName, content: content }
-            ],
+        const fourslashFile: Harness.Compiler.TestFile = {
+            unitName: Harness.Compiler.fourslashFileName,
+            content: undefined,
+        };
+        const testFile: Harness.Compiler.TestFile = {
+            unitName: fileName,
+            content: content
+        };
+
+        const host = Harness.Compiler.createCompilerHost(
+            [ fourslashFile, testFile ],
             (fn, contents) => result = contents,
             ts.ScriptTarget.Latest,
-            Harness.IO.useCaseSensitiveFileNames());
+            Harness.IO.useCaseSensitiveFileNames(),
+            Harness.IO.getCurrentDirectory());
 
-        let program = ts.createProgram([Harness.Compiler.fourslashFileName, fileName], { outFile: "fourslashTestOutput.js", noResolve: true, target: ts.ScriptTarget.ES3 }, host);
+        const program = ts.createProgram([Harness.Compiler.fourslashFileName, fileName], { outFile: "fourslashTestOutput.js", noResolve: true, target: ts.ScriptTarget.ES3 }, host);
 
-        let sourceFile = host.getSourceFile(fileName, ts.ScriptTarget.ES3);
+        const sourceFile = host.getSourceFile(fileName, ts.ScriptTarget.ES3);
 
-        let diagnostics = ts.getPreEmitDiagnostics(program, sourceFile);
+        const diagnostics = ts.getPreEmitDiagnostics(program, sourceFile);
         if (diagnostics.length > 0) {
             throw new Error(`Error compiling ${fileName}: ` +
                 diagnostics.map(e => ts.flattenDiagnosticMessageText(e.messageText, Harness.IO.newLine())).join("\r\n"));
         }
 
         program.emit(sourceFile);
-        result = result || ""; // Might have an empty fourslash file
 
-        result = fourslashJsOutput + "\r\n" + result;
+        ts.Debug.assert(!!result);
+        runCode(result, state);
+    }
 
+    function runCode(code: string, state: TestState): void {
         // Compile and execute the test
+        const wrappedCode =
+`(function(test, goTo, verify, edit, debug, format, cancellation, classification, verifyOperationIsCancelled) {
+${code}
+})`;
         try {
-            eval(result);
+            const test = new FourSlashInterface.Test(state);
+            const goTo = new FourSlashInterface.GoTo(state);
+            const verify = new FourSlashInterface.Verify(state);
+            const edit = new FourSlashInterface.Edit(state);
+            const debug = new FourSlashInterface.Debug(state);
+            const format = new FourSlashInterface.Format(state);
+            const cancellation = new FourSlashInterface.Cancellation(state);
+            const f = eval(wrappedCode);
+            f(test, goTo, verify, edit, debug, format, cancellation, FourSlashInterface.Classification, FourSlash.verifyOperationIsCancelled);
         }
         catch (err) {
             // Debugging: FourSlash.currentTestState.printCurrentFileState();
             throw err;
         }
-
-        let xmlData = currentTestState.getTestXmlData();
-        xmlData.originalName = fileName;
-        return xmlData;
     }
 
     function chompLeadingSpace(content: string) {
-        let lines = content.split("\n");
+        const lines = content.split("\n");
         for (let i = 0; i < lines.length; i++) {
             if ((lines[i].length !== 0) && (lines[i].charAt(0) !== " ")) {
                 return content;
@@ -2440,22 +2249,22 @@ namespace FourSlash {
 
     function parseTestData(basePath: string, contents: string, fileName: string): FourSlashData {
         // Regex for parsing options in the format "@Alpha: Value of any sort"
-        let optionRegex = /^\s*@(\w+): (.*)\s*/;
+        const optionRegex = /^\s*@(\w+): (.*)\s*/;
 
         // List of all the subfiles we've parsed out
-        let files: FourSlashFile[] = [];
+        const files: FourSlashFile[] = [];
         // Global options
-        let globalOptions: { [s: string]: string; } = {};
+        const globalOptions: { [s: string]: string; } = {};
         // Marker positions
 
         // Split up the input file by line
         // Note: IE JS engine incorrectly handles consecutive delimiters here when using RegExp split, so
         // we have to string-based splitting instead and try to figure out the delimiting chars
-        let lines = contents.split("\n");
+        const lines = contents.split("\n");
 
-        let markerPositions: MarkerMap = {};
-        let markers: Marker[] = [];
-        let ranges: Range[] = [];
+        const markerPositions: MarkerMap = {};
+        const markers: Marker[] = [];
+        const ranges: Range[] = [];
 
         // Stuff related to the subfile we're parsing
         let currentFileContent: string = null;
@@ -2464,7 +2273,7 @@ namespace FourSlash {
 
         for (let i = 0; i < lines.length; i++) {
             let line = lines[i];
-            let lineLength = line.length;
+            const lineLength = line.length;
 
             if (lineLength > 0 && line.charAt(lineLength - 1) === "\r") {
                 line = line.substr(0, lineLength - 1);
@@ -2486,9 +2295,9 @@ namespace FourSlash {
             }
             else if (line.substr(0, 2) === "//") {
                 // Comment line, check for global/file @options and record them
-                let match = optionRegex.exec(line.substr(2));
+                const match = optionRegex.exec(line.substr(2));
                 if (match) {
-                    let fileMetadataNamesIndex = fileMetadataNames.indexOf(match[1]);
+                    const fileMetadataNamesIndex = fileMetadataNames.indexOf(match[1]);
                     if (fileMetadataNamesIndex === -1) {
                         // Check if the match is already existed in the global options
                         if (globalOptions[match[1]] !== undefined) {
@@ -2500,7 +2309,7 @@ namespace FourSlash {
                         if (fileMetadataNamesIndex === fileMetadataNames.indexOf(metadataOptionNames.fileName)) {
                             // Found an @FileName directive, if this is not the first then create a new subfile
                             if (currentFileContent) {
-                                let file = parseFileContent(currentFileContent, currentFileName, markerPositions, markers, ranges);
+                                const file = parseFileContent(currentFileContent, currentFileName, markerPositions, markers, ranges);
                                 file.fileOptions = currentFileOptions;
 
                                 // Store result file
@@ -2530,7 +2339,7 @@ namespace FourSlash {
             else {
                 // Empty line or code line, terminate current subfile if there is one
                 if (currentFileContent) {
-                    let file = parseFileContent(currentFileContent, currentFileName, markerPositions, markers, ranges);
+                    const file = parseFileContent(currentFileContent, currentFileName, markerPositions, markers, ranges);
                     file.fileOptions = currentFileOptions;
 
                     // Store result file
@@ -2573,7 +2382,7 @@ namespace FourSlash {
     }
 
     function getNonFileNameOptionInObject(optionObject: { [s: string]: string }): string {
-        for (let option in optionObject) {
+        for (const option in optionObject) {
             if (option !== metadataOptionNames.fileName) {
                 return option;
             }
@@ -2588,11 +2397,11 @@ namespace FourSlash {
     }
 
     function reportError(fileName: string, line: number, col: number, message: string) {
-        let errorMessage = fileName + "(" + line + "," + col + "): " + message;
+        const errorMessage = fileName + "(" + line + "," + col + "): " + message;
         throw new Error(errorMessage);
     }
 
-    function recordObjectMarker(fileName: string, location: ILocationInformation, text: string, markerMap: MarkerMap, markers: Marker[]): Marker {
+    function recordObjectMarker(fileName: string, location: LocationInformation, text: string, markerMap: MarkerMap, markers: Marker[]): Marker {
         let markerValue: any = undefined;
         try {
             // Attempt to parse the marker value as JSON
@@ -2607,7 +2416,7 @@ namespace FourSlash {
             return null;
         }
 
-        let marker: Marker = {
+        const marker: Marker = {
             fileName: fileName,
             position: location.position,
             data: markerValue
@@ -2623,15 +2432,15 @@ namespace FourSlash {
         return marker;
     }
 
-    function recordMarker(fileName: string, location: ILocationInformation, name: string, markerMap: MarkerMap, markers: Marker[]): Marker {
-        let marker: Marker = {
+    function recordMarker(fileName: string, location: LocationInformation, name: string, markerMap: MarkerMap, markers: Marker[]): Marker {
+        const marker: Marker = {
             fileName: fileName,
             position: location.position
         };
 
         // Verify markers for uniqueness
         if (markerMap[name] !== undefined) {
-            let message = "Marker '" + name + "' is duplicated in the source file contents.";
+            const message = "Marker '" + name + "' is duplicated in the source file contents.";
             reportError(marker.fileName, location.sourceLine, location.sourceColumn, message);
             return null;
         }
@@ -2646,16 +2455,16 @@ namespace FourSlash {
         content = chompLeadingSpace(content);
 
         // Any slash-star comment with a character not in this string is not a marker.
-        let validMarkerChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz$1234567890_";
+        const validMarkerChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz$1234567890_";
 
         /// The file content (minus metacharacters) so far
         let output = "";
 
         /// The current marker (or maybe multi-line comment?) we're parsing, possibly
-        let openMarker: ILocationInformation = null;
+        let openMarker: LocationInformation = null;
 
         /// A stack of the open range markers that are still unclosed
-        let openRanges: IRangeLocationInformation[] = [];
+        const openRanges: RangeLocationInformation[] = [];
 
         /// A list of ranges we've collected so far */
         let localRanges: Range[] = [];
@@ -2673,7 +2482,7 @@ namespace FourSlash {
         let line = 1;
         let column = 1;
 
-        let flush = (lastSafeCharIndex: number) => {
+        const flush = (lastSafeCharIndex: number) => {
             if (lastSafeCharIndex === undefined) {
                 output = output + content.substr(lastNormalCharPosition);
             }
@@ -2685,7 +2494,7 @@ namespace FourSlash {
         if (content.length > 0) {
             let previousChar = content.charAt(0);
             for (let i = 1; i < content.length; i++) {
-                let currentChar = content.charAt(i);
+                const currentChar = content.charAt(i);
                 switch (state) {
                     case State.none:
                         if (previousChar === "[" && currentChar === "|") {
@@ -2703,12 +2512,12 @@ namespace FourSlash {
                         }
                         else if (previousChar === "|" && currentChar === "]") {
                             // found a range end
-                            let rangeStart = openRanges.pop();
+                            const rangeStart = openRanges.pop();
                             if (!rangeStart) {
                                 reportError(fileName, line, column, "Found range end with no matching start.");
                             }
 
-                            let range: Range = {
+                            const range: Range = {
                                 fileName: fileName,
                                 start: rangeStart.position,
                                 end: (i - 1) - difference,
@@ -2748,8 +2557,8 @@ namespace FourSlash {
                         // Object markers are only ever terminated by |} and have no content restrictions
                         if (previousChar === "|" && currentChar === "}") {
                             // Record the marker
-                            let objectMarkerNameText = content.substring(openMarker.sourcePosition + 2, i - 1).trim();
-                            let marker = recordObjectMarker(fileName, openMarker, objectMarkerNameText, markerMap, markers);
+                            const objectMarkerNameText = content.substring(openMarker.sourcePosition + 2, i - 1).trim();
+                            const marker = recordObjectMarker(fileName, openMarker, objectMarkerNameText, markerMap, markers);
 
                             if (openRanges.length > 0) {
                                 openRanges[openRanges.length - 1].marker = marker;
@@ -2769,8 +2578,8 @@ namespace FourSlash {
                         if (previousChar === "*" && currentChar === "/") {
                             // Record the marker
                             // start + 2 to ignore the */, -1 on the end to ignore the * (/ is next)
-                            let markerNameText = content.substring(openMarker.sourcePosition + 2, i - 1).trim();
-                            let marker = recordMarker(fileName, openMarker, markerNameText, markerMap, markers);
+                            const markerNameText = content.substring(openMarker.sourcePosition + 2, i - 1).trim();
+                            const marker = recordMarker(fileName, openMarker, markerNameText, markerMap, markers);
 
                             if (openRanges.length > 0) {
                                 openRanges[openRanges.length - 1].marker = marker;
@@ -2821,7 +2630,7 @@ namespace FourSlash {
         flush(undefined);
 
         if (openRanges.length > 0) {
-            let openRange = openRanges[0];
+            const openRange = openRanges[0];
             reportError(fileName, openRange.sourceLine, openRange.sourceColumn, "Unterminated range.");
         }
 
@@ -2841,3 +2650,628 @@ namespace FourSlash {
         };
     }
 }
+
+namespace FourSlashInterface {
+    export class Test {
+        constructor(private state: FourSlash.TestState) {
+        }
+
+        public markers(): FourSlash.Marker[] {
+            return this.state.getMarkers();
+        }
+
+        public marker(name?: string): FourSlash.Marker {
+            return this.state.getMarkerByName(name);
+        }
+
+        public ranges(): FourSlash.Range[] {
+            return this.state.getRanges();
+        }
+
+        public markerByName(s: string): FourSlash.Marker {
+            return this.state.getMarkerByName(s);
+        }
+    }
+
+    export class GoTo {
+        constructor(private state: FourSlash.TestState) {
+        }
+        // Moves the caret to the specified marker,
+        // or the anonymous marker ('/**/') if no name
+        // is given
+        public marker(name?: string) {
+            this.state.goToMarker(name);
+        }
+
+        public bof() {
+            this.state.goToBOF();
+        }
+
+        public eof() {
+            this.state.goToEOF();
+        }
+
+        public definition(definitionIndex = 0) {
+            this.state.goToDefinition(definitionIndex);
+        }
+
+        public type(definitionIndex = 0) {
+            this.state.goToTypeDefinition(definitionIndex);
+        }
+
+        public position(position: number, fileIndex?: number): void;
+        public position(position: number, fileName?: string): void;
+        public position(position: number, fileNameOrIndex?: any): void {
+            if (fileNameOrIndex !== undefined) {
+                this.file(fileNameOrIndex);
+            }
+            this.state.goToPosition(position);
+        }
+
+        // Opens a file, given either its index as it
+        // appears in the test source, or its filename
+        // as specified in the test metadata
+        public file(index: number, content?: string): void;
+        public file(name: string, content?: string): void;
+        public file(indexOrName: any, content?: string): void {
+            this.state.openFile(indexOrName, content);
+        }
+    }
+
+    export class VerifyNegatable {
+        public not: VerifyNegatable;
+
+        constructor(protected state: FourSlash.TestState, private negative = false) {
+            if (!negative) {
+                this.not = new VerifyNegatable(state, true);
+            }
+        }
+
+        // Verifies the member list contains the specified symbol. The
+        // member list is brought up if necessary
+        public memberListContains(symbol: string, text?: string, documenation?: string, kind?: string) {
+            if (this.negative) {
+                this.state.verifyMemberListDoesNotContain(symbol);
+            }
+            else {
+                this.state.verifyMemberListContains(symbol, text, documenation, kind);
+            }
+        }
+
+        public memberListCount(expectedCount: number) {
+            this.state.verifyMemberListCount(expectedCount, this.negative);
+        }
+
+        // Verifies the completion list contains the specified symbol. The
+        // completion list is brought up if necessary
+        public completionListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
+            if (this.negative) {
+                this.state.verifyCompletionListDoesNotContain(symbol, text, documentation, kind);
+            }
+            else {
+                this.state.verifyCompletionListContains(symbol, text, documentation, kind);
+            }
+        }
+
+        // Verifies the completion list items count to be greater than the specified amount. The
+        // completion list is brought up if necessary
+        public completionListItemsCountIsGreaterThan(count: number) {
+            this.state.verifyCompletionListItemsCountIsGreaterThan(count, this.negative);
+        }
+
+        public completionListIsEmpty() {
+            this.state.verifyCompletionListIsEmpty(this.negative);
+        }
+
+        public completionListAllowsNewIdentifier() {
+            this.state.verifyCompletionListAllowsNewIdentifier(this.negative);
+        }
+
+        public memberListIsEmpty() {
+            this.state.verifyMemberListIsEmpty(this.negative);
+        }
+
+        public referencesCountIs(count: number) {
+            this.state.verifyReferencesCountIs(count, /*localFilesOnly*/ false);
+        }
+
+        public referencesAtPositionContains(range: FourSlash.Range, isWriteAccess?: boolean) {
+            this.state.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
+        }
+
+        public signatureHelpPresent() {
+            this.state.verifySignatureHelpPresent(!this.negative);
+        }
+
+        public errorExistsBetweenMarkers(startMarker: string, endMarker: string) {
+            this.state.verifyErrorExistsBetweenMarkers(startMarker, endMarker, !this.negative);
+        }
+
+        public errorExistsAfterMarker(markerName = "") {
+            this.state.verifyErrorExistsAfterMarker(markerName, !this.negative, /*after*/ true);
+        }
+
+        public errorExistsBeforeMarker(markerName = "") {
+            this.state.verifyErrorExistsAfterMarker(markerName, !this.negative, /*after*/ false);
+        }
+
+        public quickInfoIs(expectedText?: string, expectedDocumentation?: string) {
+            this.state.verifyQuickInfoString(this.negative, expectedText, expectedDocumentation);
+        }
+
+        public quickInfoExists() {
+            this.state.verifyQuickInfoExists(this.negative);
+        }
+
+        public definitionCountIs(expectedCount: number) {
+            this.state.verifyDefinitionsCount(this.negative, expectedCount);
+        }
+
+        public typeDefinitionCountIs(expectedCount: number) {
+            this.state.verifyTypeDefinitionsCount(this.negative, expectedCount);
+        }
+
+        public definitionLocationExists() {
+            this.state.verifyDefinitionLocationExists(this.negative);
+        }
+
+        public verifyDefinitionsName(name: string, containerName: string) {
+            this.state.verifyDefinitionsName(this.negative, name, containerName);
+        }
+    }
+
+    export class Verify extends VerifyNegatable {
+        constructor(state: FourSlash.TestState) {
+            super(state);
+        }
+
+        public caretAtMarker(markerName?: string) {
+            this.state.verifyCaretAtMarker(markerName);
+        }
+
+        public indentationIs(numberOfSpaces: number) {
+            this.state.verifyIndentationAtCurrentPosition(numberOfSpaces);
+        }
+
+        public indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle = ts.IndentStyle.Smart) {
+            this.state.verifyIndentationAtPosition(fileName, position, numberOfSpaces, indentStyle);
+        }
+
+        public textAtCaretIs(text: string) {
+            this.state.verifyTextAtCaretIs(text);
+        }
+
+        /**
+         * Compiles the current file and evaluates 'expr' in a context containing
+         * the emitted output, then compares (using ===) the result of that expression
+         * to 'value'. Do not use this function with external modules as it is not supported.
+         */
+        public eval(expr: string, value: any) {
+            this.state.verifyEval(expr, value);
+        }
+
+        public currentLineContentIs(text: string) {
+            this.state.verifyCurrentLineContent(text);
+        }
+
+        public currentFileContentIs(text: string) {
+            this.state.verifyCurrentFileContent(text);
+        }
+
+        public verifyGetEmitOutputForCurrentFile(expected: string): void {
+            this.state.verifyGetEmitOutputForCurrentFile(expected);
+        }
+
+        public currentParameterHelpArgumentNameIs(name: string) {
+            this.state.verifyCurrentParameterHelpName(name);
+        }
+
+        public currentParameterSpanIs(parameter: string) {
+            this.state.verifyCurrentParameterSpanIs(parameter);
+        }
+
+        public currentParameterHelpArgumentDocCommentIs(docComment: string) {
+            this.state.verifyCurrentParameterHelpDocComment(docComment);
+        }
+
+        public currentSignatureHelpDocCommentIs(docComment: string) {
+            this.state.verifyCurrentSignatureHelpDocComment(docComment);
+        }
+
+        public signatureHelpCountIs(expected: number) {
+            this.state.verifySignatureHelpCount(expected);
+        }
+
+        public signatureHelpArgumentCountIs(expected: number) {
+            this.state.verifySignatureHelpArgumentCount(expected);
+        }
+
+        public currentSignatureParameterCountIs(expected: number) {
+            this.state.verifyCurrentSignatureHelpParameterCount(expected);
+        }
+
+        public currentSignatureHelpIs(expected: string) {
+            this.state.verifyCurrentSignatureHelpIs(expected);
+        }
+
+        public numberOfErrorsInCurrentFile(expected: number) {
+            this.state.verifyNumberOfErrorsInCurrentFile(expected);
+        }
+
+        public baselineCurrentFileBreakpointLocations() {
+            this.state.baselineCurrentFileBreakpointLocations();
+        }
+
+        public baselineCurrentFileNameOrDottedNameSpans() {
+            this.state.baselineCurrentFileNameOrDottedNameSpans();
+        }
+
+        public baselineGetEmitOutput() {
+            this.state.baselineGetEmitOutput();
+        }
+
+        public nameOrDottedNameSpanTextIs(text: string) {
+            this.state.verifyCurrentNameOrDottedNameSpanText(text);
+        }
+
+        public outliningSpansInCurrentFile(spans: FourSlash.TextSpan[]) {
+            this.state.verifyOutliningSpans(spans);
+        }
+
+        public todoCommentsInCurrentFile(descriptors: string[]) {
+            this.state.verifyTodoComments(descriptors, this.state.getRanges());
+        }
+
+        public matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number) {
+            this.state.verifyMatchingBracePosition(bracePosition, expectedMatchPosition);
+        }
+
+        public noMatchingBracePositionInCurrentFile(bracePosition: number) {
+            this.state.verifyNoMatchingBracePosition(bracePosition);
+        }
+
+        public DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean) {
+            this.state.verifyDocCommentTemplate(empty ? undefined : { newText: expectedText, caretOffset: expectedOffset });
+        }
+
+        public noDocCommentTemplate() {
+            this.DocCommentTemplate(/*expectedText*/ undefined, /*expectedOffset*/ undefined, /*empty*/ true);
+        }
+
+        public getScriptLexicalStructureListCount(count: number) {
+            this.state.verifyGetScriptLexicalStructureListCount(count);
+        }
+
+        // TODO: figure out what to do with the unused arguments.
+        public getScriptLexicalStructureListContains(
+            name: string,
+            kind: string,
+            fileName?: string,
+            parentName?: string,
+            isAdditionalSpan?: boolean,
+            markerPosition?: number) {
+            this.state.verifyGetScriptLexicalStructureListContains(name, kind);
+        }
+
+        public navigationItemsListCount(count: number, searchValue: string, matchKind?: string) {
+            this.state.verifyNavigationItemsCount(count, searchValue, matchKind);
+        }
+
+        public navigationItemsListContains(
+            name: string,
+            kind: string,
+            searchValue: string,
+            matchKind: string,
+            fileName?: string,
+            parentName?: string) {
+            this.state.verifyNavigationItemsListContains(
+                name,
+                kind,
+                searchValue,
+                matchKind,
+                fileName,
+                parentName);
+        }
+
+        public occurrencesAtPositionContains(range: FourSlash.Range, isWriteAccess?: boolean) {
+            this.state.verifyOccurrencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
+        }
+
+        public occurrencesAtPositionCount(expectedCount: number) {
+            this.state.verifyOccurrencesAtPositionListCount(expectedCount);
+        }
+
+        public documentHighlightsAtPositionContains(range: FourSlash.Range, fileNamesToSearch: string[], kind?: string) {
+            this.state.verifyDocumentHighlightsAtPositionListContains(range.fileName, range.start, range.end, fileNamesToSearch, kind);
+        }
+
+        public documentHighlightsAtPositionCount(expectedCount: number, fileNamesToSearch: string[]) {
+            this.state.verifyDocumentHighlightsAtPositionListCount(expectedCount, fileNamesToSearch);
+        }
+
+        public completionEntryDetailIs(entryName: string, text: string, documentation?: string, kind?: string) {
+            this.state.verifyCompletionEntryDetails(entryName, text, documentation, kind);
+        }
+
+        /**
+         * This method *requires* a contiguous, complete, and ordered stream of classifications for a file.
+         */
+        public syntacticClassificationsAre(...classifications: { classificationType: string; text: string }[]) {
+            this.state.verifySyntacticClassifications(classifications);
+        }
+
+        /**
+         * This method *requires* an ordered stream of classifications for a file, and spans are highly recommended.
+         */
+        public semanticClassificationsAre(...classifications: { classificationType: string; text: string; textSpan?: FourSlash.TextSpan }[]) {
+            this.state.verifySemanticClassifications(classifications);
+        }
+
+        public renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) {
+            this.state.verifyRenameInfoSucceeded(displayName, fullDisplayName, kind, kindModifiers);
+        }
+
+        public renameInfoFailed(message?: string) {
+            this.state.verifyRenameInfoFailed(message);
+        }
+
+        public renameLocations(findInStrings: boolean, findInComments: boolean) {
+            this.state.verifyRenameLocations(findInStrings, findInComments);
+        }
+
+        public verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { start: number; length: number; },
+            displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]) {
+            this.state.verifyQuickInfoDisplayParts(kind, kindModifiers, textSpan, displayParts, documentation);
+        }
+
+        public getSyntacticDiagnostics(expected: string) {
+            this.state.getSyntacticDiagnostics(expected);
+        }
+
+        public getSemanticDiagnostics(expected: string) {
+            this.state.getSemanticDiagnostics(expected);
+        }
+
+        public ProjectInfo(expected: string []) {
+            this.state.verifyProjectInfo(expected);
+        }
+    }
+
+    export class Edit {
+        constructor(private state: FourSlash.TestState) {
+        }
+        public backspace(count?: number) {
+            this.state.deleteCharBehindMarker(count);
+        }
+
+        public deleteAtCaret(times?: number) {
+            this.state.deleteChar(times);
+        }
+
+        public replace(start: number, length: number, text: string) {
+            this.state.replace(start, length, text);
+        }
+
+        public paste(text: string) {
+            this.state.paste(text);
+        }
+
+        public insert(text: string) {
+            this.insertLines(text);
+        }
+
+        public insertLine(text: string) {
+            this.insertLines(text + "\n");
+        }
+
+        public insertLines(...lines: string[]) {
+            this.state.type(lines.join("\n"));
+        }
+
+        public moveRight(count?: number) {
+            this.state.moveCaretRight(count);
+        }
+
+        public moveLeft(count?: number) {
+            if (typeof count === "undefined") {
+                count = 1;
+            }
+            this.state.moveCaretRight(count * -1);
+        }
+
+        public enableFormatting() {
+            this.state.enableFormatting = true;
+        }
+
+        public disableFormatting() {
+            this.state.enableFormatting = false;
+        }
+    }
+
+    export class Debug {
+        constructor(private state: FourSlash.TestState) {
+        }
+
+        public printCurrentParameterHelp() {
+            this.state.printCurrentParameterHelp();
+        }
+
+        public printCurrentFileState() {
+            this.state.printCurrentFileState();
+        }
+
+        public printCurrentFileStateWithWhitespace() {
+            this.state.printCurrentFileState(/*makeWhitespaceVisible*/true);
+        }
+
+        public printCurrentFileStateWithoutCaret() {
+            this.state.printCurrentFileState(/*makeWhitespaceVisible*/false, /*makeCaretVisible*/false);
+        }
+
+        public printCurrentQuickInfo() {
+            this.state.printCurrentQuickInfo();
+        }
+
+        public printCurrentSignatureHelp() {
+            this.state.printCurrentSignatureHelp();
+        }
+
+        public printMemberListMembers() {
+            this.state.printMemberListMembers();
+        }
+
+        public printCompletionListMembers() {
+            this.state.printCompletionListMembers();
+        }
+
+        public printBreakpointLocation(pos: number) {
+            this.state.printBreakpointLocation(pos);
+        }
+        public printBreakpointAtCurrentLocation() {
+            this.state.printBreakpointAtCurrentLocation();
+        }
+
+        public printNameOrDottedNameSpans(pos: number) {
+            this.state.printNameOrDottedNameSpans(pos);
+        }
+
+        public printErrorList() {
+            this.state.printErrorList();
+        }
+
+        public printNavigationItems(searchValue = ".*") {
+            this.state.printNavigationItems(searchValue);
+        }
+
+        public printScriptLexicalStructureItems() {
+            this.state.printScriptLexicalStructureItems();
+        }
+
+        public printReferences() {
+            this.state.printReferences();
+        }
+
+        public printContext() {
+            this.state.printContext();
+        }
+    }
+
+    export class Format {
+        constructor(private state: FourSlash.TestState) {
+        }
+
+        public document() {
+            this.state.formatDocument();
+        }
+
+        public copyFormatOptions(): ts.FormatCodeOptions {
+            return this.state.copyFormatOptions();
+        }
+
+        public setFormatOptions(options: ts.FormatCodeOptions) {
+            return this.state.setFormatOptions(options);
+        }
+
+        public selection(startMarker: string, endMarker: string) {
+            this.state.formatSelection(this.state.getMarkerByName(startMarker).position, this.state.getMarkerByName(endMarker).position);
+        }
+
+        public setOption(name: string, value: number): void;
+        public setOption(name: string, value: string): void;
+        public setOption(name: string, value: boolean): void;
+        public setOption(name: string, value: any): void {
+            this.state.formatCodeOptions[name] = value;
+        }
+    }
+
+    export class Cancellation {
+        constructor(private state: FourSlash.TestState) {
+        }
+
+        public resetCancelled() {
+            this.state.resetCancelled();
+        }
+
+        public setCancelled(numberOfCalls = 0) {
+            this.state.setCancelled(numberOfCalls);
+        }
+    }
+
+    export namespace Classification {
+        export function comment(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("comment", text, position);
+        }
+
+        export function identifier(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("identifier", text, position);
+        }
+
+        export function keyword(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("keyword", text, position);
+        }
+
+        export function numericLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("numericLiteral", text, position);
+        }
+
+        export function operator(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("operator", text, position);
+        }
+
+        export function stringLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("stringLiteral", text, position);
+        }
+
+        export function whiteSpace(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("whiteSpace", text, position);
+        }
+
+        export function text(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("text", text, position);
+        }
+
+        export function punctuation(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("punctuation", text, position);
+        }
+
+        export function docCommentTagName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("docCommentTagName", text, position);
+        }
+
+        export function className(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("className", text, position);
+        }
+
+        export function enumName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("enumName", text, position);
+        }
+
+        export function interfaceName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("interfaceName", text, position);
+        }
+
+        export function moduleName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("moduleName", text, position);
+        }
+
+        export function typeParameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("typeParameterName", text, position);
+        }
+
+        export function parameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("parameterName", text, position);
+        }
+
+        export function typeAliasName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } {
+            return getClassification("typeAliasName", text, position);
+        }
+
+        function getClassification(type: string, text: string, position?: number) {
+            return {
+                classificationType: type,
+                text: text,
+                textSpan: position === undefined ? undefined : { start: position, end: position + text.length }
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/harness/fourslashRunner.ts b/src/harness/fourslashRunner.ts
index 867c0d5a4d6..84e352359c4 100644
--- a/src/harness/fourslashRunner.ts
+++ b/src/harness/fourslashRunner.ts
@@ -45,10 +45,10 @@ class FourSlashRunner extends RunnerBase {
             this.tests.forEach((fn: string) => {
                  describe(fn, () => {
                        fn = ts.normalizeSlashes(fn);
-                        let justName = fn.replace(/^.*[\\\/]/, "");
+                        const justName = fn.replace(/^.*[\\\/]/, "");
 
                         // Convert to relative path
-                        let testIndex = fn.indexOf("tests/");
+                        const testIndex = fn.indexOf("tests/");
                         if (testIndex >= 0) fn = fn.substr(testIndex);
 
                         if (justName && !justName.match(/fourslash\.ts$/i) && !justName.match(/\.d\.ts$/i)) {
@@ -58,56 +58,6 @@ class FourSlashRunner extends RunnerBase {
                     }
                 });
             });
-
-            describe("Generate Tao XML", () => {
-                let invalidReasons: any = {};
-                FourSlash.xmlData.forEach(xml => {
-                    if (xml.invalidReason !== null) {
-                        invalidReasons[xml.invalidReason] = (invalidReasons[xml.invalidReason] || 0) + 1;
-                    }
-                });
-                let invalidReport: { reason: string; count: number }[] = [];
-                for (let reason in invalidReasons) {
-                    if (invalidReasons.hasOwnProperty(reason)) {
-                        invalidReport.push({ reason: reason, count: invalidReasons[reason] });
-                    }
-                }
-                invalidReport.sort((lhs, rhs) => lhs.count > rhs.count ? -1 : lhs.count === rhs.count ? 0 : 1);
-
-                let lines: string[] = [];
-                lines.push("<!-- Blocked Test Report");
-                invalidReport.forEach((reasonAndCount) => {
-                    lines.push(reasonAndCount.count + " tests blocked by " + reasonAndCount.reason);
-                });
-                lines.push("-->");
-                lines.push("<TaoTest xmlns=\"http://microsoft.com/schemas/VSLanguages/TAO\">");
-                lines.push("    <InitTest>");
-                lines.push("        <StartTarget />");
-                lines.push("    </InitTest>");
-                lines.push("    <ScenarioList>");
-                FourSlash.xmlData.forEach(xml => {
-                    if (xml.invalidReason !== null) {
-                        lines.push("<!-- Skipped " + xml.originalName + ", reason: " + xml.invalidReason + " -->");
-                    }
-                    else {
-                        lines.push("        <Scenario Name=\"" + xml.originalName + "\">");
-                        xml.actions.forEach(action => {
-                            lines.push("            " + action);
-                        });
-                        lines.push("        </Scenario>");
-                    }
-                });
-                lines.push("    </ScenarioList>");
-                lines.push("    <CleanupScenario>");
-                lines.push("        <CloseAllDocuments />");
-                lines.push("        <CleanupCreatedFiles />");
-                lines.push("    </CleanupScenario>");
-                lines.push("    <CleanupTest>");
-                lines.push("        <CloseTarget />");
-                lines.push("    </CleanupTest>");
-                lines.push("</TaoTest>");
-                Harness.IO.writeFile("built/local/fourslash.xml", lines.join("\r\n"));
-            });
         });
     }
 }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index a37b647a124..ef0f2678e29 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -67,7 +67,7 @@ namespace Utils {
     }
 
     export function evalFile(fileContents: string, fileName: string, nodeContext?: any) {
-        let environment = getExecutionEnvironment();
+        const environment = getExecutionEnvironment();
         switch (environment) {
             case ExecutionEnvironment.CScript:
             case ExecutionEnvironment.Browser:
@@ -121,11 +121,11 @@ namespace Utils {
     }
 
     export function memoize<T extends Function>(f: T): T {
-        let cache: { [idx: string]: any } = {};
+        const cache: { [idx: string]: any } = {};
 
         return <any>(function () {
-            let key = Array.prototype.join.call(arguments);
-            let cachedResult = cache[key];
+            const key = Array.prototype.join.call(arguments);
+            const cachedResult = cache[key];
             if (cachedResult) {
                 return cachedResult;
             }
@@ -172,14 +172,14 @@ namespace Utils {
                     currentPos = array.end;
                 });
 
-            let childNodesAndArrays: any[] = [];
+            const childNodesAndArrays: any[] = [];
             ts.forEachChild(node, child => { childNodesAndArrays.push(child); }, array => { childNodesAndArrays.push(array); });
 
-            for (let childName in node) {
+            for (const childName in node) {
                 if (childName === "parent" || childName === "nextContainer" || childName === "modifiers" || childName === "externalModuleIndicator") {
                     continue;
                 }
-                let child = (<any>node)[childName];
+                const child = (<any>node)[childName];
                 if (isNodeOrArray(child)) {
                     assert.isFalse(childNodesAndArrays.indexOf(child) < 0,
                         "Missing child when forEach'ing over node: " + (<any>ts).SyntaxKind[node.kind] + "-" + childName);
@@ -247,7 +247,7 @@ namespace Utils {
         function getParserContextFlagName(f: number) { return getFlagName((<any>ts).ParserContextFlags, f); }
 
         function serializeNode(n: ts.Node): any {
-            let o: any = { kind: getKindName(n.kind) };
+            const o: any = { kind: getKindName(n.kind) };
             if (ts.containsParseError(n)) {
                 o.containsParseError = true;
             }
@@ -274,7 +274,9 @@ namespace Utils {
 
                     case "flags":
                         // Print out flags with their enum names.
-                        o[propertyName] = getNodeFlagName(n.flags);
+                        if (n.flags) {
+                            o[propertyName] = getNodeFlagName(n.flags);
+                        }
                         break;
 
                     case "parserContextFlags":
@@ -327,8 +329,8 @@ namespace Utils {
         assert.equal(array1.length, array2.length, "array1.length !== array2.length");
 
         for (let i = 0, n = array1.length; i < n; i++) {
-            let d1 = array1[i];
-            let d2 = array2[i];
+            const d1 = array1[i];
+            const d2 = array2[i];
 
             assert.equal(d1.start, d2.start, "d1.start !== d2.start");
             assert.equal(d1.length, d2.length, "d1.length !== d2.length");
@@ -359,14 +361,14 @@ namespace Utils {
 
         ts.forEachChild(node1,
             child1 => {
-                let childName = findChildName(node1, child1);
-                let child2: ts.Node = (<any>node2)[childName];
+                const childName = findChildName(node1, child1);
+                const child2: ts.Node = (<any>node2)[childName];
 
                 assertStructuralEquals(child1, child2);
             },
             (array1: ts.NodeArray<ts.Node>) => {
-                let childName = findChildName(node1, array1);
-                let array2: ts.NodeArray<ts.Node> = (<any>node2)[childName];
+                const childName = findChildName(node1, array1);
+                const array2: ts.NodeArray<ts.Node> = (<any>node2)[childName];
 
                 assertArrayStructuralEquals(array1, array2);
             });
@@ -389,7 +391,7 @@ namespace Utils {
     }
 
     function findChildName(parent: any, child: any) {
-        for (let name in parent) {
+        for (const name in parent) {
             if (parent.hasOwnProperty(name) && parent[name] === child) {
                 return name;
             }
@@ -406,8 +408,8 @@ namespace Harness.Path {
 
     export function filePath(fullPath: string) {
         fullPath = ts.normalizeSlashes(fullPath);
-        let components = fullPath.split("/");
-        let path: string[] = components.slice(0, components.length - 1);
+        const components = fullPath.split("/");
+        const path: string[] = components.slice(0, components.length - 1);
         return path.join("/") + "/";
     }
 }
@@ -508,15 +510,15 @@ namespace Harness {
                     return paths;
                 }
 
-                let folder: any = fso.GetFolder(path);
-                let paths: string[] = [];
+                const folder: any = fso.GetFolder(path);
+                const paths: string[] = [];
 
                 return filesInFolder(folder, path);
             };
         }
 
         export namespace Node {
-            declare let require: any;
+            declare const require: any;
             let fs: any, pathModule: any;
             if (require) {
                 fs = require("fs");
@@ -577,10 +579,10 @@ namespace Harness {
                 function filesInFolder(folder: string): string[] {
                     let paths: string[] = [];
 
-                    let files = fs.readdirSync(folder);
+                    const files = fs.readdirSync(folder);
                     for (let i = 0; i < files.length; i++) {
-                        let pathToFile = pathModule.join(folder, files[i]);
-                        let stat = fs.statSync(pathToFile);
+                        const pathToFile = pathModule.join(folder, files[i]);
+                        const stat = fs.statSync(pathToFile);
                         if (options.recursive && stat.isDirectory()) {
                             paths = paths.concat(filesInFolder(pathToFile));
                         }
@@ -604,7 +606,7 @@ namespace Harness {
         }
 
         export namespace Network {
-            let serverRoot = "http://localhost:8888/";
+            const serverRoot = "http://localhost:8888/";
 
             export const newLine = () => harnessNewLine;
             export const useCaseSensitiveFileNames = () => false;
@@ -613,7 +615,7 @@ namespace Harness {
             export const getExecutingFilePath = () => "";
             export const exit = (exitCode: number) => {};
 
-            let supportsCodePage = () => false;
+            const supportsCodePage = () => false;
             export let log = (s: string) => console.log(s);
 
             namespace Http {
@@ -624,9 +626,9 @@ namespace Harness {
 
                 /// Ask the server to use node's path.resolve to resolve the given path
                 function getResolvedPathFromServer(path: string) {
-                    let xhr = new XMLHttpRequest();
+                    const xhr = new XMLHttpRequest();
                     try {
-                        xhr.open("GET", path + "?resolve", false);
+                        xhr.open("GET", path + "?resolve", /*async*/ false);
                         xhr.send();
                     }
                     catch (e) {
@@ -643,9 +645,9 @@ namespace Harness {
 
                 /// Ask the server for the contents of the file at the given URL via a simple GET request
                 export function getFileFromServerSync(url: string): XHRResponse {
-                    let xhr = new XMLHttpRequest();
+                    const xhr = new XMLHttpRequest();
                     try {
-                        xhr.open("GET", url, false);
+                        xhr.open("GET", url, /*async*/ false);
                         xhr.send();
                     }
                     catch (e) {
@@ -657,10 +659,10 @@ namespace Harness {
 
                 /// Submit a POST request to the server to do the given action (ex WRITE, DELETE) on the provided URL
                 export function writeToServerSync(url: string, action: string, contents?: string): XHRResponse {
-                    let xhr = new XMLHttpRequest();
+                    const xhr = new XMLHttpRequest();
                     try {
-                        let actionMsg = "?action=" + action;
-                        xhr.open("POST", url + actionMsg, false);
+                        const actionMsg = "?action=" + action;
+                        xhr.open("POST", url + actionMsg, /*async*/ false);
                         xhr.setRequestHeader("Access-Control-Allow-Origin", "*");
                         xhr.send(contents);
                     }
@@ -710,14 +712,14 @@ namespace Harness {
             export const resolvePath = (path: string) => directoryName(path);
 
             export function fileExists(path: string): boolean {
-                let response = Http.getFileFromServerSync(serverRoot + path);
+                const response = Http.getFileFromServerSync(serverRoot + path);
                 return response.status === 200;
             }
 
             export function _listFilesImpl(path: string, spec?: RegExp, options?: any) {
-                let response = Http.getFileFromServerSync(serverRoot + path);
+                const response = Http.getFileFromServerSync(serverRoot + path);
                 if (response.status === 200) {
-                    let results = response.responseText.split(",");
+                    const results = response.responseText.split(",");
                     if (spec) {
                         return results.filter(file => spec.test(file));
                     }
@@ -732,7 +734,7 @@ namespace Harness {
             export let listFiles = Utils.memoize(_listFilesImpl);
 
             export function readFile(file: string) {
-                let response = Http.getFileFromServerSync(serverRoot + file);
+                const response = Http.getFileFromServerSync(serverRoot + file);
                 if (response.status === 200) {
                     return response.responseText;
                 }
@@ -765,26 +767,9 @@ namespace Harness {
 }
 
 namespace Harness {
-    let tcServicesFileName = "typescriptServices.js";
-
-    export let libFolder: string;
-    switch (Utils.getExecutionEnvironment()) {
-        case Utils.ExecutionEnvironment.CScript:
-            libFolder = "built/local/";
-            tcServicesFileName = "built/local/typescriptServices.js";
-            break;
-        case Utils.ExecutionEnvironment.Node:
-            libFolder = "built/local/";
-            tcServicesFileName = "built/local/typescriptServices.js";
-            break;
-        case Utils.ExecutionEnvironment.Browser:
-            libFolder = "built/local/";
-            tcServicesFileName = "built/local/typescriptServices.js";
-            break;
-        default:
-            throw new Error("Unknown context");
-    }
-    export let tcServicesFile = IO.readFile(tcServicesFileName);
+    export const libFolder = "built/local/";
+    const tcServicesFileName = ts.combinePaths(libFolder, "typescriptServices.js");
+    export const tcServicesFile = IO.readFile(tcServicesFileName);
 
     export interface SourceMapEmitterCallback {
         (emittedFile: string, emittedLine: number, emittedColumn: number, sourceFile: string, sourceLine: number, sourceColumn: number, sourceName: string): void;
@@ -825,58 +810,15 @@ namespace Harness {
             }
         }
 
-        export interface IEmitterIOHost {
-            writeFile(path: string, contents: string, writeByteOrderMark: boolean): void;
-            resolvePath(path: string): string;
-        }
-
-        /** Mimics having multiple files, later concatenated to a single file. */
-        export class EmitterIOHost implements IEmitterIOHost {
-            private fileCollection: any = {};
-
-            /** create file gets the whole path to create, so this works as expected with the --out parameter */
-            public writeFile(s: string, contents: string, writeByteOrderMark: boolean): void {
-                let writer: ITextWriter;
-                if (this.fileCollection[s]) {
-                    writer = <ITextWriter>this.fileCollection[s];
-                }
-                else {
-                    writer = new Harness.Compiler.WriterAggregator();
-                    this.fileCollection[s] = writer;
-                }
-
-                writer.Write(contents);
-                writer.Close();
-            }
-
-            public resolvePath(s: string) { return s; }
-
-            public reset() { this.fileCollection = {}; }
-
-            public toArray(): { fileName: string; file: WriterAggregator; }[] {
-                let result: { fileName: string; file: WriterAggregator; }[] = [];
-                for (let p in this.fileCollection) {
-                    if (this.fileCollection.hasOwnProperty(p)) {
-                        let current = <Harness.Compiler.WriterAggregator>this.fileCollection[p];
-                        if (current.lines.length > 0) {
-                            if (p.indexOf(".d.ts") !== -1) { current.lines.unshift(["////[", Path.getFileName(p), "]"].join("")); }
-                            result.push({ fileName: p, file: this.fileCollection[p] });
-                        }
-                    }
-                }
-                return result;
-            }
-        }
-
         export function createSourceFileAndAssertInvariants(
             fileName: string,
             sourceText: string,
             languageVersion: ts.ScriptTarget) {
-            // We'll only assert inletiants outside of light mode. 
+            // We'll only assert invariants outside of light mode. 
             const shouldAssertInvariants = !Harness.lightMode;
 
-            // Only set the parent nodes if we're asserting inletiants.  We don't need them otherwise.
-            let result = ts.createSourceFile(fileName, sourceText, languageVersion, /*setParentNodes:*/ shouldAssertInvariants);
+            // Only set the parent nodes if we're asserting invariants.  We don't need them otherwise.
+            const result = ts.createSourceFile(fileName, sourceText, languageVersion, /*setParentNodes:*/ shouldAssertInvariants);
 
             if (shouldAssertInvariants) {
                 Utils.assertInvariants(result, /*parent:*/ undefined);
@@ -888,12 +830,12 @@ namespace Harness {
         const carriageReturnLineFeed = "\r\n";
         const lineFeed = "\n";
 
-        export let defaultLibFileName = "lib.d.ts";
-        export let defaultLibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest);
-        export let defaultES6LibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.es6.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest);
+        export const defaultLibFileName = "lib.d.ts";
+        export const defaultLibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest);
+        export const defaultES6LibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.es6.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest);
 
         // Cache these between executions so we don't have to re-parse them for every test
-        export let fourslashFileName = "fourslash.ts";
+        export const fourslashFileName = "fourslash.ts";
         export let fourslashSourceFile: ts.SourceFile;
 
         export function getCanonicalFileName(fileName: string): string {
@@ -901,42 +843,35 @@ namespace Harness {
         }
 
         export function createCompilerHost(
-            inputFiles: { unitName: string; content: string; }[],
+            inputFiles: TestFile[],
             writeFile: (fn: string, contents: string, writeByteOrderMark: boolean) => void,
             scriptTarget: ts.ScriptTarget,
             useCaseSensitiveFileNames: boolean,
             // the currentDirectory is needed for rwcRunner to passed in specified current directory to compiler host
-            currentDirectory?: string,
+            currentDirectory: string,
             newLineKind?: ts.NewLineKind): ts.CompilerHost {
 
             // Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames
-            function getCanonicalFileName(fileName: string): string {
-                return useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-            }
+            const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
 
-            let filemap: { [fileName: string]: ts.SourceFile; } = {};
-            let getCurrentDirectory = currentDirectory === undefined ? Harness.IO.getCurrentDirectory : () => currentDirectory;
-
-            // Register input files
-            function register(file: { unitName: string; content: string; }) {
+            const fileMap: ts.FileMap<ts.SourceFile> = ts.createFileMap<ts.SourceFile>();
+            for (const file of inputFiles) {
                 if (file.content !== undefined) {
-                    let fileName = ts.normalizePath(file.unitName);
-                    filemap[getCanonicalFileName(fileName)] = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget);
+                    const fileName = ts.normalizePath(file.unitName);
+                    const sourceFile = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget);
+                    const path = ts.toPath(file.unitName, currentDirectory, getCanonicalFileName);
+                    fileMap.set(path, sourceFile);
                 }
-            };
-            inputFiles.forEach(register);
+            }
 
             function getSourceFile(fn: string, languageVersion: ts.ScriptTarget) {
                 fn = ts.normalizePath(fn);
-                if (Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(fn))) {
-                    return filemap[getCanonicalFileName(fn)];
-                }
-                else if (currentDirectory) {
-                    let canonicalAbsolutePath = getCanonicalFileName(ts.getNormalizedAbsolutePath(fn, currentDirectory));
-                    return Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(canonicalAbsolutePath)) ? filemap[canonicalAbsolutePath] : undefined;
+                const path = ts.toPath(fn, currentDirectory, getCanonicalFileName);
+                if (fileMap.contains(path)) {
+                    return fileMap.get(path);
                 }
                 else if (fn === fourslashFileName) {
-                    let tsFn = "tests/cases/fourslash/" + fourslashFileName;
+                    const tsFn = "tests/cases/fourslash/" + fourslashFileName;
                     fourslashSourceFile = fourslashSourceFile || createSourceFileAndAssertInvariants(tsFn, Harness.IO.readFile(tsFn), scriptTarget);
                     return fourslashSourceFile;
                 }
@@ -949,13 +884,13 @@ namespace Harness {
                 }
             }
 
-            let newLine =
+            const newLine =
                 newLineKind === ts.NewLineKind.CarriageReturnLineFeed ? carriageReturnLineFeed :
                     newLineKind === ts.NewLineKind.LineFeed ? lineFeed :
                         Harness.IO.newLine();
 
             return {
-                getCurrentDirectory,
+                getCurrentDirectory: () => currentDirectory,
                 getSourceFile,
                 getDefaultLibFileName: options => defaultLibFileName,
                 writeFile,
@@ -987,8 +922,8 @@ namespace Harness {
         function getCommandLineOption(name: string): ts.CommandLineOption {
             if (!optionsIndex) {
                 optionsIndex = {};
-                let optionDeclarations = harnessOptionDeclarations.concat(ts.optionDeclarations);
-                for (let option of optionDeclarations) {
+                const optionDeclarations = harnessOptionDeclarations.concat(ts.optionDeclarations);
+                for (const option of optionDeclarations) {
                     optionsIndex[option.name.toLowerCase()] = option;
                 }
             }
@@ -996,13 +931,13 @@ namespace Harness {
         }
 
         export function setCompilerOptionsFromHarnessSetting(settings: Harness.TestCaseParser.CompilerSettings, options: ts.CompilerOptions & HarnessOptions): void {
-            for (let name in settings) {
+            for (const name in settings) {
                 if (settings.hasOwnProperty(name)) {
-                    let value = settings[name];
+                    const value = settings[name];
                     if (value === undefined) {
                         throw new Error(`Cannot have undefined value for compiler option '${name}'.`);
                     }
-                    let option = getCommandLineOption(name);
+                    const option = getCommandLineOption(name);
                     if (option) {
                         switch (option.type) {
                             case "boolean":
@@ -1030,177 +965,139 @@ namespace Harness {
             }
         }
 
-        export class HarnessCompiler {
-            private inputFiles: { unitName: string; content: string }[] = [];
-            private compileOptions: ts.CompilerOptions;
-            private settings: Harness.TestCaseParser.CompilerSettings = {};
+        export interface TestFile {
+            unitName: string;
+            content: string;
+        }
 
-            private lastErrors: ts.Diagnostic[];
+        export interface CompilationOutput {
+            result: CompilerResult;
+            options: ts.CompilerOptions & HarnessOptions;
+        }
 
-            public reset() {
-                this.inputFiles = [];
-                this.settings = {};
-                this.lastErrors = [];
+        export function compileFiles(
+            inputFiles: TestFile[],
+            otherFiles: TestFile[],
+            harnessSettings: TestCaseParser.CompilerSettings,
+            compilerOptions: ts.CompilerOptions,
+            // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file
+            currentDirectory: string): CompilationOutput {
+
+            const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.clone(compilerOptions) : { noResolve: false };
+            options.target = options.target || ts.ScriptTarget.ES3;
+            options.module = options.module || ts.ModuleKind.None;
+            options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed;
+            options.noErrorTruncation = true;
+            options.skipDefaultLibCheck = true;
+
+            currentDirectory = currentDirectory || Harness.IO.getCurrentDirectory();
+
+            // Parse settings
+            let useCaseSensitiveFileNames = Harness.IO.useCaseSensitiveFileNames();
+            if (harnessSettings) {
+                setCompilerOptionsFromHarnessSetting(harnessSettings, options);
+            }
+            if (options.useCaseSensitiveFileNames !== undefined) {
+                useCaseSensitiveFileNames = options.useCaseSensitiveFileNames;
             }
 
-            public reportCompilationErrors() {
-                return this.lastErrors;
+            const programFiles: TestFile[] = inputFiles.slice();
+            // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context.
+            // Treat them as library files, so include them in build, but not in baselines.
+            if (options.includeBuiltFile) {
+                const builtFileName = ts.combinePaths(libFolder, options.includeBuiltFile);
+                const builtFile: TestFile = {
+                    unitName: builtFileName,
+                    content: normalizeLineEndings(IO.readFile(builtFileName), Harness.IO.newLine()),
+                };
+                programFiles.push(builtFile);
             }
 
-            public setCompilerSettings(tcSettings: Harness.TestCaseParser.CompilerSettings) {
-                this.settings = tcSettings;
+            const fileOutputs: GeneratedFile[] = [];
+
+            const programFileNames = programFiles.map(file => file.unitName);
+
+            const compilerHost = createCompilerHost(
+                programFiles.concat(otherFiles),
+                (fileName, code, writeByteOrderMark) => fileOutputs.push({ fileName, code, writeByteOrderMark }),
+                options.target,
+                useCaseSensitiveFileNames,
+                currentDirectory,
+                options.newLine);
+            const program = ts.createProgram(programFileNames, options, compilerHost);
+
+            const emitResult = program.emit();
+
+            const errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+
+            const result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps);
+            return { result, options };
+        }
+
+        export function compileDeclarationFiles(inputFiles: TestFile[],
+            otherFiles: TestFile[],
+            result: CompilerResult,
+            harnessSettings: TestCaseParser.CompilerSettings & HarnessOptions,
+            options: ts.CompilerOptions,
+            // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file
+            currentDirectory: string) {
+            if (options.declaration && result.errors.length === 0 && result.declFilesCode.length !== result.files.length) {
+                throw new Error("There were no errors and declFiles generated did not match number of js files generated");
             }
 
-            public addInputFiles(files: { unitName: string; content: string }[]) {
-                files.forEach(file => this.addInputFile(file));
+            const declInputFiles: TestFile[] = [];
+            const declOtherFiles: TestFile[] = [];
+
+            // if the .d.ts is non-empty, confirm it compiles correctly as well
+            if (options.declaration && result.errors.length === 0 && result.declFilesCode.length > 0) {
+                ts.forEach(inputFiles, file => addDtsFile(file, declInputFiles));
+                ts.forEach(otherFiles, file => addDtsFile(file, declOtherFiles));
+                const output = compileFiles(declInputFiles, declOtherFiles, harnessSettings, options, currentDirectory);
+
+                return { declInputFiles, declOtherFiles, declResult: output.result };
             }
 
-            public addInputFile(file: { unitName: string; content: string }) {
-                this.inputFiles.push(file);
-            }
-
-            public setCompilerOptions(options?: ts.CompilerOptions) {
-                this.compileOptions = options || { noResolve: false };
-            }
-
-            public emitAll(ioHost?: IEmitterIOHost) {
-                this.compileFiles(this.inputFiles,
-                    /*otherFiles*/ [],
-                    /*onComplete*/ result => {
-                        result.files.forEach(writeFile);
-                        result.declFilesCode.forEach(writeFile);
-                        result.sourceMaps.forEach(writeFile);
-                    },
-                    /*settingsCallback*/ () => { },
-                    this.compileOptions);
-
-                function writeFile(file: GeneratedFile) {
-                    ioHost.writeFile(file.fileName, file.code, false);
+            function addDtsFile(file: TestFile, dtsFiles: TestFile[]) {
+                if (isDTS(file.unitName)) {
+                    dtsFiles.push(file);
                 }
-            }
-
-            public compileFiles(inputFiles: { unitName: string; content: string }[],
-                otherFiles: { unitName: string; content: string }[],
-                onComplete: (result: CompilerResult, program: ts.Program) => void,
-                settingsCallback?: (settings: ts.CompilerOptions) => void,
-                options?: ts.CompilerOptions & HarnessOptions,
-                // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file
-                currentDirectory?: string) {
-
-                options = options || { noResolve: false };
-                options.target = options.target || ts.ScriptTarget.ES3;
-                options.module = options.module || ts.ModuleKind.None;
-                options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed;
-                options.noErrorTruncation = true;
-                options.skipDefaultLibCheck = true;
-
-                if (settingsCallback) {
-                    settingsCallback(null);
-                }
-
-                let newLine = "\r\n";
-
-                // Parse settings
-                setCompilerOptionsFromHarnessSetting(this.settings, options);
-
-                // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context.
-                // Treat them as library files, so include them in build, but not in baselines.
-                let includeBuiltFiles: { unitName: string; content: string }[] = [];
-                if (options.includeBuiltFile) {
-                    let builtFileName = libFolder + options.includeBuiltFile;
-                    includeBuiltFiles.push({ unitName: builtFileName, content: normalizeLineEndings(IO.readFile(builtFileName), newLine) });
-                }
-
-                let useCaseSensitiveFileNames = options.useCaseSensitiveFileNames !== undefined ? options.useCaseSensitiveFileNames : Harness.IO.useCaseSensitiveFileNames();
-
-                let fileOutputs: GeneratedFile[] = [];
-
-                let programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName);
-
-                let compilerHost = createCompilerHost(
-                    inputFiles.concat(includeBuiltFiles).concat(otherFiles),
-                    (fn, contents, writeByteOrderMark) => fileOutputs.push({ fileName: fn, code: contents, writeByteOrderMark: writeByteOrderMark }),
-                    options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine);
-                let program = ts.createProgram(programFiles, options, compilerHost);
-
-                let emitResult = program.emit();
-
-                let errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-                this.lastErrors = errors;
-
-                let result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps);
-                onComplete(result, program);
-
-                return options;
-            }
-
-            public compileDeclarationFiles(inputFiles: { unitName: string; content: string; }[],
-                otherFiles: { unitName: string; content: string; }[],
-                result: CompilerResult,
-                settingsCallback?: (settings: ts.CompilerOptions) => void,
-                options?: ts.CompilerOptions,
-                // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file
-                currentDirectory?: string) {
-                if (options.declaration && result.errors.length === 0 && result.declFilesCode.length !== result.files.length) {
-                    throw new Error("There were no errors and declFiles generated did not match number of js files generated");
-                }
-
-                let declInputFiles: { unitName: string; content: string }[] = [];
-                let declOtherFiles: { unitName: string; content: string }[] = [];
-                let declResult: Harness.Compiler.CompilerResult;
-
-                // if the .d.ts is non-empty, confirm it compiles correctly as well
-                if (options.declaration && result.errors.length === 0 && result.declFilesCode.length > 0) {
-                    ts.forEach(inputFiles, file => addDtsFile(file, declInputFiles));
-                    ts.forEach(otherFiles, file => addDtsFile(file, declOtherFiles));
-                    this.compileFiles(declInputFiles, declOtherFiles, function (compileResult) { declResult = compileResult; },
-                        settingsCallback, options, currentDirectory);
-
-                    return { declInputFiles, declOtherFiles, declResult };
-                }
-
-                function addDtsFile(file: { unitName: string; content: string }, dtsFiles: { unitName: string; content: string }[]) {
-                    if (isDTS(file.unitName)) {
-                        dtsFiles.push(file);
-                    }
-                    else if (isTS(file.unitName)) {
-                        let declFile = findResultCodeFile(file.unitName);
-                        if (!findUnit(declFile.fileName, declInputFiles) && !findUnit(declFile.fileName, declOtherFiles)) {
-                            dtsFiles.push({ unitName: declFile.fileName, content: declFile.code });
-                        }
-                    }
-
-                    function findResultCodeFile(fileName: string) {
-                        let sourceFile = result.program.getSourceFile(fileName);
-                        assert(sourceFile, "Program has no source file with name '" + fileName + "'");
-                        // Is this file going to be emitted separately
-                        let sourceFileName: string;
-                        let outFile = options.outFile || options.out;
-                        if (ts.isExternalModule(sourceFile) || !outFile) {
-                            if (options.outDir) {
-                                let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, result.currentDirectoryForProgram);
-                                sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), "");
-                                sourceFileName = ts.combinePaths(options.outDir, sourceFilePath);
-                            }
-                            else {
-                                sourceFileName = sourceFile.fileName;
-                            }
-                        }
-                        else {
-                            // Goes to single --out file
-                            sourceFileName = outFile;
-                        }
-
-                        let dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts";
-
-                        return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined);
-                    }
-
-                    function findUnit(fileName: string, units: { unitName: string; content: string; }[]) {
-                        return ts.forEach(units, unit => unit.unitName === fileName ? unit : undefined);
+                else if (isTS(file.unitName)) {
+                    const declFile = findResultCodeFile(file.unitName);
+                    if (declFile && !findUnit(declFile.fileName, declInputFiles) && !findUnit(declFile.fileName, declOtherFiles)) {
+                        dtsFiles.push({ unitName: declFile.fileName, content: declFile.code });
                     }
                 }
             }
+
+            function findResultCodeFile(fileName: string) {
+                const sourceFile = result.program.getSourceFile(fileName);
+                assert(sourceFile, "Program has no source file with name '" + fileName + "'");
+                // Is this file going to be emitted separately
+                let sourceFileName: string;
+                const outFile = options.outFile || options.out;
+                if (ts.isExternalModule(sourceFile) || !outFile) {
+                    if (options.outDir) {
+                        let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, result.currentDirectoryForProgram);
+                        sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), "");
+                        sourceFileName = ts.combinePaths(options.outDir, sourceFilePath);
+                    }
+                    else {
+                        sourceFileName = sourceFile.fileName;
+                    }
+                }
+                else {
+                    // Goes to single --out file
+                    sourceFileName = outFile;
+                }
+
+                const dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts";
+
+                return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined);
+            }
+
+            function findUnit(fileName: string, units: TestFile[]) {
+                return ts.forEach(units, unit => unit.unitName === fileName ? unit : undefined);
+            }
         }
 
         function normalizeLineEndings(text: string, lineEnding: string): string {
@@ -1216,7 +1113,7 @@ namespace Harness {
             let errorOutput = "";
             ts.forEach(diagnostics, diagnostic => {
                 if (diagnostic.file) {
-                    let lineAndCharacter = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+                    const lineAndCharacter = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
                     errorOutput += diagnostic.file.fileName + "(" + (lineAndCharacter.line + 1) + "," + (lineAndCharacter.character + 1) + "): ";
                 }
 
@@ -1226,16 +1123,16 @@ namespace Harness {
             return errorOutput;
         }
 
-        export function getErrorBaseline(inputFiles: { unitName: string; content: string }[], diagnostics: ts.Diagnostic[]) {
+        export function getErrorBaseline(inputFiles: TestFile[], diagnostics: ts.Diagnostic[]) {
             diagnostics.sort(ts.compareDiagnostics);
-            let outputLines: string[] = [];
+            const outputLines: string[] = [];
             // Count up all errors that were found in files other than lib.d.ts so we don't miss any
             let totalErrorsReportedInNonLibraryFiles = 0;
 
             function outputErrorText(error: ts.Diagnostic) {
-                let message = ts.flattenDiagnosticMessageText(error.messageText, Harness.IO.newLine());
+                const message = ts.flattenDiagnosticMessageText(error.messageText, Harness.IO.newLine());
 
-                let errLines = RunnerBase.removeFullPaths(message)
+                const errLines = RunnerBase.removeFullPaths(message)
                     .split("\n")
                     .map(s => s.length > 0 && s.charAt(s.length - 1) === "\r" ? s.substr(0, s.length - 1) : s)
                     .filter(s => s.length > 0)
@@ -1253,14 +1150,14 @@ namespace Harness {
             }
 
             // Report global errors
-            let globalErrors = diagnostics.filter(err => !err.file);
+            const globalErrors = diagnostics.filter(err => !err.file);
             globalErrors.forEach(outputErrorText);
 
             // 'merge' the lines of each input file with any errors associated with it
             inputFiles.filter(f => f.content !== undefined).forEach(inputFile => {
                 // Filter down to the errors in the file
-                let fileErrors = diagnostics.filter(e => {
-                    let errFn = e.file;
+                const fileErrors = diagnostics.filter(e => {
+                    const errFn = e.file;
                     return errFn && errFn.fileName === inputFile.unitName;
                 });
 
@@ -1274,7 +1171,7 @@ namespace Harness {
                 // Note: IE JS engine incorrectly handles consecutive delimiters here when using RegExp split, so
                 // we have to string-based splitting instead and try to figure out the delimiting chars
 
-                let lineStarts = ts.computeLineStarts(inputFile.content);
+                const lineStarts = ts.computeLineStarts(inputFile.content);
                 let lines = inputFile.content.split("\n");
                 if (lines.length === 1) {
                     lines = lines[0].split("\r");
@@ -1285,7 +1182,7 @@ namespace Harness {
                         line = line.substr(0, line.length - 1);
                     }
 
-                    let thisLineStart = lineStarts[lineIndex];
+                    const thisLineStart = lineStarts[lineIndex];
                     let nextLineStart: number;
                     // On the last line of the file, fake the next line start number so that we handle errors on the last character of the file correctly
                     if (lineIndex === lines.length - 1) {
@@ -1298,14 +1195,14 @@ namespace Harness {
                     outputLines.push("    " + line);
                     fileErrors.forEach(err => {
                         // Does any error start or continue on to this line? Emit squiggles
-                        let end = ts.textSpanEnd(err);
+                        const end = ts.textSpanEnd(err);
                         if ((end >= thisLineStart) && ((err.start < nextLineStart) || (lineIndex === lines.length - 1))) {
                             // How many characters from the start of this line the error starts at (could be positive or negative)
-                            let relativeOffset = err.start - thisLineStart;
+                            const relativeOffset = err.start - thisLineStart;
                             // How many characters of the error are on this line (might be longer than this line in reality)
-                            let length = (end - err.start) - Math.max(0, thisLineStart - err.start);
+                            const length = (end - err.start) - Math.max(0, thisLineStart - err.start);
                             // Calculate the start of the squiggle
-                            let squiggleStart = Math.max(0, relativeOffset);
+                            const squiggleStart = Math.max(0, relativeOffset);
                             // TODO/REVIEW: this doesn't work quite right in the browser if a multi file test has files whose names are just the right length relative to one another
                             outputLines.push("    " + line.substr(0, squiggleStart).replace(/[^\s]/g, " ") + new Array(Math.min(length, line.length - squiggleStart) + 1).join("~"));
 
@@ -1325,11 +1222,11 @@ namespace Harness {
                 assert.equal(markedErrorCount, fileErrors.length, "count of errors in " + inputFile.unitName);
             });
 
-            let numLibraryDiagnostics = ts.countWhere(diagnostics, diagnostic => {
+            const numLibraryDiagnostics = ts.countWhere(diagnostics, diagnostic => {
                 return diagnostic.file && (isLibraryFile(diagnostic.file.fileName) || isBuiltFile(diagnostic.file.fileName));
             });
 
-            let numTest262HarnessDiagnostics = ts.countWhere(diagnostics, diagnostic => {
+            const numTest262HarnessDiagnostics = ts.countWhere(diagnostics, diagnostic => {
                 // Count an error generated from tests262-harness folder.This should only apply for test262
                 return diagnostic.file && diagnostic.file.fileName.indexOf("test262-harness") >= 0;
             });
@@ -1347,7 +1244,7 @@ namespace Harness {
 
             // Emit them
             let result = "";
-            for (let outputFile of outputFiles) {
+            for (const outputFile of outputFiles) {
                 // Some extra spacing if this isn't the first file
                 if (result.length) {
                     result += "\r\n\r\n";
@@ -1362,21 +1259,11 @@ namespace Harness {
             return result;
 
             function cleanName(fn: string) {
-                let lastSlash = ts.normalizeSlashes(fn).lastIndexOf("/");
+                const lastSlash = ts.normalizeSlashes(fn).lastIndexOf("/");
                 return fn.substr(lastSlash + 1).toLowerCase();
             }
         }
 
-        /** The harness' compiler instance used when tests are actually run. Reseting or changing settings of this compiler instance must be done within a test case (i.e., describe/it) */
-        let harnessCompiler: HarnessCompiler;
-
-        /** Returns the singleton harness compiler instance for generating and running tests.
-            If required a fresh compiler instance will be created, otherwise the existing singleton will be re-used.
-        */
-        export function getCompiler() {
-            return harnessCompiler = harnessCompiler || new HarnessCompiler();
-        }
-
         // This does not need to exist strictly speaking, but many tests will need to be updated if it's removed
         export function compileString(code: string, unitName: string, callback: (result: CompilerResult) => void) {
             // NEWTODO: Re-implement 'compileString'
@@ -1427,7 +1314,7 @@ namespace Harness {
             constructor(fileResults: GeneratedFile[], errors: ts.Diagnostic[], public program: ts.Program,
                 public currentDirectoryForProgram: string, private sourceMapData: ts.SourceMapData[]) {
 
-                fileResults.forEach(emittedFile => {
+                for (const emittedFile of fileResults) {
                     if (isDTS(emittedFile.fileName)) {
                         // .d.ts file, add to declFiles emit
                         this.declFilesCode.push(emittedFile);
@@ -1442,7 +1329,7 @@ namespace Harness {
                     else {
                         throw new Error("Unrecognized file extension for file " + emittedFile.fileName);
                     }
-                });
+                }
 
                 this.errors = errors;
             }
@@ -1471,10 +1358,10 @@ namespace Harness {
         }
 
         // Regex for parsing options in the format "@Alpha: Value of any sort"
-        let optionRegex = /^[\/]{2}\s*@(\w+)\s*:\s*(\S*)/gm;  // multiple matches on multiple lines
+        const optionRegex = /^[\/]{2}\s*@(\w+)\s*:\s*(\S*)/gm;  // multiple matches on multiple lines
 
         function extractCompilerSettings(content: string): CompilerSettings {
-            let opts: CompilerSettings = {};
+            const opts: CompilerSettings = {};
 
             let match: RegExpExecArray;
             while ((match = optionRegex.exec(content)) != null) {
@@ -1486,12 +1373,12 @@ namespace Harness {
 
         /** Given a test file containing // @FileName directives, return an array of named units of code to be added to an existing compiler instance */
         export function makeUnitsFromTest(code: string, fileName: string): { settings: CompilerSettings; testUnitData: TestUnitData[]; } {
-            let settings = extractCompilerSettings(code);
+            const settings = extractCompilerSettings(code);
 
             // List of all the subfiles we've parsed out
-            let testUnitData: TestUnitData[] = [];
+            const testUnitData: TestUnitData[] = [];
 
-            let lines = Utils.splitContentByNewlines(code);
+            const lines = Utils.splitContentByNewlines(code);
 
             // Stuff related to the subfile we're parsing
             let currentFileContent: string = null;
@@ -1500,12 +1387,12 @@ namespace Harness {
             let refs: string[] = [];
 
             for (let i = 0; i < lines.length; i++) {
-                let line = lines[i];
-                let testMetaData = optionRegex.exec(line);
+                const line = lines[i];
+                const testMetaData = optionRegex.exec(line);
                 if (testMetaData) {
                     // Comment line, check for global/file @options and record them
                     optionRegex.lastIndex = 0;
-                    let metaDataName = testMetaData[1].toLowerCase();
+                    const metaDataName = testMetaData[1].toLowerCase();
                     if (metaDataName === "filename") {
                         currentFileOptions[testMetaData[1]] = testMetaData[2];
                     }
@@ -1516,7 +1403,7 @@ namespace Harness {
                     // New metadata statement after having collected some code to go with the previous metadata
                     if (currentFileName) {
                         // Store result file
-                        let newTestFile = {
+                        const newTestFile = {
                                 content: currentFileContent,
                                 name: currentFileName,
                                 fileOptions: currentFileOptions,
@@ -1554,7 +1441,7 @@ namespace Harness {
             currentFileName = testUnitData.length > 0 ? currentFileName : Path.getFileName(fileName);
 
             // EOF, push whatever remains
-            let newTestFile2 = {
+            const newTestFile2 = {
                 content: currentFileContent || "",
                 name: currentFileName,
                 fileOptions: currentFileOptions,
@@ -1602,7 +1489,7 @@ namespace Harness {
             }
         }
 
-        let fileCache: { [idx: string]: boolean } = {};
+        const fileCache: { [idx: string]: boolean } = {};
         function generateActual(actualFileName: string, generateContent: () => string): string {
             // For now this is written using TypeScript, because sys is not available when running old test cases.
             // But we need to move to sys once we have
@@ -1613,7 +1500,7 @@ namespace Harness {
                     return;
                 }
 
-                let parentDirectory = IO.directoryName(dirName);
+                const parentDirectory = IO.directoryName(dirName);
                 if (parentDirectory != "") {
                     createDirectoryStructure(parentDirectory);
                 }
@@ -1629,7 +1516,7 @@ namespace Harness {
                 IO.deleteFile(actualFileName);
             }
 
-            let actual = generateContent();
+            const actual = generateContent();
 
             if (actual === undefined) {
                 throw new Error("The generated content was \"undefined\". Return \"null\" if no baselining is required.\"");
@@ -1652,7 +1539,7 @@ namespace Harness {
                 return;
             }
 
-            let refFileName = referencePath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder);
+            const refFileName = referencePath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder);
 
             if (actual === null) {
                 actual = "<no content>";
@@ -1667,10 +1554,10 @@ namespace Harness {
         }
 
         function writeComparison(expected: string, actual: string, relativeFileName: string, actualFileName: string, descriptionForDescribe: string) {
-            let encoded_actual =  Utils.encodeString(actual);
+            const encoded_actual =  Utils.encodeString(actual);
             if (expected != encoded_actual) {
                 // Overwrite & issue error
-                let errMsg = "The baseline file " + relativeFileName + " has changed";
+                const errMsg = "The baseline file " + relativeFileName + " has changed";
                 throw new Error(errMsg);
             }
         }
@@ -1683,17 +1570,17 @@ namespace Harness {
             opts?: BaselineOptions): void {
 
             let actual = <string>undefined;
-            let actualFileName = localPath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder);
+            const actualFileName = localPath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder);
 
             if (runImmediately) {
                 actual = generateActual(actualFileName, generateContent);
-                let comparison = compareToBaseline(actual, relativeFileName, opts);
+                const comparison = compareToBaseline(actual, relativeFileName, opts);
                 writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
             }
             else {
                 actual = generateActual(actualFileName, generateContent);
 
-                let comparison = compareToBaseline(actual, relativeFileName, opts);
+                const comparison = compareToBaseline(actual, relativeFileName, opts);
                 writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
             }
         }
@@ -1707,12 +1594,9 @@ namespace Harness {
         return filePath.indexOf(Harness.libFolder) === 0;
     }
 
-    export function getDefaultLibraryFile(io: Harness.IO): { unitName: string, content: string } {
-        let libFile = Harness.userSpecifiedRoot + Harness.libFolder + "lib.d.ts";
-        return {
-            unitName: libFile,
-            content: io.readFile(libFile)
-        };
+    export function getDefaultLibraryFile(io: Harness.IO): Harness.Compiler.TestFile {
+        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + "lib.d.ts";
+        return { unitName: libFile, content: io.readFile(libFile) };
     }
 
     if (Error) (<any>Error).stackTraceLimit = 1;
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index df5efccdcb5..3c7814df562 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -7,7 +7,7 @@ namespace Harness.LanguageService {
     export class ScriptInfo {
         public version: number = 1;
         public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = [];
-        public lineMap: number[] = undefined;
+        private lineMap: number[] = undefined;
 
         constructor(public fileName: string, public content: string) {
             this.setContent(content);
@@ -15,7 +15,11 @@ namespace Harness.LanguageService {
 
         private setContent(content: string): void {
             this.content = content;
-            this.lineMap = ts.computeLineStarts(content);
+            this.lineMap = undefined;
+        }
+
+        public getLineMap(): number[] {
+            return this.lineMap || (this.lineMap = ts.computeLineStarts(this.content));
         }
 
         public updateContent(content: string): void {
@@ -26,9 +30,9 @@ namespace Harness.LanguageService {
 
         public editContent(start: number, end: number, newText: string): void {
             // Apply edits
-            let prefix = this.content.substring(0, start);
-            let middle = newText;
-            let suffix = this.content.substring(end);
+            const prefix = this.content.substring(0, start);
+            const middle = newText;
+            const suffix = this.content.substring(end);
             this.setContent(prefix + middle + suffix);
 
             // Store edit range + new length of script
@@ -48,10 +52,10 @@ namespace Harness.LanguageService {
                 return ts.unchangedTextChangeRange;
             }
 
-            let initialEditRangeIndex = this.editRanges.length - (this.version - startVersion);
-            let lastEditRangeIndex = this.editRanges.length - (this.version - endVersion);
+            const initialEditRangeIndex = this.editRanges.length - (this.version - startVersion);
+            const lastEditRangeIndex = this.editRanges.length - (this.version - endVersion);
 
-            let entries = this.editRanges.slice(initialEditRangeIndex, lastEditRangeIndex);
+            const entries = this.editRanges.slice(initialEditRangeIndex, lastEditRangeIndex);
             return ts.collapseTextChangeRangesAcrossMultipleVersions(entries.map(e => e.textChangeRange));
         }
     }
@@ -74,7 +78,7 @@ namespace Harness.LanguageService {
         }
 
         public getChangeRange(oldScript: ts.IScriptSnapshot): ts.TextChangeRange {
-            let oldShim = <ScriptSnapshot>oldScript;
+            const oldShim = <ScriptSnapshot>oldScript;
             return this.scriptInfo.getTextChangeRangeBetweenVersions(oldShim.version, this.version);
         }
     }
@@ -92,9 +96,9 @@ namespace Harness.LanguageService {
         }
 
         public getChangeRange(oldScript: ts.ScriptSnapshotShim): string {
-            let oldShim = <ScriptSnapshotProxy>oldScript;
+            const oldShim = <ScriptSnapshotProxy>oldScript;
 
-            let range = this.scriptSnapshot.getChangeRange(oldShim.scriptSnapshot);
+            const range = this.scriptSnapshot.getChangeRange(oldShim.scriptSnapshot);
             if (range === undefined) {
                 return undefined;
             }
@@ -130,7 +134,7 @@ namespace Harness.LanguageService {
         }
 
         public getFilenames(): string[] {
-            let fileNames: string[] = [];
+            const fileNames: string[] = [];
             ts.forEachKey(this.fileNameToScript, (fileName) => { fileNames.push(fileName); });
             return fileNames;
         }
@@ -144,7 +148,7 @@ namespace Harness.LanguageService {
         }
 
         public editScript(fileName: string, start: number, end: number, newText: string) {
-            let script = this.getScriptInfo(fileName);
+            const script = this.getScriptInfo(fileName);
             if (script !== undefined) {
                 script.editContent(start, end, newText);
                 return;
@@ -153,7 +157,7 @@ namespace Harness.LanguageService {
             throw new Error("No script with name '" + fileName + "'");
         }
 
-        public openFile(fileName: string): void {
+        public openFile(fileName: string, content?: string): void {
         }
 
         /**
@@ -161,10 +165,10 @@ namespace Harness.LanguageService {
           * @param col 0 based index
           */
         public positionToLineAndCharacter(fileName: string, position: number): ts.LineAndCharacter {
-            let script: ScriptInfo = this.fileNameToScript[fileName];
+            const script: ScriptInfo = this.fileNameToScript[fileName];
             assert.isNotNull(script);
 
-            return ts.computeLineAndCharacterOfPosition(script.lineMap, position);
+            return ts.computeLineAndCharacterOfPosition(script.getLineMap(), position);
         }
     }
 
@@ -176,11 +180,11 @@ namespace Harness.LanguageService {
         getDefaultLibFileName(): string { return ""; }
         getScriptFileNames(): string[] { return this.getFilenames(); }
         getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
-            let script = this.getScriptInfo(fileName);
+            const script = this.getScriptInfo(fileName);
             return script ? new ScriptSnapshot(script) : undefined;
         }
         getScriptVersion(fileName: string): string {
-            let script = this.getScriptInfo(fileName);
+            const script = this.getScriptInfo(fileName);
             return script ? script.version.toString() : undefined;
         }
 
@@ -197,7 +201,7 @@ namespace Harness.LanguageService {
         getHost() { return this.host; }
         getLanguageService(): ts.LanguageService { return ts.createLanguageService(this.host); }
         getClassifier(): ts.Classifier { return ts.createClassifier(); }
-        getPreProcessedFileInfo(fileName: string, fileContents: string): ts.PreProcessedFileInfo { return ts.preProcessFile(fileContents); }
+        getPreProcessedFileInfo(fileName: string, fileContents: string): ts.PreProcessedFileInfo { return ts.preProcessFile(fileContents, /* readImportFiles */ true, ts.hasJavaScriptFileExtension(fileName)); }
     }
 
     /// Shim adapter
@@ -211,20 +215,20 @@ namespace Harness.LanguageService {
             this.nativeHost = new NativeLanguageServiceHost(cancellationToken, options);
 
             if (preprocessToResolve) {
-                let compilerOptions = this.nativeHost.getCompilationSettings();
-                let moduleResolutionHost: ts.ModuleResolutionHost = {
+                const compilerOptions = this.nativeHost.getCompilationSettings();
+                const moduleResolutionHost: ts.ModuleResolutionHost = {
                     fileExists: fileName => this.getScriptInfo(fileName) !== undefined,
                     readFile: fileName => {
-                        let scriptInfo = this.getScriptInfo(fileName);
+                        const scriptInfo = this.getScriptInfo(fileName);
                         return scriptInfo && scriptInfo.content;
                     }
                 };
                 this.getModuleResolutionsForFile = (fileName) => {
-                    let scriptInfo = this.getScriptInfo(fileName);
-                    let preprocessInfo = ts.preProcessFile(scriptInfo.content, /*readImportFiles*/ true);
-                    let imports: ts.Map<string> = {};
-                    for (let module of preprocessInfo.importedFiles) {
-                        let resolutionInfo = ts.resolveModuleName(module.fileName, fileName, compilerOptions, moduleResolutionHost);
+                    const scriptInfo = this.getScriptInfo(fileName);
+                    const preprocessInfo = ts.preProcessFile(scriptInfo.content, /*readImportFiles*/ true);
+                    const imports: ts.Map<string> = {};
+                    for (const module of preprocessInfo.importedFiles) {
+                        const resolutionInfo = ts.resolveModuleName(module.fileName, fileName, compilerOptions, moduleResolutionHost);
                         if (resolutionInfo.resolvedModule) {
                             imports[module.fileName] = resolutionInfo.resolvedModule.resolvedFileName;
                         }
@@ -246,7 +250,7 @@ namespace Harness.LanguageService {
         getDefaultLibFileName(): string { return this.nativeHost.getDefaultLibFileName(); }
         getScriptFileNames(): string { return JSON.stringify(this.nativeHost.getScriptFileNames()); }
         getScriptSnapshot(fileName: string): ts.ScriptSnapshotShim {
-            let nativeScriptSnapshot = this.nativeHost.getScriptSnapshot(fileName);
+            const nativeScriptSnapshot = this.nativeHost.getScriptSnapshot(fileName);
             return nativeScriptSnapshot && new ScriptSnapshotProxy(nativeScriptSnapshot);
         }
         getScriptVersion(fileName: string): string { return this.nativeHost.getScriptVersion(fileName); }
@@ -257,7 +261,7 @@ namespace Harness.LanguageService {
         }
         fileExists(fileName: string) { return this.getScriptInfo(fileName) !== undefined; }
         readFile(fileName: string) {
-            let snapshot = this.nativeHost.getScriptSnapshot(fileName);
+            const snapshot = this.nativeHost.getScriptSnapshot(fileName);
             return snapshot && snapshot.getText(0, snapshot.getLength());
         }
         log(s: string): void { this.nativeHost.log(s); }
@@ -272,13 +276,13 @@ namespace Harness.LanguageService {
             throw new Error("NYI");
         }
         getClassificationsForLine(text: string, lexState: ts.EndOfLineState, classifyKeywordsInGenerics?: boolean): ts.ClassificationResult {
-            let result = this.shim.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics).split("\n");
-            let entries: ts.ClassificationInfo[] = [];
+            const result = this.shim.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics).split("\n");
+            const entries: ts.ClassificationInfo[] = [];
             let i = 0;
             let position = 0;
 
             for (; i < result.length - 1; i += 2) {
-                let t = entries[i / 2] = {
+                const t = entries[i / 2] = {
                     length: parseInt(result[i]),
                     classification: parseInt(result[i + 1])
                 };
@@ -286,7 +290,7 @@ namespace Harness.LanguageService {
                 assert.isTrue(t.length > 0, "Result length should be greater than 0, got :" + t.length);
                 position += t.length;
             }
-            let finalLexState = parseInt(result[result.length - 1]);
+            const finalLexState = parseInt(result[result.length - 1]);
 
             assert.equal(position, text.length, "Expected cumulative length of all entries to match the length of the source. expected: " + text.length + ", but got: " + position);
 
@@ -298,7 +302,7 @@ namespace Harness.LanguageService {
     }
 
     function unwrapJSONCallResult(result: string): any {
-        let parsedResult = JSON.parse(result);
+        const parsedResult = JSON.parse(result);
         if (parsedResult.error) {
             throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult.error));
         }
@@ -312,7 +316,7 @@ namespace Harness.LanguageService {
         constructor(private shim: ts.LanguageServiceShim) {
         }
         private unwrappJSONCallResult(result: string): any {
-            let parsedResult = JSON.parse(result);
+            const parsedResult = JSON.parse(result);
             if (parsedResult.error) {
                 throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult.error));
             }
@@ -443,10 +447,10 @@ namespace Harness.LanguageService {
                 isLibFile: boolean;
             };
 
-            let coreServicesShim = this.factory.createCoreServicesShim(this.host);
+            const coreServicesShim = this.factory.createCoreServicesShim(this.host);
             shimResult = unwrapJSONCallResult(coreServicesShim.getPreProcessedFileInfo(fileName, ts.ScriptSnapshot.fromString(fileContents)));
 
-            let convertResult: ts.PreProcessedFileInfo = {
+            const convertResult: ts.PreProcessedFileInfo = {
                 referencedFiles: [],
                 importedFiles: [],
                 ambientExternalModules: [],
@@ -493,9 +497,9 @@ namespace Harness.LanguageService {
             this.client = client;
         }
 
-        openFile(fileName: string): void {
-            super.openFile(fileName);
-            this.client.openFile(fileName);
+        openFile(fileName: string, content?: string): void {
+            super.openFile(fileName, content);
+            this.client.openFile(fileName, content);
         }
 
         editScript(fileName: string, start: number, end: number, newText: string) {
@@ -530,7 +534,7 @@ namespace Harness.LanguageService {
                 fileName = Harness.Compiler.defaultLibFileName;
             }
 
-            let snapshot = this.host.getScriptSnapshot(fileName);
+            const snapshot = this.host.getScriptSnapshot(fileName);
             return snapshot && snapshot.getText(0, snapshot.getLength());
         }
 
@@ -612,13 +616,13 @@ namespace Harness.LanguageService {
         private client: ts.server.SessionClient;
         constructor(cancellationToken?: ts.HostCancellationToken, options?: ts.CompilerOptions) {
             // This is the main host that tests use to direct tests
-            let clientHost = new SessionClientHost(cancellationToken, options);
-            let client = new ts.server.SessionClient(clientHost);
+            const clientHost = new SessionClientHost(cancellationToken, options);
+            const client = new ts.server.SessionClient(clientHost);
 
             // This host is just a proxy for the clientHost, it uses the client
             // host to answer server queries about files on disk
-            let serverHost = new SessionServerHost(clientHost);
-            let server = new ts.server.Session(serverHost,
+            const serverHost = new SessionServerHost(clientHost);
+            const server = new ts.server.Session(serverHost,
                 Buffer ? Buffer.byteLength : (string: string, encoding?: string) => string.length,
                 process.hrtime, serverHost);
 
diff --git a/src/harness/loggedIO.ts b/src/harness/loggedIO.ts
index d60756edf19..0bae91f7976 100644
--- a/src/harness/loggedIO.ts
+++ b/src/harness/loggedIO.ts
@@ -89,7 +89,7 @@ namespace Playback {
 
     function memoize<T>(func: (s: string) => T): Memoized<T> {
         let lookup: { [s: string]: T } = {};
-        let run: Memoized<T> = <Memoized<T>>((s: string) => {
+        const run: Memoized<T> = <Memoized<T>>((s: string) => {
             if (lookup.hasOwnProperty(s)) return lookup[s];
             return lookup[s] = func(s);
         });
@@ -159,7 +159,7 @@ namespace Playback {
         wrapper.endRecord = () => {
             if (recordLog !== undefined) {
                 let i = 0;
-                let fn = () => recordLogFileNameBase + i + ".json";
+                const fn = () => recordLogFileNameBase + i + ".json";
                 while (underlying.fileExists(fn())) i++;
                 underlying.writeFile(fn(), JSON.stringify(recordLog));
                 recordLog = undefined;
@@ -174,7 +174,7 @@ namespace Playback {
                     return true;
                 }
                 else {
-                    return findResultByFields(replayLog.fileExists, { path }, false);
+                    return findResultByFields(replayLog.fileExists, { path }, /*defaultValue*/ false);
                 }
             })
         );
@@ -209,8 +209,8 @@ namespace Playback {
 
         wrapper.readFile = recordReplay(wrapper.readFile, underlying)(
             path => {
-                let result = underlying.readFile(path);
-                let logEntry = { path, codepage: 0, result: { contents: result, codepage: 0 } };
+                const result = underlying.readFile(path);
+                const logEntry = { path, codepage: 0, result: { contents: result, codepage: 0 } };
                 recordLog.filesRead.push(logEntry);
                 return result;
             },
@@ -218,8 +218,8 @@ namespace Playback {
 
         wrapper.readDirectory = recordReplay(wrapper.readDirectory, underlying)(
             (path, extension, exclude) => {
-                let result = (<ts.System>underlying).readDirectory(path, extension, exclude);
-                let logEntry = { path, extension, exclude, result };
+                const result = (<ts.System>underlying).readDirectory(path, extension, exclude);
+                const logEntry = { path, extension, exclude, result };
                 recordLog.directoriesRead.push(logEntry);
                 return result;
             },
@@ -263,10 +263,10 @@ namespace Playback {
     }
 
     function findResultByFields<T>(logArray: { result?: T }[], expectedFields: {}, defaultValue?: T): T {
-        let predicate = (entry: { result?: T }) => {
+        const predicate = (entry: { result?: T }) => {
             return Object.getOwnPropertyNames(expectedFields).every((name) => (<any>entry)[name] === (<any>expectedFields)[name]);
         };
-        let results = logArray.filter(entry => predicate(entry));
+        const results = logArray.filter(entry => predicate(entry));
         if (results.length === 0) {
             if (defaultValue !== undefined) {
                 return defaultValue;
@@ -279,7 +279,7 @@ namespace Playback {
     }
 
     function findResultByPath<T>(wrapper: { resolvePath(s: string): string }, logArray: { path: string; result?: T }[], expectedPath: string, defaultValue?: T): T {
-        let normalizedName = ts.normalizePath(expectedPath).toLowerCase();
+        const normalizedName = ts.normalizePath(expectedPath).toLowerCase();
         // Try to find the result through normal fileName
         for (let i = 0; i < logArray.length; i++) {
             if (ts.normalizeSlashes(logArray[i].path).toLowerCase() === normalizedName) {
@@ -288,7 +288,7 @@ namespace Playback {
         }
         // Fallback, try to resolve the target paths as well
         if (replayLog.pathsResolved.length > 0) {
-            let normalizedResolvedName = wrapper.resolvePath(expectedPath).toLowerCase();
+            const normalizedResolvedName = wrapper.resolvePath(expectedPath).toLowerCase();
             for (let i = 0; i < logArray.length; i++) {
                 if (wrapper.resolvePath(logArray[i].path).toLowerCase() === normalizedResolvedName) {
                     return logArray[i].result;
@@ -305,9 +305,9 @@ namespace Playback {
         }
     }
 
-    let pathEquivCache: any = {};
+    const pathEquivCache: any = {};
     function pathsAreEquivalent(left: string, right: string, wrapper: { resolvePath(s: string): string }) {
-        let key = left + "-~~-" + right;
+        const key = left + "-~~-" + right;
         function areSame(a: string, b: string) {
             return ts.normalizeSlashes(a).toLowerCase() === ts.normalizeSlashes(b).toLowerCase();
         }
@@ -329,7 +329,7 @@ namespace Playback {
     }
 
     export function wrapIO(underlying: Harness.IO): PlaybackIO {
-        let wrapper: PlaybackIO = <any>{};
+        const wrapper: PlaybackIO = <any>{};
         initWrapper(wrapper, underlying);
 
         wrapper.directoryName = (path): string => { throw new Error("NotSupported"); };
@@ -342,7 +342,7 @@ namespace Playback {
     }
 
     export function wrapSystem(underlying: ts.System): PlaybackSystem {
-        let wrapper: PlaybackSystem = <any>{};
+        const wrapper: PlaybackSystem = <any>{};
         initWrapper(wrapper, underlying);
         return wrapper;
     }
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
index 862e446352d..dc6cbfac646 100644
--- a/src/harness/projectsRunner.ts
+++ b/src/harness/projectsRunner.ts
@@ -47,7 +47,7 @@ interface BatchCompileProjectTestCaseResult extends CompileProjectFilesResult {
 class ProjectRunner extends RunnerBase {
     public initializeTests() {
         if (this.tests.length === 0) {
-            let testFiles = this.enumerateFiles("tests/cases/project", /\.json$/, { recursive: true });
+            const testFiles = this.enumerateFiles("tests/cases/project", /\.json$/, { recursive: true });
             testFiles.forEach(fn => {
                 fn = fn.replace(/\\/g, "/");
                 this.runProjectTestCase(fn);
@@ -101,7 +101,7 @@ class ProjectRunner extends RunnerBase {
         function cleanProjectUrl(url: string) {
             let diskProjectPath = ts.normalizeSlashes(Harness.IO.resolvePath(testCase.projectRoot));
             let projectRootUrl = "file:///" + diskProjectPath;
-            let normalizedProjectRoot = ts.normalizeSlashes(testCase.projectRoot);
+            const normalizedProjectRoot = ts.normalizeSlashes(testCase.projectRoot);
             diskProjectPath = diskProjectPath.substr(0, diskProjectPath.lastIndexOf(normalizedProjectRoot));
             projectRootUrl = projectRootUrl.substr(0, projectRootUrl.lastIndexOf(normalizedProjectRoot));
             if (url && url.length) {
@@ -127,15 +127,15 @@ class ProjectRunner extends RunnerBase {
         }
 
         function compileProjectFiles(moduleKind: ts.ModuleKind, getInputFiles: () => string[],
-            getSourceFileText: (fileName: string) => string,
+            getSourceFileTextImpl: (fileName: string) => string,
             writeFile: (fileName: string, data: string, writeByteOrderMark: boolean) => void): CompileProjectFilesResult {
 
-            let program = ts.createProgram(getInputFiles(), createCompilerOptions(), createCompilerHost());
+            const program = ts.createProgram(getInputFiles(), createCompilerOptions(), createCompilerHost());
             let errors = ts.getPreEmitDiagnostics(program);
 
-            let emitResult = program.emit();
+            const emitResult = program.emit();
             errors = ts.concatenate(errors, emitResult.diagnostics);
-            let sourceMapData = emitResult.sourceMaps;
+            const sourceMapData = emitResult.sourceMaps;
 
             // Clean up source map data that will be used in baselining
             if (sourceMapData) {
@@ -170,13 +170,18 @@ class ProjectRunner extends RunnerBase {
                 };
             }
 
+            function getSourceFileText(fileName: string): string {
+                const text = getSourceFileTextImpl(fileName);
+                return text !== undefined ? text : getSourceFileTextImpl(ts.getNormalizedAbsolutePath(fileName, getCurrentDirectory()));
+            }
+
             function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile {
                 let sourceFile: ts.SourceFile = undefined;
                 if (fileName === Harness.Compiler.defaultLibFileName) {
                     sourceFile = languageVersion === ts.ScriptTarget.ES6 ? Harness.Compiler.defaultES6LibSourceFile : Harness.Compiler.defaultLibSourceFile;
                 }
                 else {
-                    let text = getSourceFileText(fileName);
+                    const text = getSourceFileText(fileName);
                     if (text !== undefined) {
                         sourceFile = Harness.Compiler.createSourceFileAndAssertInvariants(fileName, text, languageVersion);
                     }
@@ -194,7 +199,7 @@ class ProjectRunner extends RunnerBase {
                     getCanonicalFileName: Harness.Compiler.getCanonicalFileName,
                     useCaseSensitiveFileNames: () => Harness.IO.useCaseSensitiveFileNames(),
                     getNewLine: () => Harness.IO.newLine(),
-                    fileExists: fileName => getSourceFile(fileName, ts.ScriptTarget.ES5) !== undefined,
+                    fileExists: fileName => fileName === Harness.Compiler.defaultLibFileName ||  getSourceFileText(fileName) !== undefined,
                     readFile: fileName => Harness.IO.readFile(fileName)
                 };
             }
@@ -203,9 +208,9 @@ class ProjectRunner extends RunnerBase {
         function batchCompilerProjectTestCase(moduleKind: ts.ModuleKind): BatchCompileProjectTestCaseResult {
             let nonSubfolderDiskFiles = 0;
 
-            let outputFiles: BatchCompileProjectTestCaseEmittedFile[] = [];
+            const outputFiles: BatchCompileProjectTestCaseEmittedFile[] = [];
 
-            let projectCompilerResult = compileProjectFiles(moduleKind, () => testCase.inputFiles, getSourceFileText, writeFile);
+            const projectCompilerResult = compileProjectFiles(moduleKind, () => testCase.inputFiles, getSourceFileText, writeFile);
             return {
                 moduleKind,
                 program: projectCompilerResult.program,
@@ -229,12 +234,15 @@ class ProjectRunner extends RunnerBase {
             }
 
             function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) {
-                let diskFileName = ts.isRootedDiskPath(fileName)
+                // convert file name to rooted name
+                // if filename is not rooted - concat it with project root and then expand project root relative to current directory
+                const diskFileName = ts.isRootedDiskPath(fileName)
                     ? fileName
-                    : ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(fileName);
+                    : Harness.IO.resolvePath(ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(fileName));
 
-                let diskRelativeName = ts.getRelativePathToDirectoryOrUrl(testCase.projectRoot, diskFileName,
-                    getCurrentDirectory(), Harness.Compiler.getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+                const currentDirectory = getCurrentDirectory();
+                // compute file name relative to current directory (expanded project root)
+                let diskRelativeName = ts.getRelativePathToDirectoryOrUrl(currentDirectory, diskFileName, currentDirectory, Harness.Compiler.getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
                 if (ts.isRootedDiskPath(diskRelativeName) || diskRelativeName.substr(0, 3) === "../") {
                     // If the generated output file resides in the parent folder or is rooted path,
                     // we need to instead create files that can live in the project reference folder
@@ -246,14 +254,14 @@ class ProjectRunner extends RunnerBase {
 
                 if (Harness.Compiler.isJS(fileName)) {
                     // Make sure if there is URl we have it cleaned up
-                    let indexOfSourceMapUrl = data.lastIndexOf("//# sourceMappingURL=");
+                    const indexOfSourceMapUrl = data.lastIndexOf("//# sourceMappingURL=");
                     if (indexOfSourceMapUrl !== -1) {
                         data = data.substring(0, indexOfSourceMapUrl + 21) + cleanProjectUrl(data.substring(indexOfSourceMapUrl + 21));
                     }
                 }
                 else if (Harness.Compiler.isJSMap(fileName)) {
                     // Make sure sources list is cleaned
-                    let sourceMapData = JSON.parse(data);
+                    const sourceMapData = JSON.parse(data);
                     for (let i = 0; i < sourceMapData.sources.length; i++) {
                         sourceMapData.sources[i] = cleanProjectUrl(sourceMapData.sources[i]);
                     }
@@ -261,7 +269,7 @@ class ProjectRunner extends RunnerBase {
                     data = JSON.stringify(sourceMapData);
                 }
 
-                let outputFilePath = getProjectOutputFolder(diskRelativeName, moduleKind);
+                const outputFilePath = getProjectOutputFolder(diskRelativeName, moduleKind);
                 // Actual writing of file as in tc.ts
                 function ensureDirectoryStructure(directoryname: string) {
                     if (directoryname) {
@@ -279,8 +287,8 @@ class ProjectRunner extends RunnerBase {
         }
 
         function compileCompileDTsFiles(compilerResult: BatchCompileProjectTestCaseResult) {
-            let allInputFiles: { emittedFileName: string; code: string; }[] = [];
-            let compilerOptions = compilerResult.program.getCompilerOptions();
+            const allInputFiles: { emittedFileName: string; code: string; }[] = [];
+            const compilerOptions = compilerResult.program.getCompilerOptions();
 
             ts.forEach(compilerResult.program.getSourceFiles(), sourceFile => {
                 if (Harness.Compiler.isDTS(sourceFile.fileName)) {
@@ -297,12 +305,15 @@ class ProjectRunner extends RunnerBase {
                         emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName);
                     }
 
-                    let outputDtsFileName = emitOutputFilePathWithoutExtension + ".d.ts";
-                    allInputFiles.unshift(findOutpuDtsFile(outputDtsFileName));
+                    const outputDtsFileName = emitOutputFilePathWithoutExtension + ".d.ts";
+                    const file = findOutpuDtsFile(outputDtsFileName);
+                    if (file) {
+                        allInputFiles.unshift(file);
+                    }
                 }
                 else {
-                    let outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts";
-                    let outputDtsFile = findOutpuDtsFile(outputDtsFileName);
+                    const outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts";
+                    const outputDtsFile = findOutpuDtsFile(outputDtsFileName);
                     if (!ts.contains(allInputFiles, outputDtsFile)) {
                         allInputFiles.unshift(outputDtsFile);
                     }
@@ -318,7 +329,16 @@ class ProjectRunner extends RunnerBase {
                 return ts.map(allInputFiles, outputFile => outputFile.emittedFileName);
             }
             function getSourceFileText(fileName: string): string {
-                return ts.forEach(allInputFiles, inputFile => inputFile.emittedFileName === fileName ? inputFile.code : undefined);
+                for (const inputFile of allInputFiles) {
+                    const isMatchingFile = ts.isRootedDiskPath(fileName)
+                        ? ts.getNormalizedAbsolutePath(inputFile.emittedFileName, getCurrentDirectory()) === fileName
+                        : inputFile.emittedFileName === fileName;
+
+                    if (isMatchingFile) {
+                        return inputFile.code;
+                    }
+                }
+                return undefined;
             }
 
             function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) {
@@ -326,16 +346,16 @@ class ProjectRunner extends RunnerBase {
         }
 
         function getErrorsBaseline(compilerResult: CompileProjectFilesResult) {
-            let inputFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(),
+            const inputFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(),
                 sourceFile => sourceFile.fileName !== "lib.d.ts"),
                 sourceFile => {
-                    return { unitName: sourceFile.fileName, content: sourceFile.text };
+                    return { unitName: RunnerBase.removeFullPaths(sourceFile.fileName), content: sourceFile.text, };
                 });
 
             return Harness.Compiler.getErrorBaseline(inputFiles, compilerResult.errors);
         }
 
-        let name = "Compiling project for " + testCase.scenario + ": testcase " + testCaseFileName;
+        const name = "Compiling project for " + testCase.scenario + ": testcase " + testCaseFileName;
 
         describe("Projects tests", () => {
             describe(name, () => {
@@ -343,7 +363,7 @@ class ProjectRunner extends RunnerBase {
                     let compilerResult: BatchCompileProjectTestCaseResult;
 
                     function getCompilerResolutionInfo() {
-                        let resolutionInfo: ProjectRunnerTestCaseResolutionInfo = {
+                        const resolutionInfo: ProjectRunnerTestCaseResolutionInfo = {
                             scenario: testCase.scenario,
                             projectRoot: testCase.projectRoot,
                             inputFiles: testCase.inputFiles,
@@ -359,14 +379,18 @@ class ProjectRunner extends RunnerBase {
                             runTest: testCase.runTest,
                             bug: testCase.bug,
                             rootDir: testCase.rootDir,
-                            resolvedInputFiles: ts.map(compilerResult.program.getSourceFiles(), inputFile => inputFile.fileName),
-                            emittedFiles: ts.map(compilerResult.outputFiles, outputFile => outputFile.emittedFileName)
+                            resolvedInputFiles: ts.map(compilerResult.program.getSourceFiles(), inputFile => {
+                                return ts.convertToRelativePath(inputFile.fileName, getCurrentDirectory(), path => Harness.Compiler.getCanonicalFileName(path));
+                            }),
+                            emittedFiles: ts.map(compilerResult.outputFiles, outputFile => {
+                                return ts.convertToRelativePath(outputFile.emittedFileName, getCurrentDirectory(), path => Harness.Compiler.getCanonicalFileName(path));
+                            })
                         };
 
                         return resolutionInfo;
                     }
 
-                    it(name + ": " + moduleNameToString(moduleKind) , () => {
+                    it(name + ": " + moduleNameToString(moduleKind), () => {
                         // Compile using node
                         compilerResult = batchCompilerProjectTestCase(moduleKind);
                     });
@@ -417,7 +441,7 @@ class ProjectRunner extends RunnerBase {
 
                     it("Errors in generated Dts files for (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
                         if (!compilerResult.errors.length && testCase.declaration) {
-                            let dTsCompileResult = compileCompileDTsFiles(compilerResult);
+                            const dTsCompileResult = compileCompileDTsFiles(compilerResult);
                             if (dTsCompileResult.errors.length) {
                                 Harness.Baseline.runBaseline("Errors in generated Dts files for (" + moduleNameToString(compilerResult.moduleKind) + "): " + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + ".dts.errors.txt", () => {
                                     return getErrorsBaseline(dTsCompileResult);
diff --git a/src/harness/runner.ts b/src/harness/runner.ts
index 366355520a2..ec8e1105c2f 100644
--- a/src/harness/runner.ts
+++ b/src/harness/runner.ts
@@ -41,13 +41,13 @@ let testConfigFile =
     (Harness.IO.fileExists(testconfig) ? Harness.IO.readFile(testconfig) : "");
 
 if (testConfigFile !== "") {
-    let testConfig = JSON.parse(testConfigFile);
+    const testConfig = JSON.parse(testConfigFile);
     if (testConfig.light) {
         Harness.lightMode = true;
     }
 
     if (testConfig.test && testConfig.test.length > 0) {
-        for (let option of testConfig.test) {
+        for (const option of testConfig.test) {
             if (!option) {
                 continue;
             }
diff --git a/src/harness/runnerbase.ts b/src/harness/runnerbase.ts
index 7469325475a..a114e8c3201 100644
--- a/src/harness/runnerbase.ts
+++ b/src/harness/runnerbase.ts
@@ -25,14 +25,14 @@ abstract class RunnerBase {
         let fixedPath = path;
 
         // full paths either start with a drive letter or / for *nix, shouldn't have \ in the path at this point
-        let fullPath = /(\w+:|\/)?([\w+\-\.]|\/)*\.tsx?/g;
-        let fullPathList = fixedPath.match(fullPath);
+        const fullPath = /(\w+:|\/)?([\w+\-\.]|\/)*\.tsx?/g;
+        const fullPathList = fixedPath.match(fullPath);
         if (fullPathList) {
             fullPathList.forEach((match: string) => fixedPath = fixedPath.replace(match, Harness.Path.getFileName(match)));
         }
 
         // when running in the browser the 'full path' is the host name, shows up in error baselines
-        let localHost = /http:\/localhost:\d+/g;
+        const localHost = /http:\/localhost:\d+/g;
         fixedPath = fixedPath.replace(localHost, "");
         return fixedPath;
     }
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
index 19c989bcd6f..ce570a7d6ad 100644
--- a/src/harness/rwcRunner.ts
+++ b/src/harness/rwcRunner.ts
@@ -6,9 +6,9 @@
 
 namespace RWC {
     function runWithIOLog(ioLog: IOLog, fn: (oldIO: Harness.IO) => void) {
-        let oldIO = Harness.IO;
+        const oldIO = Harness.IO;
 
-        let wrappedIO = Playback.wrapIO(oldIO);
+        const wrappedIO = Playback.wrapIO(oldIO);
         wrappedIO.startReplayFromData(ioLog);
         Harness.IO = wrappedIO;
 
@@ -27,8 +27,8 @@ namespace RWC {
 
     export function runRWCTest(jsonPath: string) {
         describe("Testing a RWC project: " + jsonPath, () => {
-            let inputFiles: { unitName: string; content: string; }[] = [];
-            let otherFiles: { unitName: string; content: string; }[] = [];
+            let inputFiles: Harness.Compiler.TestFile[] = [];
+            let otherFiles: Harness.Compiler.TestFile[] = [];
             let compilerResult: Harness.Compiler.CompilerResult;
             let compilerOptions: ts.CompilerOptions;
             let baselineOpts: Harness.Baseline.BaselineOptions = {
@@ -55,10 +55,9 @@ namespace RWC {
             });
 
             it("can compile", () => {
-                let harnessCompiler = Harness.Compiler.getCompiler();
                 let opts: ts.ParsedCommandLine;
 
-                let ioLog: IOLog = JSON.parse(Harness.IO.readFile(jsonPath));
+                const ioLog: IOLog = JSON.parse(Harness.IO.readFile(jsonPath));
                 currentDirectory = ioLog.currentDirectory;
                 useCustomLibraryFile = ioLog.useCustomLibraryFile;
                 runWithIOLog(ioLog, () => {
@@ -71,30 +70,28 @@ namespace RWC {
                 });
 
                 runWithIOLog(ioLog, oldIO => {
-                    harnessCompiler.reset();
-
                     let fileNames = opts.fileNames;
 
-                    let tsconfigFile = ts.forEach(ioLog.filesRead, f => isTsConfigFile(f) ? f : undefined);
+                    const tsconfigFile = ts.forEach(ioLog.filesRead, f => isTsConfigFile(f) ? f : undefined);
                     if (tsconfigFile) {
-                        let tsconfigFileContents = getHarnessCompilerInputUnit(tsconfigFile.path);
-                        let parsedTsconfigFileContents = ts.parseConfigFileTextToJson(tsconfigFile.path, tsconfigFileContents.content);
-                        let configParseResult = ts.parseJsonConfigFileContent(parsedTsconfigFileContents.config, Harness.IO, ts.getDirectoryPath(tsconfigFile.path));
+                        const tsconfigFileContents = getHarnessCompilerInputUnit(tsconfigFile.path);
+                        const parsedTsconfigFileContents = ts.parseConfigFileTextToJson(tsconfigFile.path, tsconfigFileContents.content);
+                        const configParseResult = ts.parseJsonConfigFileContent(parsedTsconfigFileContents.config, Harness.IO, ts.getDirectoryPath(tsconfigFile.path));
                         fileNames = configParseResult.fileNames;
                         opts.options = ts.extend(opts.options, configParseResult.options);
                     }
 
                     // Load the files
-                    for (let fileName of fileNames) {
+                    for (const fileName of fileNames) {
                         inputFiles.push(getHarnessCompilerInputUnit(fileName));
                     }
 
                     // Add files to compilation
-                    let isInInputList = (resolvedPath: string) => (inputFile: { unitName: string; content: string; }) => inputFile.unitName === resolvedPath;
-                    for (let fileRead of ioLog.filesRead) {
+                    const isInInputList = (resolvedPath: string) => (inputFile: { unitName: string; content: string; }) => inputFile.unitName === resolvedPath;
+                    for (const fileRead of ioLog.filesRead) {
                         // Check if the file is already added into the set of input files.
                         const resolvedPath = ts.normalizeSlashes(Harness.IO.resolvePath(fileRead.path));
-                        let inInputList = ts.forEach(inputFiles, isInInputList(resolvedPath));
+                        const inInputList = ts.forEach(inputFiles, isInInputList(resolvedPath));
 
                         if (isTsConfigFile(fileRead)) {
                             continue;
@@ -128,18 +125,22 @@ namespace RWC {
                     opts.options.noLib = true;
 
                     // Emit the results
-                    compilerOptions = harnessCompiler.compileFiles(
+                    compilerOptions = null;
+                    const output = Harness.Compiler.compileFiles(
                         inputFiles,
                         otherFiles,
-                        newCompilerResults => { compilerResult = newCompilerResults; },
-                        /*settingsCallback*/ undefined, opts.options,
+                        /* harnessOptions */ undefined,
+                        opts.options,
                         // Since each RWC json file specifies its current directory in its json file, we need
                         // to pass this information in explicitly instead of acquiring it from the process.
                         currentDirectory);
+
+                    compilerOptions = output.options;
+                    compilerResult = output.result;
                 });
 
-                function getHarnessCompilerInputUnit(fileName: string) {
-                    let unitName = ts.normalizeSlashes(Harness.IO.resolvePath(fileName));
+                function getHarnessCompilerInputUnit(fileName: string): Harness.Compiler.TestFile {
+                    const unitName = ts.normalizeSlashes(Harness.IO.resolvePath(fileName));
                     let content: string = null;
                     try {
                         content = Harness.IO.readFile(unitName);
@@ -201,8 +202,9 @@ namespace RWC {
             it("has the expected errors in generated declaration files", () => {
                 if (compilerOptions.declaration && !compilerResult.errors.length) {
                     Harness.Baseline.runBaseline("has the expected errors in generated declaration files", baseName + ".dts.errors.txt", () => {
-                        let declFileCompilationResult = Harness.Compiler.getCompiler().compileDeclarationFiles(inputFiles, otherFiles, compilerResult,
-                            /*settingscallback*/ undefined, compilerOptions, currentDirectory);
+                        const declFileCompilationResult = Harness.Compiler.compileDeclarationFiles(
+                            inputFiles, otherFiles, compilerResult, /*harnessSettings*/ undefined, compilerOptions, currentDirectory);
+
                         if (declFileCompilationResult.declResult.errors.length === 0) {
                             return null;
                         }
@@ -227,7 +229,7 @@ class RWCRunner extends RunnerBase {
      */
     public initializeTests(): void {
         // Read in and evaluate the test list
-        let testList = Harness.IO.listFiles(RWCRunner.sourcePath, /.+\.json$/);
+        const testList = Harness.IO.listFiles(RWCRunner.sourcePath, /.+\.json$/);
         for (let i = 0; i < testList.length; i++) {
             this.runTest(testList[i]);
         }
diff --git a/src/harness/sourceMapRecorder.ts b/src/harness/sourceMapRecorder.ts
index dcdc59a2a40..75246a9a266 100644
--- a/src/harness/sourceMapRecorder.ts
+++ b/src/harness/sourceMapRecorder.ts
@@ -92,7 +92,7 @@ namespace Harness.SourceMapRecoder {
                     }
 
                     // 6 digit number
-                    let currentByte = base64FormatDecode();
+                    const currentByte = base64FormatDecode();
 
                     // If msb is set, we still have more bits to continue
                     moreDigits = (currentByte & 32) !== 0;
@@ -190,7 +190,7 @@ namespace Harness.SourceMapRecoder {
                 return { error: errorDecodeOfEncodedMapping, sourceMapSpan: decodeOfEncodedMapping };
             }
 
-            createErrorIfCondition(true, "No encoded entry found");
+            createErrorIfCondition(/*condition*/ true, "No encoded entry found");
         }
 
         export function hasCompletedDecoding() {
@@ -259,7 +259,7 @@ namespace Harness.SourceMapRecoder {
 
         export function recordSourceMapSpan(sourceMapSpan: ts.SourceMapSpan) {
             // verify the decoded span is same as the new span
-            let decodeResult = SourceMapDecoder.decodeNextEncodedSourceMapSpan();
+            const decodeResult = SourceMapDecoder.decodeNextEncodedSourceMapSpan();
             let decodedErrors: string[];
             if (decodeResult.error
                 || decodeResult.sourceMapSpan.emittedLine   !== sourceMapSpan.emittedLine
@@ -317,8 +317,8 @@ namespace Harness.SourceMapRecoder {
         }
 
         function getTextOfLine(line: number, lineMap: number[], code: string) {
-            let startPos = lineMap[line];
-            let endPos = lineMap[line + 1];
+            const startPos = lineMap[line];
+            const endPos = lineMap[line + 1];
             return code.substring(startPos, endPos);
         }
 
@@ -329,7 +329,7 @@ namespace Harness.SourceMapRecoder {
         }
 
         function writeRecordedSpans() {
-            let markerIds: string[] = [];
+            const markerIds: string[] = [];
 
             function getMarkerId(markerIndex: number) {
                 let markerId = "";
@@ -364,7 +364,7 @@ namespace Harness.SourceMapRecoder {
             }
 
             function writeSourceMapMarker(currentSpan: SourceMapSpanWithDecodeErrors, index: number, endColumn = currentSpan.sourceMapSpan.emittedColumn, endContinues?: boolean) {
-                let markerId = getMarkerId(index);
+                const markerId = getMarkerId(index);
                 markerIds.push(markerId);
 
                 writeSourceMapIndent(prevEmittedCol, markerId);
@@ -380,7 +380,7 @@ namespace Harness.SourceMapRecoder {
             }
 
             function writeSourceMapSourceText(currentSpan: SourceMapSpanWithDecodeErrors, index: number) {
-                let sourcePos = tsLineMap[currentSpan.sourceMapSpan.sourceLine - 1] + (currentSpan.sourceMapSpan.sourceColumn - 1);
+                const sourcePos = tsLineMap[currentSpan.sourceMapSpan.sourceLine - 1] + (currentSpan.sourceMapSpan.sourceColumn - 1);
                 let sourceText = "";
                 if (prevWrittenSourcePos < sourcePos) {
                     // Position that goes forward, get text
@@ -395,7 +395,7 @@ namespace Harness.SourceMapRecoder {
                     }
                 }
 
-                let tsCodeLineMap = ts.computeLineStarts(sourceText);
+                const tsCodeLineMap = ts.computeLineStarts(sourceText);
                 for (let i = 0; i < tsCodeLineMap.length; i++) {
                     writeSourceMapIndent(prevEmittedCol, i === 0 ? markerIds[index] : "  >");
                     sourceMapRecoder.Write(getTextOfLine(i, tsCodeLineMap, sourceText));
@@ -412,7 +412,7 @@ namespace Harness.SourceMapRecoder {
             }
 
             if (spansOnSingleLine.length) {
-                let currentJsLine = spansOnSingleLine[0].sourceMapSpan.emittedLine;
+                const currentJsLine = spansOnSingleLine[0].sourceMapSpan.emittedLine;
 
                 // Write js line
                 writeJsFileLines(currentJsLine);
@@ -420,7 +420,7 @@ namespace Harness.SourceMapRecoder {
                 // Emit markers
                 iterateSpans(writeSourceMapMarker);
 
-                let jsFileText = getTextOfLine(currentJsLine, jsLineMap, jsFile.code);
+                const jsFileText = getTextOfLine(currentJsLine, jsLineMap, jsFile.code);
                 if (prevEmittedCol < jsFileText.length) {
                     // There is remaining text on this line that will be part of next source span so write marker that continues
                     writeSourceMapMarker(undefined, spansOnSingleLine.length, /*endColumn*/ jsFileText.length, /*endContinues*/ true);
@@ -438,16 +438,16 @@ namespace Harness.SourceMapRecoder {
     }
 
     export function getSourceMapRecord(sourceMapDataList: ts.SourceMapData[], program: ts.Program, jsFiles: Compiler.GeneratedFile[]) {
-        let sourceMapRecoder = new Compiler.WriterAggregator();
+        const sourceMapRecoder = new Compiler.WriterAggregator();
 
         for (let i = 0; i < sourceMapDataList.length; i++) {
-            let sourceMapData = sourceMapDataList[i];
+            const sourceMapData = sourceMapDataList[i];
             let prevSourceFile: ts.SourceFile;
 
             SourceMapSpanWriter.intializeSourceMapSpanWriter(sourceMapRecoder, sourceMapData, jsFiles[i]);
             for (let j = 0; j < sourceMapData.sourceMapDecodedMappings.length; j++) {
-                let decodedSourceMapping = sourceMapData.sourceMapDecodedMappings[j];
-                let currentSourceFile = program.getSourceFile(sourceMapData.inputSourceFileNames[decodedSourceMapping.sourceIndex]);
+                const decodedSourceMapping = sourceMapData.sourceMapDecodedMappings[j];
+                const currentSourceFile = program.getSourceFile(sourceMapData.inputSourceFileNames[decodedSourceMapping.sourceIndex]);
                 if (currentSourceFile !== prevSourceFile) {
                     SourceMapSpanWriter.recordNewSourceFileSpan(decodedSourceMapping, currentSourceFile.text);
                     prevSourceFile = currentSourceFile;
diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts
index 491c71a5839..262145b4764 100644
--- a/src/harness/test262Runner.ts
+++ b/src/harness/test262Runner.ts
@@ -5,9 +5,9 @@
 class Test262BaselineRunner extends RunnerBase {
     private static basePath = "internal/cases/test262";
     private static helpersFilePath = "tests/cases/test262-harness/helpers.d.ts";
-    private static helperFile = {
+    private static helperFile: Harness.Compiler.TestFile = {
         unitName: Test262BaselineRunner.helpersFilePath,
-        content: Harness.IO.readFile(Test262BaselineRunner.helpersFilePath)
+        content: Harness.IO.readFile(Test262BaselineRunner.helpersFilePath),
     };
     private static testFileExtensionRegex = /\.js$/;
     private static options: ts.CompilerOptions = {
@@ -31,17 +31,17 @@ class Test262BaselineRunner extends RunnerBase {
             let testState: {
                 filename: string;
                 compilerResult: Harness.Compiler.CompilerResult;
-                inputFiles: { unitName: string; content: string }[];
-                program: ts.Program;
+                inputFiles: Harness.Compiler.TestFile[];
             };
 
             before(() => {
-                let content = Harness.IO.readFile(filePath);
-                let testFilename = ts.removeFileExtension(filePath).replace(/\//g, "_") + ".test";
-                let testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, testFilename);
+                const content = Harness.IO.readFile(filePath);
+                const testFilename = ts.removeFileExtension(filePath).replace(/\//g, "_") + ".test";
+                const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, testFilename);
 
-                let inputFiles = testCaseContent.testUnitData.map(unit => {
-                    return { unitName: Test262BaselineRunner.getTestFilePath(unit.name), content: unit.content };
+                const inputFiles: Harness.Compiler.TestFile[] = testCaseContent.testUnitData.map(unit => {
+                    const unitName = Test262BaselineRunner.getTestFilePath(unit.name);
+                    return { unitName, content: unit.content };
                 });
 
                 // Emit the results
@@ -49,13 +49,16 @@ class Test262BaselineRunner extends RunnerBase {
                     filename: testFilename,
                     inputFiles: inputFiles,
                     compilerResult: undefined,
-                    program: undefined,
                 };
 
-                Harness.Compiler.getCompiler().compileFiles([Test262BaselineRunner.helperFile].concat(inputFiles), /*otherFiles*/ [], (compilerResult, program) => {
-                    testState.compilerResult = compilerResult;
-                    testState.program = program;
-                }, /*settingsCallback*/ undefined, Test262BaselineRunner.options);
+                const output = Harness.Compiler.compileFiles(
+                    [Test262BaselineRunner.helperFile].concat(inputFiles),
+                    /*otherFiles*/ [],
+                    /* harnessOptions */ undefined,
+                    Test262BaselineRunner.options,
+                    /* currentDirectory */ undefined
+                    );
+                testState.compilerResult = output.result;
             });
 
             after(() => {
@@ -64,14 +67,14 @@ class Test262BaselineRunner extends RunnerBase {
 
             it("has the expected emitted code", () => {
                 Harness.Baseline.runBaseline("has the expected emitted code", testState.filename + ".output.js", () => {
-                    let files = testState.compilerResult.files.filter(f => f.fileName !== Test262BaselineRunner.helpersFilePath);
+                    const files = testState.compilerResult.files.filter(f => f.fileName !== Test262BaselineRunner.helpersFilePath);
                     return Harness.Compiler.collateOutputs(files);
                 }, false, Test262BaselineRunner.baselineOptions);
             });
 
             it("has the expected errors", () => {
                 Harness.Baseline.runBaseline("has the expected errors", testState.filename + ".errors.txt", () => {
-                    let errors = testState.compilerResult.errors;
+                    const errors = testState.compilerResult.errors;
                     if (errors.length === 0) {
                         return null;
                     }
@@ -80,14 +83,14 @@ class Test262BaselineRunner extends RunnerBase {
                 }, false, Test262BaselineRunner.baselineOptions);
             });
 
-            it("satisfies inletiants", () => {
-                let sourceFile = testState.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename));
+            it("satisfies invariants", () => {
+                const sourceFile = testState.compilerResult.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename));
                 Utils.assertInvariants(sourceFile, /*parent:*/ undefined);
             });
 
             it("has the expected AST", () => {
                 Harness.Baseline.runBaseline("has the expected AST", testState.filename + ".AST.txt", () => {
-                    let sourceFile = testState.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename));
+                    const sourceFile = testState.compilerResult.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename));
                     return Utils.sourceFileToJSON(sourceFile);
                 }, false, Test262BaselineRunner.baselineOptions);
             });
@@ -97,7 +100,7 @@ class Test262BaselineRunner extends RunnerBase {
     public initializeTests() {
         // this will set up a series of describe/it blocks to run between the setup and cleanup phases
         if (this.tests.length === 0) {
-            let testFiles = this.enumerateFiles(Test262BaselineRunner.basePath, Test262BaselineRunner.testFileExtensionRegex, { recursive: true });
+            const testFiles = this.enumerateFiles(Test262BaselineRunner.basePath, Test262BaselineRunner.testFileExtensionRegex, { recursive: true });
             testFiles.forEach(fn => {
                 this.runTest(ts.normalizePath(fn));
             });
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 9db4fbcd41c..e332dab648e 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -21,7 +21,7 @@ class TypeWriterWalker {
     }
 
     public getTypeAndSymbols(fileName: string): TypeWriterResult[] {
-        let sourceFile = this.program.getSourceFile(fileName);
+        const sourceFile = this.program.getSourceFile(fileName);
         this.currentSourceFile = sourceFile;
         this.results = [];
         this.visitNode(sourceFile);
@@ -37,28 +37,28 @@ class TypeWriterWalker {
     }
 
     private logTypeAndSymbol(node: ts.Node): void {
-        let actualPos = ts.skipTrivia(this.currentSourceFile.text, node.pos);
-        let lineAndCharacter = this.currentSourceFile.getLineAndCharacterOfPosition(actualPos);
-        let sourceText = ts.getTextOfNodeFromSourceText(this.currentSourceFile.text, node);
+        const actualPos = ts.skipTrivia(this.currentSourceFile.text, node.pos);
+        const lineAndCharacter = this.currentSourceFile.getLineAndCharacterOfPosition(actualPos);
+        const sourceText = ts.getTextOfNodeFromSourceText(this.currentSourceFile.text, node);
 
         // Workaround to ensure we output 'C' instead of 'typeof C' for base class expressions
         // let type = this.checker.getTypeAtLocation(node);
-        let type = node.parent && ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent) && this.checker.getTypeAtLocation(node.parent) || this.checker.getTypeAtLocation(node);
+        const type = node.parent && ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent) && this.checker.getTypeAtLocation(node.parent) || this.checker.getTypeAtLocation(node);
 
         ts.Debug.assert(type !== undefined, "type doesn't exist");
-        let symbol = this.checker.getSymbolAtLocation(node);
+        const symbol = this.checker.getSymbolAtLocation(node);
 
-        let typeString = this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation);
+        const typeString = this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation);
         let symbolString: string;
         if (symbol) {
             symbolString = "Symbol(" + this.checker.symbolToString(symbol, node.parent);
             if (symbol.declarations) {
-                for (let declaration of symbol.declarations) {
+                for (const declaration of symbol.declarations) {
                     symbolString += ", ";
-                    let declSourceFile = declaration.getSourceFile();
-                    let declLineAndCharacter = declSourceFile.getLineAndCharacterOfPosition(declaration.pos);
-                    let fileName = ts.getBaseFileName(declSourceFile.fileName);
-                    let isLibFile = /lib(.*)\.d\.ts/i.test(fileName);
+                    const declSourceFile = declaration.getSourceFile();
+                    const declLineAndCharacter = declSourceFile.getLineAndCharacterOfPosition(declaration.pos);
+                    const fileName = ts.getBaseFileName(declSourceFile.fileName);
+                    const isLibFile = /lib(.*)\.d\.ts/i.test(fileName);
                     symbolString += `Decl(${ fileName }, ${ isLibFile ? "--" : declLineAndCharacter.line }, ${ isLibFile ? "--" : declLineAndCharacter.character })`;
                 }
             }
diff --git a/src/lib/README.md b/src/lib/README.md
new file mode 100644
index 00000000000..cbf80e4d0da
--- /dev/null
+++ b/src/lib/README.md
@@ -0,0 +1,8 @@
+# Read this!
+
+The files within this directory are used to generate `lib.d.ts` and `lib.es6.d.ts`.
+
+## Generated files
+
+Any files ending in `.generated.d.ts` aren't mean to be edited by hand.
+If you need to make changes to such files, make a change to the input files for our [library generator](https://github.com/Microsoft/TSJS-lib-generator).
diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
index fa985344412..ac039198b4b 100644
--- a/src/lib/dom.generated.d.ts
+++ b/src/lib/dom.generated.d.ts
@@ -2193,6 +2193,68 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
     createElement(tagName: "xmp"): HTMLBlockElement;
     createElement(tagName: string): HTMLElement;
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "clipPath"): SVGClipPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "componentTransferFunction"): SVGComponentTransferFunctionElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "defs"): SVGDefsElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "desc"): SVGDescElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "ellipse"): SVGEllipseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feBlend"): SVGFEBlendElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feColorMatrix"): SVGFEColorMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComponentTransfer"): SVGFEComponentTransferElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComposite"): SVGFECompositeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feConvolveMatrix"): SVGFEConvolveMatrixElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDiffuseLighting"): SVGFEDiffuseLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDisplacementMap"): SVGFEDisplacementMapElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDistantLight"): SVGFEDistantLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFlood"): SVGFEFloodElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncA"): SVGFEFuncAElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncB"): SVGFEFuncBElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncG"): SVGFEFuncGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncR"): SVGFEFuncRElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feGaussianBlur"): SVGFEGaussianBlurElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feImage"): SVGFEImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMerge"): SVGFEMergeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMergeNode"): SVGFEMergeNodeElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMorphology"): SVGFEMorphologyElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feOffset"): SVGFEOffsetElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "fePointLight"): SVGFEPointLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpecularLighting"): SVGFESpecularLightingElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpotLight"): SVGFESpotLightElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTile"): SVGFETileElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTurbulence"): SVGFETurbulenceElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "filter"): SVGFilterElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "foreignObject"): SVGForeignObjectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "g"): SVGGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "image"): SVGImageElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "gradient"): SVGGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "line"): SVGLineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "linearGradient"): SVGLinearGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "marker"): SVGMarkerElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "mask"): SVGMaskElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "path"): SVGPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "metadata"): SVGMetadataElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "pattern"): SVGPatternElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polygon"): SVGPolygonElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polyline"): SVGPolylineElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "radialGradient"): SVGRadialGradientElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "rect"): SVGRectElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "svg"): SVGSVGElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "stop"): SVGStopElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "switch"): SVGSwitchElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "symbol"): SVGSymbolElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "tspan"): SVGTSpanElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textContent"): SVGTextContentElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "text"): SVGTextElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPath"): SVGTextPathElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPositioning"): SVGTextPositioningElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "use"): SVGUseElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "view"): SVGViewElement
+    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement
     createElementNS(namespaceURI: string, qualifiedName: string): Element;
     createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
     createNSResolver(nodeResolver: Node): XPathNSResolver;
@@ -7014,14 +7076,12 @@ interface ImageData {
     width: number;
 }
 
-interface ImageDataConstructor {
+declare var ImageData: {
     prototype: ImageData;
     new(width: number, height: number): ImageData;
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-declare var ImageData: ImageDataConstructor; 
-
 interface KeyboardEvent extends UIEvent {
     altKey: boolean;
     char: string;
diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts
index 7e160fffa45..a2ed9682f1b 100644
--- a/src/lib/webworker.generated.d.ts
+++ b/src/lib/webworker.generated.d.ts
@@ -465,14 +465,12 @@ interface ImageData {
     width: number;
 }
 
-interface ImageDataConstructor {
+declare var ImageData: {
     prototype: ImageData;
     new(width: number, height: number): ImageData;
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-declare var ImageData: ImageDataConstructor; 
-
 interface MSApp {
     clearTemporaryWebDataAsync(): MSAppAsyncOperation;
     createBlobFromRandomAccessStream(type: string, seeker: any): Blob;
diff --git a/src/server/client.ts b/src/server/client.ts
index ae234750d88..08939b2b44a 100644
--- a/src/server/client.ts
+++ b/src/server/client.ts
@@ -120,8 +120,8 @@ namespace ts.server {
             return response;
         }
 
-        openFile(fileName: string): void {
-            var args: protocol.FileRequestArgs = { file: fileName };
+        openFile(fileName: string, content?: string): void {
+            var args: protocol.OpenRequestArgs = { file: fileName, fileContent: content };
             this.processRequest(CommandNames.Open, args);
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 09f8a372463..c3cd65e857b 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -15,12 +15,12 @@ namespace ts.server {
         msg(s: string, type?: string): void;
     }
 
-    var lineCollectionCapacity = 4;
+    const lineCollectionCapacity = 4;
 
     function mergeFormatOptions(formatCodeOptions: FormatCodeOptions, formatOptions: protocol.FormatOptions): void {
-        var hasOwnProperty = Object.prototype.hasOwnProperty;
+        const hasOwnProperty = Object.prototype.hasOwnProperty;
         Object.keys(formatOptions).forEach((key) => {
-            var codeKey = key.charAt(0).toUpperCase() + key.substring(1);
+            const codeKey = key.charAt(0).toUpperCase() + key.substring(1);
             if (hasOwnProperty.call(formatCodeOptions, codeKey)) {
                 formatCodeOptions[codeKey] = formatOptions[key];
             }
@@ -33,8 +33,10 @@ namespace ts.server {
         defaultProject: Project;      // project to use by default for file
         fileWatcher: FileWatcher;
         formatCodeOptions = ts.clone(CompilerService.defaultFormatCodeOptions);
+        path: Path;
 
         constructor(private host: ServerHost, public fileName: string, public content: string, public isOpen = false) {
+            this.path = toPath(fileName, host.getCurrentDirectory(), createGetCanonicalFileName(host.useCaseSensitiveFileNames));
             this.svc = ScriptVersionCache.fromString(host, content);
         }
 
@@ -57,12 +59,12 @@ namespace ts.server {
         }
 
         getText() {
-            var snap = this.snap();
+            const snap = this.snap();
             return snap.getText(0, snap.getLength());
         }
 
         getLineInfo(line: number) {
-            var snap = this.snap();
+            const snap = this.snap();
             return snap.index.lineNumberToInfo(line);
         }
 
@@ -84,34 +86,38 @@ namespace ts.server {
     }
 
     export class LSHost implements ts.LanguageServiceHost {
-        ls: ts.LanguageService = null;
+        ls: ts.LanguageService;
         compilationSettings: ts.CompilerOptions;
-        filenameToScript: ts.Map<ScriptInfo> = {};
+        filenameToScript: ts.FileMap<ScriptInfo>;
         roots: ScriptInfo[] = [];
         private resolvedModuleNames: ts.FileMap<Map<TimestampedResolvedModule>>;
         private moduleResolutionHost: ts.ModuleResolutionHost;
+        private getCanonicalFileName: (fileName: string) => string;
 
         constructor(public host: ServerHost, public project: Project) {
-            this.resolvedModuleNames = ts.createFileMap<Map<TimestampedResolvedModule>>(ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames))
+            this.getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
+            this.resolvedModuleNames = createFileMap<Map<TimestampedResolvedModule>>();
+            this.filenameToScript = createFileMap<ScriptInfo>();
             this.moduleResolutionHost = {
                 fileExists: fileName => this.fileExists(fileName),
                 readFile: fileName => this.host.readFile(fileName)
-            }
+            };
         }
 
         resolveModuleNames(moduleNames: string[], containingFile: string): ResolvedModule[] {
-            let currentResolutionsInFile = this.resolvedModuleNames.get(containingFile);
+            const path = toPath(containingFile, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+            const currentResolutionsInFile = this.resolvedModuleNames.get(path);
 
-            let newResolutions: Map<TimestampedResolvedModule> = {};
-            let resolvedModules: ResolvedModule[] = [];
+            const newResolutions: Map<TimestampedResolvedModule> = {};
+            const resolvedModules: ResolvedModule[] = [];
 
-            let compilerOptions = this.getCompilationSettings();
+            const compilerOptions = this.getCompilationSettings();
 
-            for (let moduleName of moduleNames) {
+            for (const moduleName of moduleNames) {
                 // check if this is a duplicate entry in the list
                 let resolution = lookUp(newResolutions, moduleName);
                 if (!resolution) {
-                    let existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, moduleName);
+                    const existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, moduleName);
                     if (moduleResolutionIsValid(existingResolution)) {
                         // ok, it is safe to use existing module resolution results  
                         resolution = existingResolution;
@@ -127,9 +133,9 @@ namespace ts.server {
 
                 resolvedModules.push(resolution.resolvedModule);
             }
-            
+
             // replace old results with a new one
-            this.resolvedModuleNames.set(containingFile, newResolutions);
+            this.resolvedModuleNames.set(path, newResolutions);
             return resolvedModules;
 
             function moduleResolutionIsValid(resolution: TimestampedResolvedModule): boolean {
@@ -142,7 +148,7 @@ namespace ts.server {
                     // TODO: use lastCheckTime to track expiration for module name resolution 
                     return true;
                 }
-                
+
                 // consider situation if we have no candidate locations as valid resolution.
                 // after all there is no point to invalidate it if we have no idea where to look for the module.
                 return resolution.failedLookupLocations.length === 0;
@@ -150,12 +156,12 @@ namespace ts.server {
         }
 
         getDefaultLibFileName() {
-            var nodeModuleBinDir = ts.getDirectoryPath(ts.normalizePath(this.host.getExecutingFilePath()));
+            const nodeModuleBinDir = ts.getDirectoryPath(ts.normalizePath(this.host.getExecutingFilePath()));
             return ts.combinePaths(nodeModuleBinDir, ts.getDefaultLibFileName(this.compilationSettings));
         }
 
         getScriptSnapshot(filename: string): ts.IScriptSnapshot {
-            var scriptInfo = this.getScriptInfo(filename);
+            const scriptInfo = this.getScriptInfo(filename);
             if (scriptInfo) {
                 return scriptInfo.snap();
             }
@@ -168,10 +174,10 @@ namespace ts.server {
         }
 
         lineAffectsRefs(filename: string, line: number) {
-            var info = this.getScriptInfo(filename);
-            var lineInfo = info.getLineInfo(line);
+            const info = this.getScriptInfo(filename);
+            const lineInfo = info.getLineInfo(line);
             if (lineInfo && lineInfo.text) {
-                var regex = /reference|import|\/\*|\*\//;
+                const regex = /reference|import|\/\*|\*\//;
                 return regex.test(lineInfo.text);
             }
         }
@@ -199,58 +205,55 @@ namespace ts.server {
 
         removeReferencedFile(info: ScriptInfo) {
             if (!info.isOpen) {
-                this.filenameToScript[info.fileName] = undefined;
-                this.resolvedModuleNames.remove(info.fileName);
+                this.filenameToScript.remove(info.path);
+                this.resolvedModuleNames.remove(info.path);
             }
         }
 
         getScriptInfo(filename: string): ScriptInfo {
-            var scriptInfo = ts.lookUp(this.filenameToScript, filename);
+            const path = toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+            let scriptInfo = this.filenameToScript.get(path);
             if (!scriptInfo) {
                 scriptInfo = this.project.openReferencedFile(filename);
                 if (scriptInfo) {
-                    this.filenameToScript[scriptInfo.fileName] = scriptInfo;
+                    this.filenameToScript.set(path, scriptInfo);
                 }
             }
-            else {
-            }
             return scriptInfo;
         }
 
         addRoot(info: ScriptInfo) {
-            var scriptInfo = ts.lookUp(this.filenameToScript, info.fileName);
-            if (!scriptInfo) {
-                this.filenameToScript[info.fileName] = info;
+            if (!this.filenameToScript.contains(info.path)) {
+                this.filenameToScript.set(info.path, info);
                 this.roots.push(info);
             }
         }
 
         removeRoot(info: ScriptInfo) {
-            var scriptInfo = ts.lookUp(this.filenameToScript, info.fileName);
-            if (scriptInfo) {
-                this.filenameToScript[info.fileName] = undefined;
+            if (!this.filenameToScript.contains(info.path)) {
+                this.filenameToScript.remove(info.path);
                 this.roots = copyListRemovingItem(info, this.roots);
-                this.resolvedModuleNames.remove(info.fileName);
+                this.resolvedModuleNames.remove(info.path);
             }
         }
 
         saveTo(filename: string, tmpfilename: string) {
-            var script = this.getScriptInfo(filename);
+            const script = this.getScriptInfo(filename);
             if (script) {
-                var snap = script.snap();
+                const snap = script.snap();
                 this.host.writeFile(tmpfilename, snap.getText(0, snap.getLength()));
             }
         }
 
         reloadScript(filename: string, tmpfilename: string, cb: () => any) {
-            var script = this.getScriptInfo(filename);
+            const script = this.getScriptInfo(filename);
             if (script) {
                 script.svc.reloadFromFile(tmpfilename, cb);
             }
         }
 
         editScript(filename: string, start: number, end: number, newText: string) {
-            var script = this.getScriptInfo(filename);
+            const script = this.getScriptInfo(filename);
             if (script) {
                 script.editContent(start, end, newText);
                 return;
@@ -260,14 +263,14 @@ namespace ts.server {
         }
 
         resolvePath(path: string): string {
-            var start = new Date().getTime();
-            var result = this.host.resolvePath(path);
+            const start = new Date().getTime();
+            const result = this.host.resolvePath(path);
             return result;
         }
 
         fileExists(path: string): boolean {
-            var start = new Date().getTime();
-            var result = this.host.fileExists(path);
+            const start = new Date().getTime();
+            const result = this.host.fileExists(path);
             return result;
         }
 
@@ -279,16 +282,17 @@ namespace ts.server {
          *  @param line 1 based index
          */
         lineToTextSpan(filename: string, line: number): ts.TextSpan {
-            var script: ScriptInfo = this.filenameToScript[filename];
-            var index = script.snap().index;
+            const path = toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+            const script: ScriptInfo = this.filenameToScript.get(path);
+            const index = script.snap().index;
 
-            var lineInfo = index.lineNumberToInfo(line + 1);
-            var len: number;
+            const lineInfo = index.lineNumberToInfo(line + 1);
+            let len: number;
             if (lineInfo.leaf) {
                 len = lineInfo.leaf.text.length;
             }
             else {
-                var nextLineInfo = index.lineNumberToInfo(line + 2);
+                const nextLineInfo = index.lineNumberToInfo(line + 2);
                 len = nextLineInfo.offset - lineInfo.offset;
             }
             return ts.createTextSpan(lineInfo.offset, len);
@@ -299,10 +303,11 @@ namespace ts.server {
          * @param offset 1 based index
          */
         lineOffsetToPosition(filename: string, line: number, offset: number): number {
-            var script: ScriptInfo = this.filenameToScript[filename];
-            var index = script.snap().index;
+            const path = toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+            const script: ScriptInfo = this.filenameToScript.get(path);
+            const index = script.snap().index;
 
-            var lineInfo = index.lineNumberToInfo(line);
+            const lineInfo = index.lineNumberToInfo(line);
             // TODO: assert this offset is actually on the line
             return (lineInfo.offset + offset - 1);
         }
@@ -312,36 +317,37 @@ namespace ts.server {
          * @param offset 1-based index
          */
         positionToLineOffset(filename: string, position: number): ILineInfo {
-            var script: ScriptInfo = this.filenameToScript[filename];
-            var index = script.snap().index;
-            var lineOffset = index.charOffsetToLineNumberAndPos(position);
+            const path = toPath(filename, this.host.getCurrentDirectory(), this.getCanonicalFileName);
+            const script: ScriptInfo = this.filenameToScript.get(path);
+            const index = script.snap().index;
+            const lineOffset = index.charOffsetToLineNumberAndPos(position);
             return { line: lineOffset.line, offset: lineOffset.offset + 1 };
         }
     }
 
     // assumes normalized paths
     function getAbsolutePath(filename: string, directory: string) {
-        var rootLength = ts.getRootLength(filename);
+        const rootLength = ts.getRootLength(filename);
         if (rootLength > 0) {
             return filename;
         }
         else {
-            var splitFilename = filename.split('/');
-            var splitDir = directory.split('/');
-            var i = 0;
-            var dirTail = 0;
-            var sflen = splitFilename.length;
-            while ((i < sflen) && (splitFilename[i].charAt(0) == '.')) {
-                var dots = splitFilename[i];
-                if (dots == '..') {
+            const splitFilename = filename.split("/");
+            const splitDir = directory.split("/");
+            let i = 0;
+            let dirTail = 0;
+            const sflen = splitFilename.length;
+            while ((i < sflen) && (splitFilename[i].charAt(0) == ".")) {
+                const dots = splitFilename[i];
+                if (dots == "..") {
                     dirTail++;
                 }
-                else if (dots != '.') {
+                else if (dots != ".") {
                     return undefined;
                 }
                 i++;
             }
-            return splitDir.slice(0, splitDir.length - dirTail).concat(splitFilename.slice(i)).join('/');
+            return splitDir.slice(0, splitDir.length - dirTail).concat(splitFilename.slice(i)).join("/");
         }
     }
 
@@ -365,6 +371,10 @@ namespace ts.server {
         openRefCount = 0;
 
         constructor(public projectService: ProjectService, public projectOptions?: ProjectOptions) {
+            if (projectOptions && projectOptions.files) {
+                // If files are listed explicitly, allow all extensions
+                projectOptions.compilerOptions.allowNonTsExtensions = true;
+            }
             this.compilerService = new CompilerService(this, projectOptions && projectOptions.compilerOptions);
         }
 
@@ -378,7 +388,7 @@ namespace ts.server {
         }
 
         openReferencedFile(filename: string) {
-            return this.projectService.openFile(filename, false);
+            return this.projectService.openFile(filename, /*openedByClient*/ false);
         }
 
         getRootFiles() {
@@ -386,7 +396,7 @@ namespace ts.server {
         }
 
         getFileNames() {
-            let sourceFiles = this.program.getSourceFiles();
+            const sourceFiles = this.program.getSourceFiles();
             return sourceFiles.map(sourceFile => sourceFile.fileName);
         }
 
@@ -395,7 +405,7 @@ namespace ts.server {
         }
 
         getSourceFileFromName(filename: string, requireOpen?: boolean) {
-            var info = this.projectService.getScriptInfo(filename);
+            const info = this.projectService.getScriptInfo(filename);
             if (info) {
                 if ((!requireOpen) || info.isOpen) {
                     return this.getSourceFile(info);
@@ -414,9 +424,9 @@ namespace ts.server {
 
         updateFileMap() {
             this.filenameToSourceFile = {};
-            var sourceFiles = this.program.getSourceFiles();
-            for (var i = 0, len = sourceFiles.length; i < len; i++) {
-                var normFilename = ts.normalizePath(sourceFiles[i].fileName);
+            const sourceFiles = this.program.getSourceFiles();
+            for (let i = 0, len = sourceFiles.length; i < len; i++) {
+                const normFilename = ts.normalizePath(sourceFiles[i].fileName);
                 this.filenameToSourceFile[normFilename] = sourceFiles[i];
             }
         }
@@ -439,14 +449,14 @@ namespace ts.server {
         addRoot(info: ScriptInfo) {
             this.compilerService.host.addRoot(info);
         }
-        
+
         // remove a root file from project
         removeRoot(info: ScriptInfo) {
             this.compilerService.host.removeRoot(info);
         }
 
         filesToString() {
-            var strBuilder = "";
+            let strBuilder = "";
             ts.forEachValue(this.filenameToSourceFile,
                 sourceFile => { strBuilder += sourceFile.fileName + "\n"; });
             return strBuilder;
@@ -455,6 +465,7 @@ namespace ts.server {
         setProjectOptions(projectOptions: ProjectOptions) {
             this.projectOptions = projectOptions;
             if (projectOptions.compilerOptions) {
+                projectOptions.compilerOptions.allowNonTsExtensions = true;
                 this.compilerService.setCompilerOptions(projectOptions.compilerOptions);
             }
         }
@@ -467,8 +478,8 @@ namespace ts.server {
     }
 
     function copyListRemovingItem<T>(item: T, list: T[]) {
-        var copiedList: T[] = [];
-        for (var i = 0, len = list.length; i < len; i++) {
+        const copiedList: T[] = [];
+        for (let i = 0, len = list.length; i < len; i++) {
             if (list[i] != item) {
                 copiedList.push(list[i]);
             }
@@ -514,12 +525,12 @@ namespace ts.server {
             this.hostConfiguration = {
                 formatCodeOptions: ts.clone(CompilerService.defaultFormatCodeOptions),
                 hostInfo: "Unknown host"
-            }
+            };
         }
 
         getFormatCodeOptions(file?: string) {
             if (file) {
-                var info = this.filenameToScriptInfo[file];
+                const info = this.filenameToScriptInfo[file];
                 if (info) {
                     return info.formatCodeOptions;
                 }
@@ -528,7 +539,7 @@ namespace ts.server {
         }
 
         watchedFileChanged(fileName: string) {
-            var info = this.filenameToScriptInfo[fileName];
+            const info = this.filenameToScriptInfo[fileName];
             if (!info) {
                 this.psLogger.info("Error: got watch notification for unknown file: " + fileName);
             }
@@ -572,11 +583,12 @@ namespace ts.server {
         }
 
         handleProjectFilelistChanges(project: Project) {
-            let { succeeded, projectOptions, error } = this.configFileToProjectOptions(project.projectFilename);
-            let newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
-            let currentRootFiles = project.getRootFiles().map((f => this.getCanonicalFileName(f)));
+            const { succeeded, projectOptions, error } = this.configFileToProjectOptions(project.projectFilename);
+            const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
+            const currentRootFiles = project.getRootFiles().map((f => this.getCanonicalFileName(f)));
 
-            if (!arrayStructurallyIsEqualTo(currentRootFiles, newRootFiles)) {
+            // We check if the project file list has changed. If so, we update the project.
+            if (!arrayIsEqualTo(currentRootFiles && currentRootFiles.sort(), newRootFiles && newRootFiles.sort())) {
                 // For configured projects, the change is made outside the tsconfig file, and
                 // it is not likely to affect the project for other files opened by the client. We can 
                 // just update the current project.
@@ -599,13 +611,13 @@ namespace ts.server {
 
             this.log("Detected newly added tsconfig file: " + fileName);
 
-            let { succeeded, projectOptions, error } = this.configFileToProjectOptions(fileName);
-            let rootFilesInTsconfig = projectOptions.files.map(f => this.getCanonicalFileName(f));
-            let openFileRoots = this.openFileRoots.map(s => this.getCanonicalFileName(s.fileName));
+            const { succeeded, projectOptions, error } = this.configFileToProjectOptions(fileName);
+            const rootFilesInTsconfig = projectOptions.files.map(f => this.getCanonicalFileName(f));
+            const openFileRoots = this.openFileRoots.map(s => this.getCanonicalFileName(s.fileName));
 
             // We should only care about the new tsconfig file if it contains any
             // opened root files of existing inferred projects
-            for (let openFileRoot of openFileRoots) {
+            for (const openFileRoot of openFileRoots) {
                 if (rootFilesInTsconfig.indexOf(openFileRoot) >= 0) {
                     this.reloadProjects();
                     return;
@@ -614,7 +626,7 @@ namespace ts.server {
         }
 
         getCanonicalFileName(fileName: string) {
-            let name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
+            const name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
             return ts.normalizePath(name);
         }
 
@@ -630,7 +642,7 @@ namespace ts.server {
 
         setHostConfiguration(args: ts.server.protocol.ConfigureRequestArguments) {
             if (args.file) {
-                var info = this.filenameToScriptInfo[args.file];
+                const info = this.filenameToScriptInfo[args.file];
                 if (info) {
                     info.setFormatOptions(args.formatOptions);
                     this.log("Host configuration update for file " + args.file, "Info");
@@ -653,7 +665,7 @@ namespace ts.server {
         }
 
         createInferredProject(root: ScriptInfo) {
-            var project = new Project(this);
+            const project = new Project(this);
             project.addRoot(root);
 
             let currentPath = ts.getDirectoryPath(root.fileName);
@@ -688,21 +700,21 @@ namespace ts.server {
 
             if (!info.isOpen) {
                 this.filenameToScriptInfo[info.fileName] = undefined;
-                var referencingProjects = this.findReferencingProjects(info);
+                const referencingProjects = this.findReferencingProjects(info);
                 if (info.defaultProject) {
                     info.defaultProject.removeRoot(info);
                 }
-                for (var i = 0, len = referencingProjects.length; i < len; i++) {
+                for (let i = 0, len = referencingProjects.length; i < len; i++) {
                     referencingProjects[i].removeReferencedFile(info);
                 }
-                for (var j = 0, flen = this.openFileRoots.length; j < flen; j++) {
-                    var openFile = this.openFileRoots[j];
+                for (let j = 0, flen = this.openFileRoots.length; j < flen; j++) {
+                    const openFile = this.openFileRoots[j];
                     if (this.eventHandler) {
                         this.eventHandler("context", openFile.defaultProject, openFile.fileName);
                     }
                 }
-                for (var j = 0, flen = this.openFilesReferenced.length; j < flen; j++) {
-                    var openFile = this.openFilesReferenced[j];
+                for (let j = 0, flen = this.openFilesReferenced.length; j < flen; j++) {
+                    const openFile = this.openFilesReferenced[j];
                     if (this.eventHandler) {
                         this.eventHandler("context", openFile.defaultProject, openFile.fileName);
                     }
@@ -713,8 +725,8 @@ namespace ts.server {
         }
 
         updateConfiguredProjectList() {
-            var configuredProjects: Project[] = [];
-            for (var i = 0, len = this.configuredProjects.length; i < len; i++) {
+            const configuredProjects: Project[] = [];
+            for (let i = 0, len = this.configuredProjects.length; i < len; i++) {
                 if (this.configuredProjects[i].openRefCount > 0) {
                     configuredProjects.push(this.configuredProjects[i]);
                 }
@@ -730,7 +742,7 @@ namespace ts.server {
                 this.configuredProjects = copyListRemovingItem(project, this.configuredProjects);
             }
             else {
-                for (let directory of project.directoriesWatchedForTsconfig) {
+                for (const directory of project.directoriesWatchedForTsconfig) {
                     // if the ref count for this directory watcher drops to 0, it's time to close it
                     if (!(--project.projectService.directoryWatchersRefCount[directory])) {
                         this.log("Close directory watcher for: " + directory);
@@ -741,9 +753,9 @@ namespace ts.server {
                 this.inferredProjects = copyListRemovingItem(project, this.inferredProjects);
             }
 
-            let fileNames = project.getFileNames();
-            for (let fileName of fileNames) {
-                let info = this.getScriptInfo(fileName);
+            const fileNames = project.getFileNames();
+            for (const fileName of fileNames) {
+                const info = this.getScriptInfo(fileName);
                 if (info.defaultProject == project) {
                     info.defaultProject = undefined;
                 }
@@ -751,8 +763,8 @@ namespace ts.server {
         }
 
         setConfiguredProjectRoot(info: ScriptInfo) {
-            for (var i = 0, len = this.configuredProjects.length; i < len; i++) {
-                let configuredProject = this.configuredProjects[i];
+            for (let i = 0, len = this.configuredProjects.length; i < len; i++) {
+                const configuredProject = this.configuredProjects[i];
                 if (configuredProject.isRoot(info)) {
                     info.defaultProject = configuredProject;
                     configuredProject.addOpenRef();
@@ -774,10 +786,10 @@ namespace ts.server {
                 else {
                     // create new inferred project p with the newly opened file as root
                     info.defaultProject = this.createInferredProject(info);
-                    var openFileRoots: ScriptInfo[] = [];
+                    const openFileRoots: ScriptInfo[] = [];
                     // for each inferred project root r
-                    for (var i = 0, len = this.openFileRoots.length; i < len; i++) {
-                        var r = this.openFileRoots[i];
+                    for (let i = 0, len = this.openFileRoots.length; i < len; i++) {
+                        const r = this.openFileRoots[i];
                         // if r referenced by the new project
                         if (info.defaultProject.getSourceFile(r)) {
                             // remove project rooted at r
@@ -809,9 +821,9 @@ namespace ts.server {
             // to the disk, and the server's version of the file can be out of sync.
             info.svc.reloadFromFile(info.fileName);
 
-            var openFileRoots: ScriptInfo[] = [];
-            var removedProject: Project;
-            for (var i = 0, len = this.openFileRoots.length; i < len; i++) {
+            const openFileRoots: ScriptInfo[] = [];
+            let removedProject: Project;
+            for (let i = 0, len = this.openFileRoots.length; i < len; i++) {
                 // if closed file is root of project
                 if (info === this.openFileRoots[i]) {
                     // remove that project and remember it
@@ -823,9 +835,9 @@ namespace ts.server {
             }
             this.openFileRoots = openFileRoots;
             if (!removedProject) {
-                var openFileRootsConfigured: ScriptInfo[] = [];
+                const openFileRootsConfigured: ScriptInfo[] = [];
 
-                for (var i = 0, len = this.openFileRootsConfigured.length; i < len; i++) {
+                for (let i = 0, len = this.openFileRootsConfigured.length; i < len; i++) {
                     if (info === this.openFileRootsConfigured[i]) {
                         if (info.defaultProject.deleteOpenRef() === 0) {
                             removedProject = info.defaultProject;
@@ -840,11 +852,11 @@ namespace ts.server {
             }
             if (removedProject) {
                 this.removeProject(removedProject);
-                var openFilesReferenced: ScriptInfo[] = [];
-                var orphanFiles: ScriptInfo[] = [];
+                const openFilesReferenced: ScriptInfo[] = [];
+                const orphanFiles: ScriptInfo[] = [];
                 // for all open, referenced files f
-                for (var i = 0, len = this.openFilesReferenced.length; i < len; i++) {
-                    var f = this.openFilesReferenced[i];
+                for (let i = 0, len = this.openFilesReferenced.length; i < len; i++) {
+                    const f = this.openFilesReferenced[i];
                     // if f was referenced by the removed project, remember it
                     if (f.defaultProject === removedProject || !f.defaultProject) {
                         f.defaultProject = undefined;
@@ -857,7 +869,7 @@ namespace ts.server {
                 }
                 this.openFilesReferenced = openFilesReferenced;
                 // treat orphaned files as newly opened
-                for (var i = 0, len = orphanFiles.length; i < len; i++) {
+                for (let i = 0, len = orphanFiles.length; i < len; i++) {
                     this.addOpenFile(orphanFiles[i]);
                 }
             }
@@ -868,10 +880,10 @@ namespace ts.server {
         }
 
         findReferencingProjects(info: ScriptInfo, excludedProject?: Project) {
-            var referencingProjects: Project[] = [];
+            const referencingProjects: Project[] = [];
             info.defaultProject = undefined;
-            for (var i = 0, len = this.inferredProjects.length; i < len; i++) {
-                var inferredProject = this.inferredProjects[i];
+            for (let i = 0, len = this.inferredProjects.length; i < len; i++) {
+                const inferredProject = this.inferredProjects[i];
                 inferredProject.updateGraph();
                 if (inferredProject !== excludedProject) {
                     if (inferredProject.getSourceFile(info)) {
@@ -880,8 +892,8 @@ namespace ts.server {
                     }
                 }
             }
-            for (var i = 0, len = this.configuredProjects.length; i < len; i++) {
-                var configuredProject = this.configuredProjects[i];
+            for (let i = 0, len = this.configuredProjects.length; i < len; i++) {
+                const configuredProject = this.configuredProjects[i];
                 configuredProject.updateGraph();
                 if (configuredProject.getSourceFile(info)) {
                     info.defaultProject = configuredProject;
@@ -896,7 +908,7 @@ namespace ts.server {
         reloadProjects() {
             this.log("reload projects.");
             // First check if there is new tsconfig file added for inferred project roots
-            for (let info of this.openFileRoots) {
+            for (const info of this.openFileRoots) {
                 this.openOrUpdateConfiguredProjectForFile(info.fileName);
             }
             this.updateProjectStructure();
@@ -911,10 +923,10 @@ namespace ts.server {
             this.log("updating project structure from ...", "Info");
             this.printProjects();
 
-            let unattachedOpenFiles: ScriptInfo[] = [];
-            let openFileRootsConfigured: ScriptInfo[] = [];
-            for (let info of this.openFileRootsConfigured) {
-                let project = info.defaultProject;
+            const unattachedOpenFiles: ScriptInfo[] = [];
+            const openFileRootsConfigured: ScriptInfo[] = [];
+            for (const info of this.openFileRootsConfigured) {
+                const project = info.defaultProject;
                 if (!project || !(project.getSourceFile(info))) {
                     info.defaultProject = undefined;
                     unattachedOpenFiles.push(info);
@@ -929,11 +941,11 @@ namespace ts.server {
             // project roots.  For each referenced file, see if the default project still
             // references that file.  If so, then just keep the file in the referenced list.
             // If not, add the file to an unattached list, to be rechecked later.
-            var openFilesReferenced: ScriptInfo[] = [];
-            for (var i = 0, len = this.openFilesReferenced.length; i < len; i++) {
-                var referencedFile = this.openFilesReferenced[i];
+            const openFilesReferenced: ScriptInfo[] = [];
+            for (let i = 0, len = this.openFilesReferenced.length; i < len; i++) {
+                const referencedFile = this.openFilesReferenced[i];
                 referencedFile.defaultProject.updateGraph();
-                var sourceFile = referencedFile.defaultProject.getSourceFile(referencedFile);
+                const sourceFile = referencedFile.defaultProject.getSourceFile(referencedFile);
                 if (sourceFile) {
                     openFilesReferenced.push(referencedFile);
                 }
@@ -950,11 +962,11 @@ namespace ts.server {
             // projects newly references the file, remove its project from the
             // inferred projects list (since it is no longer a root) and add
             // the file to the open, referenced file list.
-            var openFileRoots: ScriptInfo[] = [];
-            for (var i = 0, len = this.openFileRoots.length; i < len; i++) {
-                var rootFile = this.openFileRoots[i];
-                var rootedProject = rootFile.defaultProject;
-                var referencingProjects = this.findReferencingProjects(rootFile, rootedProject);
+            const openFileRoots: ScriptInfo[] = [];
+            for (let i = 0, len = this.openFileRoots.length; i < len; i++) {
+                const rootFile = this.openFileRoots[i];
+                const rootedProject = rootFile.defaultProject;
+                const referencingProjects = this.findReferencingProjects(rootFile, rootedProject);
 
                 if (rootFile.defaultProject && rootFile.defaultProject.isConfiguredProject()) {
                     // If the root file has already been added into a configured project,
@@ -981,7 +993,7 @@ namespace ts.server {
             // Finally, if we found any open, referenced files that are no longer
             // referenced by their default project, treat them as newly opened
             // by the editor.
-            for (var i = 0, len = unattachedOpenFiles.length; i < len; i++) {
+            for (let i = 0, len = unattachedOpenFiles.length; i < len; i++) {
                 this.addOpenFile(unattachedOpenFiles[i]);
             }
             this.printProjects();
@@ -994,14 +1006,15 @@ namespace ts.server {
 
         /**
          * @param filename is absolute pathname
+         * @param fileContent is a known version of the file content that is more up to date than the one on disk
          */
-        openFile(fileName: string, openedByClient: boolean) {
+        openFile(fileName: string, openedByClient: boolean, fileContent?: string) {
             fileName = ts.normalizePath(fileName);
-            var info = ts.lookUp(this.filenameToScriptInfo, fileName);
+            let info = ts.lookUp(this.filenameToScriptInfo, fileName);
             if (!info) {
-                var content: string;
+                let content: string;
                 if (this.host.fileExists(fileName)) {
-                    content = this.host.readFile(fileName);
+                    content = fileContent || this.host.readFile(fileName);
                 }
                 if (!content) {
                     if (openedByClient) {
@@ -1009,7 +1022,6 @@ namespace ts.server {
                     }
                 }
                 if (content !== undefined) {
-                    var indentSize: number;
                     info = new ScriptInfo(this.host, fileName, content, openedByClient);
                     info.setFormatOptions(this.getFormatCodeOptions());
                     this.filenameToScriptInfo[fileName] = info;
@@ -1019,6 +1031,9 @@ namespace ts.server {
                 }
             }
             if (info) {
+                if (fileContent) {
+                    info.svc.reload(fileContent);
+                }
                 if (openedByClient) {
                     info.isOpen = true;
                 }
@@ -1033,11 +1048,11 @@ namespace ts.server {
         // the newly opened file.
         findConfigFile(searchPath: string): string {
             while (true) {
-                var fileName = ts.combinePaths(searchPath, "tsconfig.json");
+                const fileName = ts.combinePaths(searchPath, "tsconfig.json");
                 if (this.host.fileExists(fileName)) {
                     return fileName;
                 }
-                var parentPath = ts.getDirectoryPath(searchPath);
+                const parentPath = ts.getDirectoryPath(searchPath);
                 if (parentPath === searchPath) {
                     break;
                 }
@@ -1049,10 +1064,11 @@ namespace ts.server {
         /**
          * Open file whose contents is managed by the client
          * @param filename is absolute pathname
+         * @param fileContent is a known version of the file content that is more up to date than the one on disk
          */
-        openClientFile(fileName: string) {
+        openClientFile(fileName: string, fileContent?: string) {
             this.openOrUpdateConfiguredProjectForFile(fileName);
-            var info = this.openFile(fileName, true);
+            const info = this.openFile(fileName, /*openedByClient*/ true, fileContent);
             this.addOpenFile(info);
             this.printProjects();
             return info;
@@ -1064,14 +1080,14 @@ namespace ts.server {
          * the tsconfig file content and update the project; otherwise we create a new one. 
          */
         openOrUpdateConfiguredProjectForFile(fileName: string) {
-            let searchPath = ts.normalizePath(getDirectoryPath(fileName));
+            const searchPath = ts.normalizePath(getDirectoryPath(fileName));
             this.log("Search path: " + searchPath, "Info");
-            let configFileName = this.findConfigFile(searchPath);
+            const configFileName = this.findConfigFile(searchPath);
             if (configFileName) {
                 this.log("Config file name: " + configFileName, "Info");
-                let project = this.findConfiguredProjectByConfigFile(configFileName);
+                const project = this.findConfiguredProjectByConfigFile(configFileName);
                 if (!project) {
-                    var configResult = this.openConfigFile(configFileName, fileName);
+                    const configResult = this.openConfigFile(configFileName, fileName);
                     if (!configResult.success) {
                         this.log("Error opening config file " + configFileName + " " + configResult.errorMsg);
                     }
@@ -1095,7 +1111,7 @@ namespace ts.server {
          */
 
         closeClientFile(filename: string) {
-            var info = ts.lookUp(this.filenameToScriptInfo, filename);
+            const info = ts.lookUp(this.filenameToScriptInfo, filename);
             if (info) {
                 this.closeOpenFile(info);
                 info.isOpen = false;
@@ -1104,19 +1120,19 @@ namespace ts.server {
         }
 
         getProjectForFile(filename: string) {
-            var scriptInfo = ts.lookUp(this.filenameToScriptInfo, filename);
+            const scriptInfo = ts.lookUp(this.filenameToScriptInfo, filename);
             if (scriptInfo) {
                 return scriptInfo.defaultProject;
             }
         }
 
         printProjectsForFile(filename: string) {
-            var scriptInfo = ts.lookUp(this.filenameToScriptInfo, filename);
+            const scriptInfo = ts.lookUp(this.filenameToScriptInfo, filename);
             if (scriptInfo) {
                 this.psLogger.startGroup();
-                this.psLogger.info("Projects for " + filename)
-                var projects = this.findReferencingProjects(scriptInfo);
-                for (var i = 0, len = projects.length; i < len; i++) {
+                this.psLogger.info("Projects for " + filename);
+                const projects = this.findReferencingProjects(scriptInfo);
+                for (let i = 0, len = projects.length; i < len; i++) {
                     this.psLogger.info("Project " + i.toString());
                 }
                 this.psLogger.endGroup();
@@ -1131,34 +1147,34 @@ namespace ts.server {
                 return;
             }
             this.psLogger.startGroup();
-            for (var i = 0, len = this.inferredProjects.length; i < len; i++) {
-                var project = this.inferredProjects[i];
+            for (let i = 0, len = this.inferredProjects.length; i < len; i++) {
+                const project = this.inferredProjects[i];
                 project.updateGraph();
                 this.psLogger.info("Project " + i.toString());
                 this.psLogger.info(project.filesToString());
                 this.psLogger.info("-----------------------------------------------");
             }
-            for (var i = 0, len = this.configuredProjects.length; i < len; i++) {
-                var project = this.configuredProjects[i];
+            for (let i = 0, len = this.configuredProjects.length; i < len; i++) {
+                const project = this.configuredProjects[i];
                 project.updateGraph();
                 this.psLogger.info("Project (configured) " + (i + this.inferredProjects.length).toString());
                 this.psLogger.info(project.filesToString());
                 this.psLogger.info("-----------------------------------------------");
             }
-            this.psLogger.info("Open file roots of inferred projects: ")
-            for (var i = 0, len = this.openFileRoots.length; i < len; i++) {
+            this.psLogger.info("Open file roots of inferred projects: ");
+            for (let i = 0, len = this.openFileRoots.length; i < len; i++) {
                 this.psLogger.info(this.openFileRoots[i].fileName);
             }
-            this.psLogger.info("Open files referenced by inferred or configured projects: ")
-            for (var i = 0, len = this.openFilesReferenced.length; i < len; i++) {
-                var fileInfo = this.openFilesReferenced[i].fileName;
+            this.psLogger.info("Open files referenced by inferred or configured projects: ");
+            for (let i = 0, len = this.openFilesReferenced.length; i < len; i++) {
+                let fileInfo = this.openFilesReferenced[i].fileName;
                 if (this.openFilesReferenced[i].defaultProject.isConfiguredProject()) {
                     fileInfo += " (configured)";
                 }
                 this.psLogger.info(fileInfo);
             }
-            this.psLogger.info("Open file roots of configured projects: ")
-            for (var i = 0, len = this.openFileRootsConfigured.length; i < len; i++) {
+            this.psLogger.info("Open file roots of configured projects: ");
+            for (let i = 0, len = this.openFileRootsConfigured.length; i < len; i++) {
                 this.psLogger.info(this.openFileRootsConfigured[i].fileName);
             }
             this.psLogger.endGroup();
@@ -1169,7 +1185,7 @@ namespace ts.server {
         }
 
         findConfiguredProjectByConfigFile(configFileName: string) {
-            for (var i = 0, len = this.configuredProjects.length; i < len; i++) {
+            for (let i = 0, len = this.configuredProjects.length; i < len; i++) {
                 if (this.configuredProjects[i].projectFilename == configFileName) {
                     return this.configuredProjects[i];
                 }
@@ -1180,22 +1196,24 @@ namespace ts.server {
         configFileToProjectOptions(configFilename: string): { succeeded: boolean, projectOptions?: ProjectOptions, error?: ProjectOpenResult } {
             configFilename = ts.normalizePath(configFilename);
             // file references will be relative to dirPath (or absolute)
-            var dirPath = ts.getDirectoryPath(configFilename);
-            var contents = this.host.readFile(configFilename)
-            var rawConfig: { config?: ProjectOptions; error?: Diagnostic; } = ts.parseConfigFileTextToJson(configFilename, contents);
+            const dirPath = ts.getDirectoryPath(configFilename);
+            const contents = this.host.readFile(configFilename);
+            const rawConfig: { config?: ProjectOptions; error?: Diagnostic; } = ts.parseConfigFileTextToJson(configFilename, contents);
             if (rawConfig.error) {
                 return { succeeded: false, error: rawConfig.error };
             }
             else {
-                var parsedCommandLine = ts.parseJsonConfigFileContent(rawConfig.config, this.host, dirPath);
+                const parsedCommandLine = ts.parseJsonConfigFileContent(rawConfig.config, this.host, dirPath);
+                Debug.assert(!!parsedCommandLine.fileNames);
+
                 if (parsedCommandLine.errors && (parsedCommandLine.errors.length > 0)) {
                     return { succeeded: false, error: { errorMsg: "tsconfig option errors" } };
                 }
-                else if (parsedCommandLine.fileNames == null) {
+                else if (parsedCommandLine.fileNames.length === 0) {
                     return { succeeded: false, error: { errorMsg: "no files found" } };
                 }
                 else {
-                    var projectOptions: ProjectOptions = {
+                    const projectOptions: ProjectOptions = {
                         files: parsedCommandLine.fileNames,
                         compilerOptions: parsedCommandLine.options
                     };
@@ -1206,15 +1224,15 @@ namespace ts.server {
         }
 
         openConfigFile(configFilename: string, clientFileName?: string): ProjectOpenResult {
-            let { succeeded, projectOptions, error } = this.configFileToProjectOptions(configFilename);
+            const { succeeded, projectOptions, error } = this.configFileToProjectOptions(configFilename);
             if (!succeeded) {
                 return error;
             }
             else {
-                let project = this.createProject(configFilename, projectOptions);
-                for (let rootFilename of projectOptions.files) {
+                const project = this.createProject(configFilename, projectOptions);
+                for (const rootFilename of projectOptions.files) {
                     if (this.host.fileExists(rootFilename)) {
-                        let info = this.openFile(rootFilename, /*openedByClient*/ clientFileName == rootFilename);
+                        const info = this.openFile(rootFilename, /*openedByClient*/ clientFileName == rootFilename);
                         project.addRoot(info);
                     }
                     else {
@@ -1239,27 +1257,27 @@ namespace ts.server {
                 this.removeProject(project);
             }
             else {
-                let { succeeded, projectOptions, error } = this.configFileToProjectOptions(project.projectFilename);
+                const { succeeded, projectOptions, error } = this.configFileToProjectOptions(project.projectFilename);
                 if (!succeeded) {
                     return error;
                 }
                 else {
-                    let oldFileNames = project.compilerService.host.roots.map(info => info.fileName);
-                    let newFileNames = projectOptions.files;
-                    let fileNamesToRemove = oldFileNames.filter(f => newFileNames.indexOf(f) < 0);
-                    let fileNamesToAdd = newFileNames.filter(f => oldFileNames.indexOf(f) < 0);
+                    const oldFileNames = project.compilerService.host.roots.map(info => info.fileName);
+                    const newFileNames = projectOptions.files;
+                    const fileNamesToRemove = oldFileNames.filter(f => newFileNames.indexOf(f) < 0);
+                    const fileNamesToAdd = newFileNames.filter(f => oldFileNames.indexOf(f) < 0);
 
-                    for (let fileName of fileNamesToRemove) {
-                        let info = this.getScriptInfo(fileName);
+                    for (const fileName of fileNamesToRemove) {
+                        const info = this.getScriptInfo(fileName);
                         if (info) {
                             project.removeRoot(info);
                         }
                     }
 
-                    for (let fileName of fileNamesToAdd) {
+                    for (const fileName of fileNamesToAdd) {
                         let info = this.getScriptInfo(fileName);
                         if (!info) {
-                            info = this.openFile(fileName, false);
+                            info = this.openFile(fileName, /*openedByClient*/ false);
                         }
                         else {
                             // if the root file was opened by client, it would belong to either 
@@ -1267,11 +1285,15 @@ namespace ts.server {
                             if (info.isOpen) {
                                 if (this.openFileRoots.indexOf(info) >= 0) {
                                     this.openFileRoots = copyListRemovingItem(info, this.openFileRoots);
+                                    if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {
+                                        this.removeProject(info.defaultProject);
+                                    }
                                 }
                                 if (this.openFilesReferenced.indexOf(info) >= 0) {
                                     this.openFilesReferenced = copyListRemovingItem(info, this.openFilesReferenced);
                                 }
                                 this.openFileRootsConfigured.push(info);
+                                info.defaultProject = project;
                             }
                         }
                         project.addRoot(info);
@@ -1284,7 +1306,7 @@ namespace ts.server {
         }
 
         createProject(projectFilename: string, projectOptions?: ProjectOptions) {
-            var project = new Project(this, projectOptions);
+            const project = new Project(this, projectOptions);
             project.projectFilename = projectFilename;
             return project;
         }
@@ -1304,7 +1326,9 @@ namespace ts.server {
                 this.setCompilerOptions(opt);
             }
             else {
-                this.setCompilerOptions(ts.getDefaultCompilerOptions());
+                const defaultOpts = ts.getDefaultCompilerOptions();
+                defaultOpts.allowNonTsExtensions = true;
+                this.setCompilerOptions(defaultOpts);
             }
             this.languageService = ts.createLanguageService(this.host, this.documentRegistry);
             this.classifier = ts.createClassifier();
@@ -1316,14 +1340,14 @@ namespace ts.server {
         }
 
         isExternalModule(filename: string): boolean {
-            var sourceFile = this.languageService.getSourceFile(filename);
+            const sourceFile = this.languageService.getSourceFile(filename);
             return ts.isExternalModule(sourceFile);
         }
 
         static defaultFormatCodeOptions: ts.FormatCodeOptions = {
             IndentSize: 4,
             TabSize: 4,
-            NewLineCharacter: ts.sys ? ts.sys.newLine : '\n',
+            NewLineCharacter: ts.sys ? ts.sys.newLine : "\n",
             ConvertTabsToSpaces: true,
             IndentStyle: ts.IndentStyle.Smart,
             InsertSpaceAfterCommaDelimiter: true,
@@ -1335,7 +1359,7 @@ namespace ts.server {
             InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
             PlaceOpenBraceOnNewLineForFunctions: false,
             PlaceOpenBraceOnNewLineForControlBlocks: false,
-        }
+        };
     }
 
     export interface LineCollection {
@@ -1409,17 +1433,17 @@ namespace ts.server {
             else {
                 insertedText = this.initialText + this.trailingText;
             }
-            var lm = LineIndex.linesFromText(insertedText);
-            var lines = lm.lines;
+            const lm = LineIndex.linesFromText(insertedText);
+            const lines = lm.lines;
             if (lines.length > 1) {
                 if (lines[lines.length - 1] == "") {
                     lines.length--;
                 }
             }
-            var branchParent: LineNode;
-            var lastZeroCount: LineCollection;
+            let branchParent: LineNode;
+            let lastZeroCount: LineCollection;
 
-            for (var k = this.endBranch.length - 1; k >= 0; k--) {
+            for (let k = this.endBranch.length - 1; k >= 0; k--) {
                 (<LineNode>this.endBranch[k]).updateCounts();
                 if (this.endBranch[k].charCount() === 0) {
                     lastZeroCount = this.endBranch[k];
@@ -1436,29 +1460,29 @@ namespace ts.server {
             }
 
             // path at least length two (root and leaf)
-            var insertionNode = <LineNode>this.startPath[this.startPath.length - 2];
-            var leafNode = <LineLeaf>this.startPath[this.startPath.length - 1];
-            var len = lines.length;
+            let insertionNode = <LineNode>this.startPath[this.startPath.length - 2];
+            const leafNode = <LineLeaf>this.startPath[this.startPath.length - 1];
+            const len = lines.length;
 
             if (len > 0) {
                 leafNode.text = lines[0];
 
                 if (len > 1) {
-                    var insertedNodes = <LineCollection[]>new Array(len - 1);
-                    var startNode = <LineCollection>leafNode;
-                    for (var i = 1, len = lines.length; i < len; i++) {
+                    let insertedNodes = <LineCollection[]>new Array(len - 1);
+                    let startNode = <LineCollection>leafNode;
+                    for (let i = 1, len = lines.length; i < len; i++) {
                         insertedNodes[i - 1] = new LineLeaf(lines[i]);
                     }
-                    var pathIndex = this.startPath.length - 2;
+                    let pathIndex = this.startPath.length - 2;
                     while (pathIndex >= 0) {
                         insertionNode = <LineNode>this.startPath[pathIndex];
                         insertedNodes = insertionNode.insertAt(startNode, insertedNodes);
                         pathIndex--;
                         startNode = insertionNode;
                     }
-                    var insertedNodesLen = insertedNodes.length;
+                    let insertedNodesLen = insertedNodes.length;
                     while (insertedNodesLen > 0) {
-                        var newRoot = new LineNode();
+                        const newRoot = new LineNode();
                         newRoot.add(this.lineIndex.root);
                         insertedNodes = newRoot.insertAt(this.lineIndex.root, insertedNodes);
                         insertedNodesLen = insertedNodes.length;
@@ -1467,7 +1491,7 @@ namespace ts.server {
                     this.lineIndex.root.updateCounts();
                 }
                 else {
-                    for (var j = this.startPath.length - 2; j >= 0; j--) {
+                    for (let j = this.startPath.length - 2; j >= 0; j--) {
                         (<LineNode>this.startPath[j]).updateCounts();
                     }
                 }
@@ -1475,7 +1499,7 @@ namespace ts.server {
             else {
                 // no content for leaf node, so delete it
                 insertionNode.remove(leafNode);
-                for (var j = this.startPath.length - 2; j >= 0; j--) {
+                for (let j = this.startPath.length - 2; j >= 0; j--) {
                     (<LineNode>this.startPath[j]).updateCounts();
                 }
             }
@@ -1496,7 +1520,7 @@ namespace ts.server {
 
         pre(relativeStart: number, relativeLength: number, lineCollection: LineCollection, parent: LineCollection, nodeType: CharRangeSection) {
             // currentNode corresponds to parent, but in the new tree
-            var currentNode = this.stack[this.stack.length - 1];
+            const currentNode = this.stack[this.stack.length - 1];
 
             if ((this.state === CharRangeSection.Entire) && (nodeType === CharRangeSection.Start)) {
                 // if range is on single line, we will never make this state transition
@@ -1505,7 +1529,7 @@ namespace ts.server {
                 this.lineCollectionAtBranch = lineCollection;
             }
 
-            var child: LineCollection;
+            let child: LineCollection;
             function fresh(node: LineCollection): LineCollection {
                 if (node.isLeaf()) {
                     return new LineLeaf("");
@@ -1630,7 +1654,7 @@ namespace ts.server {
         }
 
         reloadFromFile(filename: string, cb?: () => any) {
-            var content = this.host.readFile(filename);
+            const content = this.host.readFile(filename);
             this.reload(content);
             if (cb)
                 cb();
@@ -1640,13 +1664,13 @@ namespace ts.server {
         reload(script: string) {
             this.currentVersion++;
             this.changes = []; // history wiped out by reload
-            var snap = new LineIndexSnapshot(this.currentVersion, this);
+            const snap = new LineIndexSnapshot(this.currentVersion, this);
             this.versions[this.currentVersion] = snap;
             snap.index = new LineIndex();
-            var lm = LineIndex.linesFromText(script);
+            const lm = LineIndex.linesFromText(script);
             snap.index.load(lm.lines);
             // REVIEW: could use linked list
-            for (var i = this.minVersion; i < this.currentVersion; i++) {
+            for (let i = this.minVersion; i < this.currentVersion; i++) {
                 this.versions[i] = undefined;
             }
             this.minVersion = this.currentVersion;
@@ -1654,11 +1678,11 @@ namespace ts.server {
         }
 
         getSnapshot() {
-            var snap = this.versions[this.currentVersion];
+            let snap = this.versions[this.currentVersion];
             if (this.changes.length > 0) {
-                var snapIndex = this.latest().index;
-                for (var i = 0, len = this.changes.length; i < len; i++) {
-                    var change = this.changes[i];
+                let snapIndex = this.latest().index;
+                for (let i = 0, len = this.changes.length; i < len; i++) {
+                    const change = this.changes[i];
                     snapIndex = snapIndex.edit(change.pos, change.deleteLen, change.insertedText);
                 }
                 snap = new LineIndexSnapshot(this.currentVersion + 1, this);
@@ -1668,9 +1692,9 @@ namespace ts.server {
                 this.versions[snap.version] = snap;
                 this.changes = [];
                 if ((this.currentVersion - this.minVersion) >= ScriptVersionCache.maxVersions) {
-                    var oldMin = this.minVersion;
+                    const oldMin = this.minVersion;
                     this.minVersion = (this.currentVersion - ScriptVersionCache.maxVersions) + 1;
-                    for (var j = oldMin; j < this.minVersion; j++) {
+                    for (let j = oldMin; j < this.minVersion; j++) {
                         this.versions[j] = undefined;
                     }
                 }
@@ -1681,11 +1705,11 @@ namespace ts.server {
         getTextChangesBetweenVersions(oldVersion: number, newVersion: number) {
             if (oldVersion < newVersion) {
                 if (oldVersion >= this.minVersion) {
-                    var textChangeRanges: ts.TextChangeRange[] = [];
-                    for (var i = oldVersion + 1; i <= newVersion; i++) {
-                        var snap = this.versions[i];
-                        for (var j = 0, len = snap.changesSincePreviousVersion.length; j < len; j++) {
-                            var textChange = snap.changesSincePreviousVersion[j];
+                    const textChangeRanges: ts.TextChangeRange[] = [];
+                    for (let i = oldVersion + 1; i <= newVersion; i++) {
+                        const snap = this.versions[i];
+                        for (let j = 0, len = snap.changesSincePreviousVersion.length; j < len; j++) {
+                            const textChange = snap.changesSincePreviousVersion[j];
                             textChangeRanges[textChangeRanges.length] = textChange.getTextChangeRange();
                         }
                     }
@@ -1701,12 +1725,12 @@ namespace ts.server {
         }
 
         static fromString(host: ServerHost, script: string) {
-            var svc = new ScriptVersionCache();
-            var snap = new LineIndexSnapshot(0, svc);
+            const svc = new ScriptVersionCache();
+            const snap = new LineIndexSnapshot(0, svc);
             svc.versions[svc.currentVersion] = snap;
             svc.host = host;
             snap.index = new LineIndex();
-            var lm = LineIndex.linesFromText(script);
+            const lm = LineIndex.linesFromText(script);
             snap.index.load(lm.lines);
             return svc;
         }
@@ -1729,9 +1753,9 @@ namespace ts.server {
 
         // this requires linear space so don't hold on to these
         getLineStartPositions(): number[] {
-            var starts: number[] = [-1];
-            var count = 1;
-            var pos = 0;
+            const starts: number[] = [-1];
+            let count = 1;
+            let pos = 0;
             this.index.every((ll, s, len) => {
                 starts[count++] = pos;
                 pos += ll.text.length;
@@ -1755,7 +1779,7 @@ namespace ts.server {
             }
         }
         getChangeRange(oldSnapshot: ts.IScriptSnapshot): ts.TextChangeRange {
-            var oldSnap = <LineIndexSnapshot>oldSnapshot;
+            const oldSnap = <LineIndexSnapshot>oldSnapshot;
             return this.getTextChangeRangeSinceVersion(oldSnap.version);
         }
     }
@@ -1770,9 +1794,9 @@ namespace ts.server {
         }
 
         lineNumberToInfo(lineNumber: number): ILineInfo {
-            var lineCount = this.root.lineCount();
+            const lineCount = this.root.lineCount();
             if (lineNumber <= lineCount) {
-                var lineInfo = this.root.lineNumberToInfo(lineNumber, 0);
+                const lineInfo = this.root.lineNumberToInfo(lineNumber, 0);
                 lineInfo.line = lineNumber;
                 return lineInfo;
             }
@@ -1780,14 +1804,14 @@ namespace ts.server {
                 return {
                     line: lineNumber,
                     offset: this.root.charCount()
-                }
+                };
             }
         }
 
         load(lines: string[]) {
             if (lines.length > 0) {
-                var leaves: LineLeaf[] = [];
-                for (var i = 0, len = lines.length; i < len; i++) {
+                const leaves: LineLeaf[] = [];
+                for (let i = 0, len = lines.length; i < len; i++) {
                     leaves[i] = new LineLeaf(lines[i]);
                 }
                 this.root = LineIndex.buildTreeFromBottom(leaves);
@@ -1802,7 +1826,7 @@ namespace ts.server {
         }
 
         getText(rangeStart: number, rangeLength: number) {
-            var accum = "";
+            let accum = "";
             if ((rangeLength > 0) && (rangeStart < this.root.charCount())) {
                 this.walk(rangeStart, rangeLength, {
                     goSubtree: true,
@@ -1823,7 +1847,7 @@ namespace ts.server {
             if (!rangeEnd) {
                 rangeEnd = this.root.charCount();
             }
-            var walkFns = {
+            const walkFns = {
                 goSubtree: true,
                 done: false,
                 leaf: function (relativeStart: number, relativeLength: number, ll: LineLeaf) {
@@ -1831,7 +1855,7 @@ namespace ts.server {
                         this.done = true;
                     }
                 }
-            }
+            };
             this.walk(rangeStart, rangeEnd - rangeStart, walkFns);
             return !walkFns.done;
         }
@@ -1848,14 +1872,15 @@ namespace ts.server {
                 }
             }
             else {
+                let checkText: string;
                 if (this.checkEdits) {
-                    var checkText = editFlat(this.getText(0, this.root.charCount()), pos, deleteLength, newText);
+                    checkText = editFlat(this.getText(0, this.root.charCount()), pos, deleteLength, newText);
                 }
-                var walker = new EditWalker();
+                const walker = new EditWalker();
                 if (pos >= this.root.charCount()) {
                     // insert at end
                     pos = this.root.charCount() - 1;
-                    var endString = this.getText(pos, 1);
+                    const endString = this.getText(pos, 1);
                     if (newText) {
                         newText = endString + newText;
                     }
@@ -1867,8 +1892,8 @@ namespace ts.server {
                 }
                 else if (deleteLength > 0) {
                     // check whether last characters deleted are line break
-                    var e = pos + deleteLength;
-                    var lineInfo = this.charOffsetToLineNumberAndPos(e);
+                    const e = pos + deleteLength;
+                    const lineInfo = this.charOffsetToLineNumberAndPos(e);
                     if ((lineInfo && (lineInfo.offset === 0))) {
                         // move range end just past line that will merge with previous line
                         deleteLength += lineInfo.text.length;
@@ -1886,7 +1911,7 @@ namespace ts.server {
                     walker.insertLines(newText);
                 }
                 if (this.checkEdits) {
-                    var updatedText = this.getText(0, this.root.charCount());
+                    const updatedText = this.getText(0, this.root.charCount());
                     Debug.assert(checkText == updatedText, "buffer edit mismatch");
                 }
                 return walker.lineIndex;
@@ -1894,14 +1919,14 @@ namespace ts.server {
         }
 
         static buildTreeFromBottom(nodes: LineCollection[]): LineNode {
-            var nodeCount = Math.ceil(nodes.length / lineCollectionCapacity);
-            var interiorNodes: LineNode[] = [];
-            var nodeIndex = 0;
-            for (var i = 0; i < nodeCount; i++) {
+            const nodeCount = Math.ceil(nodes.length / lineCollectionCapacity);
+            const interiorNodes: LineNode[] = [];
+            let nodeIndex = 0;
+            for (let i = 0; i < nodeCount; i++) {
                 interiorNodes[i] = new LineNode();
-                var charCount = 0;
-                var lineCount = 0;
-                for (var j = 0; j < lineCollectionCapacity; j++) {
+                let charCount = 0;
+                let lineCount = 0;
+                for (let j = 0; j < lineCollectionCapacity; j++) {
                     if (nodeIndex < nodes.length) {
                         interiorNodes[i].add(nodes[nodeIndex]);
                         charCount += nodes[nodeIndex].charCount();
@@ -1924,18 +1949,18 @@ namespace ts.server {
         }
 
         static linesFromText(text: string) {
-            var lineStarts = ts.computeLineStarts(text);
+            const lineStarts = ts.computeLineStarts(text);
 
             if (lineStarts.length === 0) {
                 return { lines: <string[]>[], lineMap: lineStarts };
             }
-            var lines = <string[]>new Array(lineStarts.length);
-            var lc = lineStarts.length - 1;
-            for (var lmi = 0; lmi < lc; lmi++) {
+            const lines = <string[]>new Array(lineStarts.length);
+            const lc = lineStarts.length - 1;
+            for (let lmi = 0; lmi < lc; lmi++) {
                 lines[lmi] = text.substring(lineStarts[lmi], lineStarts[lmi + 1]);
             }
 
-            var endText = text.substring(lineStarts[lc]);
+            const endText = text.substring(lineStarts[lc]);
             if (endText.length > 0) {
                 lines[lc] = endText;
             }
@@ -1958,8 +1983,8 @@ namespace ts.server {
         updateCounts() {
             this.totalChars = 0;
             this.totalLines = 0;
-            for (var i = 0, len = this.children.length; i < len; i++) {
-                var child = this.children[i];
+            for (let i = 0, len = this.children.length; i < len; i++) {
+                const child = this.children[i];
                 this.totalChars += child.charCount();
                 this.totalLines += child.lineCount();
             }
@@ -1990,11 +2015,11 @@ namespace ts.server {
 
         walk(rangeStart: number, rangeLength: number, walkFns: ILineIndexWalker) {
             // assume (rangeStart < this.totalChars) && (rangeLength <= this.totalChars)
-            var childIndex = 0;
-            var child = this.children[0];
-            var childCharCount = child.charCount();
+            let childIndex = 0;
+            let child = this.children[0];
+            let childCharCount = child.charCount();
             // find sub-tree containing start
-            var adjustedStart = rangeStart;
+            let adjustedStart = rangeStart;
             while (adjustedStart >= childCharCount) {
                 this.skipChild(adjustedStart, rangeLength, childIndex, walkFns, CharRangeSection.PreStart);
                 adjustedStart -= childCharCount;
@@ -2012,7 +2037,7 @@ namespace ts.server {
                 if (this.execWalk(adjustedStart, childCharCount - adjustedStart, walkFns, childIndex, CharRangeSection.Start)) {
                     return;
                 }
-                var adjustedLength = rangeLength - (childCharCount - adjustedStart);
+                let adjustedLength = rangeLength - (childCharCount - adjustedStart);
                 child = this.children[++childIndex];
                 childCharCount = child.charCount();
                 while (adjustedLength > childCharCount) {
@@ -2031,9 +2056,9 @@ namespace ts.server {
             }
             // Process any subtrees after the one containing range end
             if (walkFns.pre) {
-                var clen = this.children.length;
+                const clen = this.children.length;
                 if (childIndex < (clen - 1)) {
-                    for (var ej = childIndex + 1; ej < clen; ej++) {
+                    for (let ej = childIndex + 1; ej < clen; ej++) {
                         this.skipChild(0, 0, ej, walkFns, CharRangeSection.PostEnd);
                     }
                 }
@@ -2041,12 +2066,12 @@ namespace ts.server {
         }
 
         charOffsetToLineNumberAndPos(lineNumber: number, charOffset: number): ILineInfo {
-            var childInfo = this.childFromCharOffset(lineNumber, charOffset);
+            const childInfo = this.childFromCharOffset(lineNumber, charOffset);
             if (!childInfo.child) {
                 return {
                     line: lineNumber,
                     offset: charOffset,
-                }
+                };
             }
             else if (childInfo.childIndex < this.children.length) {
                 if (childInfo.child.isLeaf()) {
@@ -2058,23 +2083,23 @@ namespace ts.server {
                     };
                 }
                 else {
-                    var lineNode = <LineNode>(childInfo.child);
+                    const lineNode = <LineNode>(childInfo.child);
                     return lineNode.charOffsetToLineNumberAndPos(childInfo.lineNumber, childInfo.charOffset);
                 }
             }
             else {
-                var lineInfo = this.lineNumberToInfo(this.lineCount(), 0);
+                const lineInfo = this.lineNumberToInfo(this.lineCount(), 0);
                 return { line: this.lineCount(), offset: lineInfo.leaf.charCount() };
             }
         }
 
         lineNumberToInfo(lineNumber: number, charOffset: number): ILineInfo {
-            var childInfo = this.childFromLineNumber(lineNumber, charOffset);
+            const childInfo = this.childFromLineNumber(lineNumber, charOffset);
             if (!childInfo.child) {
                 return {
                     line: lineNumber,
                     offset: charOffset
-                }
+                };
             }
             else if (childInfo.child.isLeaf()) {
                 return {
@@ -2082,20 +2107,22 @@ namespace ts.server {
                     offset: childInfo.charOffset,
                     text: (<LineLeaf>(childInfo.child)).text,
                     leaf: (<LineLeaf>(childInfo.child))
-                }
+                };
             }
             else {
-                var lineNode = <LineNode>(childInfo.child);
+                const lineNode = <LineNode>(childInfo.child);
                 return lineNode.lineNumberToInfo(childInfo.relativeLineNumber, childInfo.charOffset);
             }
         }
 
         childFromLineNumber(lineNumber: number, charOffset: number) {
-            var child: LineCollection;
-            var relativeLineNumber = lineNumber;
-            for (var i = 0, len = this.children.length; i < len; i++) {
+            let child: LineCollection;
+            let relativeLineNumber = lineNumber;
+            let i: number;
+            let len: number;
+            for (i = 0, len = this.children.length; i < len; i++) {
                 child = this.children[i];
-                var childLineCount = child.lineCount();
+                const childLineCount = child.lineCount();
                 if (childLineCount >= relativeLineNumber) {
                     break;
                 }
@@ -2113,8 +2140,10 @@ namespace ts.server {
         }
 
         childFromCharOffset(lineNumber: number, charOffset: number) {
-            var child: LineCollection;
-            for (var i = 0, len = this.children.length; i < len; i++) {
+            let child: LineCollection;
+            let i: number;
+            let len: number;
+            for (i = 0, len = this.children.length; i < len; i++) {
                 child = this.children[i];
                 if (child.charCount() > charOffset) {
                     break;
@@ -2129,14 +2158,14 @@ namespace ts.server {
                 childIndex: i,
                 charOffset: charOffset,
                 lineNumber: lineNumber
-            }
+            };
         }
 
         splitAfter(childIndex: number) {
-            var splitNode: LineNode;
-            var clen = this.children.length;
+            let splitNode: LineNode;
+            const clen = this.children.length;
             childIndex++;
-            var endLength = childIndex;
+            const endLength = childIndex;
             if (childIndex < clen) {
                 splitNode = new LineNode();
                 while (childIndex < clen) {
@@ -2149,10 +2178,10 @@ namespace ts.server {
         }
 
         remove(child: LineCollection) {
-            var childIndex = this.findChildIndex(child);
-            var clen = this.children.length;
+            const childIndex = this.findChildIndex(child);
+            const clen = this.children.length;
             if (childIndex < (clen - 1)) {
-                for (var i = childIndex; i < (clen - 1); i++) {
+                for (let i = childIndex; i < (clen - 1); i++) {
                     this.children[i] = this.children[i + 1];
                 }
             }
@@ -2160,16 +2189,16 @@ namespace ts.server {
         }
 
         findChildIndex(child: LineCollection) {
-            var childIndex = 0;
-            var clen = this.children.length;
+            let childIndex = 0;
+            const clen = this.children.length;
             while ((this.children[childIndex] !== child) && (childIndex < clen)) childIndex++;
             return childIndex;
         }
 
         insertAt(child: LineCollection, nodes: LineCollection[]) {
-            var childIndex = this.findChildIndex(child);
-            var clen = this.children.length;
-            var nodeCount = nodes.length;
+            let childIndex = this.findChildIndex(child);
+            const clen = this.children.length;
+            const nodeCount = nodes.length;
             // if child is last and there is more room and only one node to place, place it
             if ((clen < lineCollectionCapacity) && (childIndex === (clen - 1)) && (nodeCount === 1)) {
                 this.add(nodes[0]);
@@ -2177,22 +2206,22 @@ namespace ts.server {
                 return [];
             }
             else {
-                var shiftNode = this.splitAfter(childIndex);
-                var nodeIndex = 0;
+                const shiftNode = this.splitAfter(childIndex);
+                let nodeIndex = 0;
                 childIndex++;
                 while ((childIndex < lineCollectionCapacity) && (nodeIndex < nodeCount)) {
                     this.children[childIndex++] = nodes[nodeIndex++];
                 }
-                var splitNodes: LineNode[] = [];
-                var splitNodeCount = 0;
+                let splitNodes: LineNode[] = [];
+                let splitNodeCount = 0;
                 if (nodeIndex < nodeCount) {
                     splitNodeCount = Math.ceil((nodeCount - nodeIndex) / lineCollectionCapacity);
                     splitNodes = <LineNode[]>new Array(splitNodeCount);
-                    var splitNodeIndex = 0;
-                    for (var i = 0; i < splitNodeCount; i++) {
+                    let splitNodeIndex = 0;
+                    for (let i = 0; i < splitNodeCount; i++) {
                         splitNodes[i] = new LineNode();
                     }
-                    var splitNode = <LineNode>splitNodes[0];
+                    let splitNode = <LineNode>splitNodes[0];
                     while (nodeIndex < nodeCount) {
                         splitNode.add(nodes[nodeIndex++]);
                         if (splitNode.children.length === lineCollectionCapacity) {
@@ -2200,7 +2229,7 @@ namespace ts.server {
                             splitNode = <LineNode>splitNodes[splitNodeIndex];
                         }
                     }
-                    for (i = splitNodes.length - 1; i >= 0; i--) {
+                    for (let i = splitNodes.length - 1; i >= 0; i--) {
                         if (splitNodes[i].children.length === 0) {
                             splitNodes.length--;
                         }
@@ -2210,7 +2239,7 @@ namespace ts.server {
                     splitNodes[splitNodes.length] = shiftNode;
                 }
                 this.updateCounts();
-                for (i = 0; i < splitNodeCount; i++) {
+                for (let i = 0; i < splitNodeCount; i++) {
                     (<LineNode>splitNodes[i]).updateCounts();
                 }
                 return splitNodes;
diff --git a/src/server/node.d.ts b/src/server/node.d.ts
index 438b152a1f4..0bde0bb6602 100644
--- a/src/server/node.d.ts
+++ b/src/server/node.d.ts
@@ -62,14 +62,14 @@ declare var SlowBuffer: {
 // Buffer class
 interface Buffer extends NodeBuffer { }
 interface BufferConstructor {
-    new (str: string, encoding ?: string): Buffer;
+    new (str: string, encoding?: string): Buffer;
     new (size: number): Buffer;
     new (size: Uint8Array): Buffer;
     new (array: any[]): Buffer;
     prototype: Buffer;
     isBuffer(obj: any): boolean;
-    byteLength(string: string, encoding ?: string): number;
-    concat(list: Buffer[], totalLength ?: number): Buffer;
+    byteLength(string: string, encoding?: string): number;
+    concat(list: Buffer[], totalLength?: number): Buffer;
 }
 declare var Buffer: BufferConstructor;
 
@@ -78,7 +78,7 @@ declare var Buffer: BufferConstructor;
 *               GLOBAL INTERFACES               *
 *                                               *
 ************************************************/
-declare module NodeJS {
+declare namespace NodeJS {
     export interface ErrnoException extends Error {
         errno?: any;
         code?: string;
@@ -245,7 +245,7 @@ interface NodeBuffer {
     fill(value: any, offset?: number, end?: number): void;
 }
 
-declare module NodeJS {
+declare namespace NodeJS {
     export interface Path {
         normalize(p: string): string;
         join(...paths: any[]): string;
@@ -258,7 +258,7 @@ declare module NodeJS {
     }
 }
 
-declare module NodeJS {
+declare namespace NodeJS {
     export interface ReadLineInstance extends EventEmitter {
         setPrompt(prompt: string, length: number): void;
         prompt(preserveCursor?: boolean): void;
@@ -280,8 +280,8 @@ declare module NodeJS {
     }
 }
 
-declare module NodeJS {
-    module events {
+declare namespace NodeJS {
+    namespace events {
         export class EventEmitter implements NodeJS.EventEmitter {
             static listenerCount(emitter: EventEmitter, event: string): number;
 
@@ -297,8 +297,8 @@ declare module NodeJS {
     }
 }
 
-declare module NodeJS {
-    module stream {
+declare namespace NodeJS {
+    namespace stream {
 
         export interface Stream extends events.EventEmitter {
             pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
@@ -397,8 +397,8 @@ declare module NodeJS {
     }
 }
 
-declare module NodeJS {
-    module fs {
+declare namespace NodeJS {
+    namespace fs {
         interface Stats {
             isFile(): boolean;
             isDirectory(): boolean;
@@ -547,8 +547,8 @@ declare module NodeJS {
     }
 }
 
-declare module NodeJS {
-    module path {
+declare namespace NodeJS {
+    namespace path {
         export function normalize(p: string): string;
         export function join(...paths: any[]): string;
         export function resolve(...pathSegments: any[]): string;
@@ -560,8 +560,8 @@ declare module NodeJS {
     }
 }
 
-declare module NodeJS {
-    module _debugger {
+declare namespace NodeJS {
+    namespace _debugger {
         export interface Packet {
             raw: string;
             headers: string[];
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
index ce918abda3c..3a669753323 100644
--- a/src/server/protocol.d.ts
+++ b/src/server/protocol.d.ts
@@ -16,7 +16,7 @@ declare namespace ts.server.protocol {
           */
         type: string;
     }
-    
+
     /** 
       * Client-initiated request message 
       */
@@ -31,7 +31,7 @@ declare namespace ts.server.protocol {
           */
         arguments?: any;
     }
-    
+
     /**
       * Request to reload the project structure for all the opened files 
       */
@@ -107,7 +107,7 @@ declare namespace ts.server.protocol {
       * A request to get the project information of the current file
       */
     export interface ProjectInfoRequest extends Request {
-        arguments: ProjectInfoRequestArgs
+        arguments: ProjectInfoRequestArgs;
     }
 
     /** 
@@ -200,7 +200,7 @@ declare namespace ts.server.protocol {
     /**
       * Object found in response messages defining a span of text in source code.
       */
-    export interface TextSpan { 
+    export interface TextSpan {
         /**
           * First character of the definition.
           */
@@ -261,18 +261,18 @@ declare namespace ts.server.protocol {
       * in the file at a given line and column.
       */
     export interface DocumentHighlightsRequest extends FileLocationRequest {
-        arguments: DocumentHighlightsRequestArgs
+        arguments: DocumentHighlightsRequestArgs;
     }
 
     export interface HighlightSpan extends TextSpan {
-        kind: string
+        kind: string;
     }
 
     export interface DocumentHighlightsItem {
         /**
           * File containing highlight spans.
           */
-        file: string,
+        file: string;
 
         /**
           * Spans to highlight in file.
@@ -422,76 +422,76 @@ declare namespace ts.server.protocol {
      * Editor options
      */
     export interface EditorOptions {
-      
+
         /** Number of spaces for each tab. Default value is 4. */
         tabSize?: number;
-        
+
         /** Number of spaces to indent during formatting. Default value is 4. */
         indentSize?: number;
-        
+
         /** The new line character to be used. Default value is the OS line delimiter. */
         newLineCharacter?: string;
-        
+
         /** Whether tabs should be converted to spaces. Default value is true. */
-        convertTabsToSpaces?: boolean;        
+        convertTabsToSpaces?: boolean;
     }
-        
+
     /**
      * Format options
      */
     export interface FormatOptions extends EditorOptions {
-      
+
         /** Defines space handling after a comma delimiter. Default value is true. */
         insertSpaceAfterCommaDelimiter?: boolean;
-        
+
         /** Defines space handling after a semicolon in a for statemen. Default value is true */
         insertSpaceAfterSemicolonInForStatements?: boolean;
-        
+
         /** Defines space handling after a binary operator. Default value is true. */
         insertSpaceBeforeAndAfterBinaryOperators?: boolean;
-        
+
         /** Defines space handling after keywords in control flow statement. Default value is true. */
         insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
-        
+
         /** Defines space handling after function keyword for anonymous functions. Default value is false. */
         insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
-        
+
         /** Defines space handling after opening and before closing non empty parenthesis. Default value is false. */
         insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
 
         /** Defines space handling after opening and before closing non empty brackets. Default value is false. */
         insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
-        
+
         /** Defines whether an open brace is put onto a new line for functions or not. Default value is false. */
         placeOpenBraceOnNewLineForFunctions?: boolean;
-        
+
         /** Defines whether an open brace is put onto a new line for control blocks or not. Default value is false. */
         placeOpenBraceOnNewLineForControlBlocks?: boolean;
-        
+
         /** Index operator */
-        [key:string] : string | number | boolean;
+        [key: string] : string | number | boolean;
     }
-  
+
     /**
       * Information found in a configure request.
       */
     export interface ConfigureRequestArguments {
-      
+
         /** 
           * Information about the host, for example 'Emacs 24.4' or
           * 'Sublime Text version 3075'
           */
         hostInfo?: string;
-        
+
         /**
           * If present, tab settings apply only to this file.
           */
         file?: string;
-        
+
         /**
          * The format options to use during formatting and other code editing features.
          */
-        formatOptions?: FormatOptions;        
+        formatOptions?: FormatOptions;
     }
 
     /**
@@ -513,6 +513,11 @@ declare namespace ts.server.protocol {
       *  Information found in an "open" request.
       */
     export interface OpenRequestArgs extends FileRequestArgs {
+        /**
+         * Used when a version of the file content is known to be more up to date than the one on disk. 
+         * Then the known content will be used upon opening instead of the disk copy   
+         */
+        fileContent?: string;
     }
 
     /**
@@ -561,27 +566,27 @@ declare namespace ts.server.protocol {
           * The symbol's kind (such as 'className' or 'parameterName' or plain 'text').
           */
         kind: string;
-        
+
         /**
           * Optional modifiers for the kind (such as 'public').
           */
         kindModifiers: string;
-        
+
         /**
           * Starting file location of symbol.
           */
         start: Location;
-        
+
         /**
           * One past last character of symbol.
           */
         end: Location;
-        
+
         /**
           * Type and kind of symbol.
           */
         displayString: string;
-        
+
         /**
           * Documentation associated with symbol.
           */
@@ -603,7 +608,7 @@ declare namespace ts.server.protocol {
           * Last line of range for which to format text in file.
           */
         endLine: number;
-        
+
         /**
           * Character offset on last line of range for which to format text in file.
           */
@@ -619,7 +624,7 @@ declare namespace ts.server.protocol {
       */
     export interface FormatRequest extends FileLocationRequest {
         arguments: FormatRequestArgs;
-    } 
+    }
 
     /**
       * Object found in response messages defining an editing
@@ -638,7 +643,7 @@ declare namespace ts.server.protocol {
           * One character past last character of the text span to edit.
           */
         end: Location;
-        
+
         /**
           * Replace the span defined above with this string (may be
           * the empty string).
@@ -723,7 +728,7 @@ declare namespace ts.server.protocol {
           * Text of an item describing the symbol.
           */
         text: string;
-        
+
         /**
           * The symbol's kind (such as 'className' or 'parameterName' or plain 'text').
           */
@@ -773,7 +778,7 @@ declare namespace ts.server.protocol {
           * Display parts of the symbol (similar to quick info).
           */
         displayParts: SymbolDisplayPart[];
-        
+
         /**
           * Documentation strings for the symbol.
           */
@@ -790,94 +795,94 @@ declare namespace ts.server.protocol {
 
     /**
      * Signature help information for a single parameter    
-     */    
+     */
     export interface SignatureHelpParameter {
-        
+
         /**
          * The parameter's name
-         */        
+         */
         name: string;
-                
+
         /**
           * Documentation of the parameter.
           */
         documentation: SymbolDisplayPart[];
-                
+
         /**
           * Display parts of the parameter.
           */
         displayParts: SymbolDisplayPart[];
-                
+
         /**
          * Whether the parameter is optional or not.         
-         */        
+         */
         isOptional: boolean;
     }
-        
+
     /**
      * Represents a single signature to show in signature help.    
-     */    
+     */
     export interface SignatureHelpItem {
-      
+
         /**
          * Whether the signature accepts a variable number of arguments. 
-         */        
+         */
         isVariadic: boolean;
-        
+
         /**
          * The prefix display parts.
-         */        
+         */
         prefixDisplayParts: SymbolDisplayPart[];
-        
+
         /**
          * The suffix disaply parts.
-         */        
+         */
         suffixDisplayParts: SymbolDisplayPart[];
-        
+
         /**
          * The separator display parts.
-         */        
+         */
         separatorDisplayParts: SymbolDisplayPart[];
-        
+
         /**
          * The signature helps items for the parameters. 
-         */        
+         */
         parameters: SignatureHelpParameter[];
-                
+
         /**
          * The signature's documentation
          */
         documentation: SymbolDisplayPart[];
     }
-    
+
     /**
      * Signature help items found in the response of a signature help request.
      */
     export interface SignatureHelpItems {
-      
+
         /**
          * The signature help items.    
-         */        
+         */
         items: SignatureHelpItem[];
-                
+
         /**
          * The span for which signature help should appear on a signature 
-         */        
+         */
         applicableSpan: TextSpan;
-                
+
         /**
          * The item selected in the set of available help items. 
-         */        
+         */
         selectedItemIndex: number;
-                
+
         /**
          * The argument selected in the set of parameters.
-         */        
+         */
         argumentIndex: number;
-        
+
         /**
          * The argument count
-         */        
+         */
         argumentCount: number;
     }
 
@@ -885,9 +890,9 @@ declare namespace ts.server.protocol {
      * Arguments of a signature help request.
      */
     export interface SignatureHelpRequestArgs extends FileLocationRequestArgs {
-      
+
     }
-    
+
     /**
       * Signature help request; value of command field is "signatureHelp".
       * Given a file location (file, line, col), return the signature 
@@ -899,7 +904,7 @@ declare namespace ts.server.protocol {
 
     /**
      * Repsonse object for a SignatureHelpRequest.
-     */  
+     */
     export interface SignatureHelpResponse extends Response {
         body?: SignatureHelpItems;
     }
@@ -926,9 +931,9 @@ declare namespace ts.server.protocol {
       * it request for every file in this project.
       */
     export interface GeterrForProjectRequest extends Request {
-        arguments: GeterrForProjectRequestArgs
+        arguments: GeterrForProjectRequestArgs;
     }
-    
+
     /**
       * Arguments for geterr messages.
       */
@@ -968,12 +973,12 @@ declare namespace ts.server.protocol {
           * Starting file location at which text appies.
           */
         start: Location;
-        
+
         /**
           * The last file location at which the text applies.
           */
         end: Location;
-        
+
         /**
           * Text of diagnostic message.
           */
@@ -985,7 +990,7 @@ declare namespace ts.server.protocol {
           * The file for which diagnostic information is reported.
           */
         file: string;
-      
+
         /**
           * An array of diagnostic information items.
           */
@@ -999,7 +1004,7 @@ declare namespace ts.server.protocol {
     export interface DiagnosticEvent extends Event {
         body?: DiagnosticEventBody;
     }
- 
+
     /**
       * Arguments for reload request.
       */
@@ -1083,12 +1088,12 @@ declare namespace ts.server.protocol {
           * The symbol's name.
           */
         name: string;
-       
+
         /**
           * The symbol's kind (such as 'className' or 'parameterName').
           */
         kind: string;
-        
+
         /**
           * exact, substring, or prefix.
           */
@@ -1098,39 +1103,39 @@ declare namespace ts.server.protocol {
           * If this was a case sensitive or insensitive match.
           */
         isCaseSensitive?: boolean;
-        
+
         /**
           * Optional modifiers for the kind (such as 'public').
           */
         kindModifiers?: string;
-        
+
         /** 
           * The file in which the symbol is found.
           */
         file: string;
-        
+
         /**
           * The location within file at which the symbol is found.
           */
         start: Location;
-        
+
         /**
           * One past the last character of the symbol.
           */
         end: Location;
-        
+
         /**
           * Name of symbol's container symbol (if any); for example,
           * the class name if symbol is a class member.
           */
         containerName?: string;
-        
+
         /**
           * Kind of symbol's container symbol (if any).
           */
         containerKind?: string;
     }
-    
+
     /**
       * Navto response message. Body is an array of navto items.  Each
       * item gives a symbol that matched the search term.
@@ -1208,7 +1213,7 @@ declare namespace ts.server.protocol {
         childItems?: NavigationBarItem[];
     }
 
-    export interface NavBarResponse extends Response { 
+    export interface NavBarResponse extends Response {
         body?: NavigationBarItem[];
     }
 }
diff --git a/src/server/server.ts b/src/server/server.ts
index 39864fc8477..e29e79ac6ed 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,17 +1,19 @@
 /// <reference path="node.d.ts" />
 /// <reference path="session.ts" />
+// used in fs.writeSync
+/* tslint:disable:no-null */
 
 namespace ts.server {
-    var nodeproto: typeof NodeJS._debugger = require('_debugger');
-    var readline: NodeJS.ReadLine = require('readline');
-    var path: NodeJS.Path = require('path');
-    var fs: typeof NodeJS.fs = require('fs');
+    const nodeproto: typeof NodeJS._debugger = require("_debugger");
+    const readline: NodeJS.ReadLine = require("readline");
+    const path: NodeJS.Path = require("path");
+    const fs: typeof NodeJS.fs = require("fs");
 
-    var rl = readline.createInterface({
+    const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
         terminal: false,
-    });  
+    });
 
     class Logger implements ts.server.Logger {
         fd = -1;
@@ -58,7 +60,7 @@ namespace ts.server {
         isVerbose() {
             return this.loggingEnabled() && (this.level == "verbose");
         }
-        
+
 
         msg(s: string, type = "Err") {
             if (this.fd < 0) {
@@ -68,7 +70,7 @@ namespace ts.server {
             }
             if (this.fd >= 0) {
                 s = s + "\n";
-                var prefix = Logger.padStringRight(type + " " + this.seq.toString(), "          ");
+                const prefix = Logger.padStringRight(type + " " + this.seq.toString(), "          ");
                 if (this.firstInGroup) {
                     s = prefix + s;
                     this.firstInGroup = false;
@@ -77,7 +79,7 @@ namespace ts.server {
                     this.seq++;
                     this.firstInGroup = true;
                 }
-                var buf = new Buffer(s);
+                const buf = new Buffer(s);
                 fs.writeSync(this.fd, buf, 0, buf.length, null);
             }
         }
@@ -89,18 +91,18 @@ namespace ts.server {
         }
 
         exit() {
-            this.projectService.log("Exiting...","Info");
+            this.projectService.log("Exiting...", "Info");
             this.projectService.closeLog();
             process.exit(0);
         }
 
         listen() {
-            rl.on('line',(input: string) => {
-                var message = input.trim();
+            rl.on("line", (input: string) => {
+                const message = input.trim();
                 this.onMessage(message);
             });
 
-            rl.on('close',() => {
+            rl.on("close", () => {
                 this.exit();
             });
         }
@@ -112,11 +114,11 @@ namespace ts.server {
     }
 
     function parseLoggingEnvironmentString(logEnvStr: string): LogOptions {
-        var logEnv: LogOptions = {};
-        var args = logEnvStr.split(' ');
-        for (var i = 0, len = args.length; i < (len - 1); i += 2) {
-            var option = args[i];
-            var value = args[i + 1];
+        const logEnv: LogOptions = {};
+        const args = logEnvStr.split(" ");
+        for (let i = 0, len = args.length; i < (len - 1); i += 2) {
+            const option = args[i];
+            const value = args[i + 1];
             if (option && value) {
                 switch (option) {
                     case "-file":
@@ -133,11 +135,11 @@ namespace ts.server {
 
     // TSS_LOG "{ level: "normal | verbose | terse", file?: string}"
     function createLoggerFromEnv() {
-        var fileName: string = undefined;
-        var detailLevel = "normal";
-        var logEnvStr = process.env["TSS_LOG"];
+        let fileName: string = undefined;
+        let detailLevel = "normal";
+        const logEnvStr = process.env["TSS_LOG"];
         if (logEnvStr) {
-            var logEnv = parseLoggingEnvironmentString(logEnvStr);
+            const logEnv = parseLoggingEnvironmentString(logEnvStr);
             if (logEnv.file) {
                 fileName = logEnv.file;
             }
@@ -153,10 +155,32 @@ namespace ts.server {
     // This places log file in the directory containing editorServices.js
     // TODO: check that this location is writable
 
-    var logger = createLoggerFromEnv();
+    const logger = createLoggerFromEnv();
 
-    var ioSession = new IOSession(ts.sys, logger);
-    process.on('uncaughtException', function(err: Error) {
+    const pending: string[] = [];
+    let canWrite = true;
+    function writeMessage(s: string) {
+        if (!canWrite) {
+            pending.push(s);
+        }
+        else {
+            canWrite = false;
+            process.stdout.write(new Buffer(s, "utf8"), setCanWriteFlagAndWriteMessageIfNecessary);
+        }
+    }
+
+    function setCanWriteFlagAndWriteMessageIfNecessary() {
+        canWrite = true;
+        if (pending.length) {
+            writeMessage(pending.shift());
+        }
+    }
+
+    // Override sys.write because fs.writeSync is not reliable on Node 4
+    ts.sys.write = (s: string) => writeMessage(s);
+
+    const ioSession = new IOSession(ts.sys, logger);
+    process.on("uncaughtException", function(err: Error) {
         ioSession.logError(err, "unknown");
     });
     // Start listening
diff --git a/src/server/session.ts b/src/server/session.ts
index 550b551e51a..dae2384ce54 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -4,7 +4,7 @@
 /// <reference path="editorServices.ts" />
 
 namespace ts.server {
-    var spaceCache:string[] = [];
+    const spaceCache: string[] = [];
 
     interface StackTraceError extends Error {
         stack?: string;
@@ -12,30 +12,31 @@ namespace ts.server {
 
     export function generateSpaces(n: number): string {
         if (!spaceCache[n]) {
-            var strBuilder = "";
-            for (var i = 0; i < n; i++) {
+            let strBuilder = "";
+            for (let i = 0; i < n; i++) {
                 strBuilder += " ";
             }
             spaceCache[n] = strBuilder;
-        }  
+        }
         return spaceCache[n];
     }
 
     export function generateIndentString(n: number, editorOptions: EditorOptions): string {
         if (editorOptions.ConvertTabsToSpaces) {
             return generateSpaces(n);
-        } else {
-            var result = "";
-            for (var i = 0; i < Math.floor(n / editorOptions.TabSize); i++) {
+        }
+        else {
+            let result = "";
+            for (let i = 0; i < Math.floor(n / editorOptions.TabSize); i++) {
                 result += "\t";
             }
-            for (var i = 0; i < n % editorOptions.TabSize; i++) {
+            for (let i = 0; i < n % editorOptions.TabSize; i++) {
                 result += " ";
             }
             return result;
         }
     }
-    
+
     interface FileStart {
         file: string;
         start: ILineInfo;
@@ -56,7 +57,7 @@ namespace ts.server {
             return -1;
         }
         else if (a.file == b.file) {
-            var n = compareNumber(a.start.line, b.start.line);
+            const n = compareNumber(a.start.line, b.start.line);
             if (n === 0) {
                 return compareNumber(a.start.offset, b.start.offset);
             }
@@ -66,7 +67,7 @@ namespace ts.server {
             return 1;
         }
     }
-       
+
     function formatDiag(fileName: string, project: Project, diag: ts.Diagnostic) {
         return {
             start: project.compilerService.host.positionToLineOffset(fileName, diag.start),
@@ -81,7 +82,7 @@ namespace ts.server {
     }
 
     function allEditsBeforePos(edits: ts.TextChange[], pos: number) {
-        for (var i = 0, len = edits.length; i < len; i++) {
+        for (let i = 0, len = edits.length; i < len; i++) {
             if (ts.textSpanEnd(edits[i].span) >= pos) {
                 return false;
             }
@@ -89,7 +90,7 @@ namespace ts.server {
         return true;
     }
 
-    export module CommandNames {
+    export namespace CommandNames {
         export const Brace = "brace";
         export const Change = "change";
         export const Close = "close";
@@ -119,8 +120,8 @@ namespace ts.server {
         export const Unknown = "unknown";
     }
 
-    module Errors { 
-        export var NoProject = new Error("No Project.");
+    namespace Errors {
+        export const NoProject = new Error("No Project.");
     }
 
     export interface ServerHost extends ts.System {
@@ -136,13 +137,13 @@ namespace ts.server {
         private changeSeq = 0;
 
         constructor(
-            private host: ServerHost, 
-            private byteLength: (buf: string, encoding?: string) => number, 
-            private hrtime: (start?: number[]) => number[], 
+            private host: ServerHost,
+            private byteLength: (buf: string, encoding?: string) => number,
+            private hrtime: (start?: number[]) => number[],
             private logger: Logger
         ) {
             this.projectService =
-                new ProjectService(host, logger, (eventName,project,fileName) => {
+                new ProjectService(host, logger, (eventName, project, fileName) => {
                 this.handleEvent(eventName, project, fileName);
             });
         }
@@ -156,8 +157,8 @@ namespace ts.server {
         }
 
         public logError(err: Error, cmd: string) {
-            var typedErr = <StackTraceError>err;
-            var msg = "Exception on executing command " + cmd;
+            const typedErr = <StackTraceError>err;
+            let msg = "Exception on executing command " + cmd;
             if (typedErr.message) {
                 msg += ":\n" + typedErr.message;
                 if (typedErr.stack) {
@@ -172,16 +173,16 @@ namespace ts.server {
         }
 
         public send(msg: protocol.Message) {
-            var json = JSON.stringify(msg);
+            const json = JSON.stringify(msg);
             if (this.logger.isVerbose()) {
                 this.logger.info(msg.type + ": " + json);
             }
-            this.sendLineToClient('Content-Length: ' + (1 + this.byteLength(json, 'utf8')) +
-                '\r\n\r\n' + json);
+            this.sendLineToClient("Content-Length: " + (1 + this.byteLength(json, "utf8")) +
+                "\r\n\r\n" + json);
         }
 
         public event(info: any, eventName: string) {
-            var ev: protocol.Event = {
+            const ev: protocol.Event = {
                 seq: 0,
                 type: "event",
                 event: eventName,
@@ -191,13 +192,13 @@ namespace ts.server {
         }
 
         private response(info: any, cmdName: string, reqSeq = 0, errorMsg?: string) {
-            var res: protocol.Response = {
+            const res: protocol.Response = {
                 seq: 0,
                 type: "response",
                 command: cmdName,
                 request_seq: reqSeq,
                 success: !errorMsg,
-            }
+            };
             if (!errorMsg) {
                 res.body = info;
             }
@@ -213,10 +214,10 @@ namespace ts.server {
 
         private semanticCheck(file: string, project: Project) {
             try {
-                var diags = project.compilerService.languageService.getSemanticDiagnostics(file);
+                const diags = project.compilerService.languageService.getSemanticDiagnostics(file);
 
                 if (diags) {
-                    var bakedDiags = diags.map((diag) => formatDiag(file, project, diag));
+                    const bakedDiags = diags.map((diag) => formatDiag(file, project, diag));
                     this.event({ file: file, diagnostics: bakedDiags }, "semanticDiag");
                 }
             }
@@ -227,9 +228,9 @@ namespace ts.server {
 
         private syntacticCheck(file: string, project: Project) {
             try {
-                var diags = project.compilerService.languageService.getSyntacticDiagnostics(file);
+                const diags = project.compilerService.languageService.getSyntacticDiagnostics(file);
                 if (diags) {
-                    var bakedDiags = diags.map((diag) => formatDiag(file, project, diag));
+                    const bakedDiags = diags.map((diag) => formatDiag(file, project, diag));
                     this.event({ file: file, diagnostics: bakedDiags }, "syntaxDiag");
                 }
             }
@@ -242,7 +243,7 @@ namespace ts.server {
             this.syntacticCheck(file, project);
             this.semanticCheck(file, project);
         }
-        
+
         private reloadProjects() {
             this.projectService.reloadProjects();
         }
@@ -267,10 +268,10 @@ namespace ts.server {
                 clearImmediate(this.immediateId);
                 this.immediateId = undefined;
             }
-            var index = 0;
-            var checkOne = () => {
+            let index = 0;
+            const checkOne = () => {
                 if (matchSeq(seq)) {
-                    var checkSpec = checkList[index++];
+                    const checkSpec = checkList[index++];
                     if (checkSpec.project.getSourceFileFromName(checkSpec.fileName, requireOpen)) {
                         this.syntacticCheck(checkSpec.fileName, checkSpec.project);
                         this.immediateId = setImmediate(() => {
@@ -285,23 +286,23 @@ namespace ts.server {
                         });
                     }
                 }
-            }
+            };
             if ((checkList.length > index) && (matchSeq(seq))) {
                 this.errorTimer = setTimeout(checkOne, ms);
             }
         }
 
         private getDefinition(line: number, offset: number, fileName: string): protocol.FileSpan[] {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
 
-            var definitions = compilerService.languageService.getDefinitionAtPosition(file, position);
+            const definitions = compilerService.languageService.getDefinitionAtPosition(file, position);
             if (!definitions) {
                 return undefined;
             }
@@ -314,16 +315,16 @@ namespace ts.server {
         }
 
         private getTypeDefinition(line: number, offset: number, fileName: string): protocol.FileSpan[] {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
 
-            var definitions = compilerService.languageService.getTypeDefinitionAtPosition(file, position);
+            const definitions = compilerService.languageService.getTypeDefinitionAtPosition(file, position);
             if (!definitions) {
                 return undefined;
             }
@@ -337,47 +338,47 @@ namespace ts.server {
 
         private getOccurrences(line: number, offset: number, fileName: string): protocol.OccurrencesResponseItem[] {
             fileName = ts.normalizePath(fileName);
-            let project = this.projectService.getProjectForFile(fileName);
+            const project = this.projectService.getProjectForFile(fileName);
 
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            let { compilerService } = project;
-            let position = compilerService.host.lineOffsetToPosition(fileName, line, offset);
+            const { compilerService } = project;
+            const position = compilerService.host.lineOffsetToPosition(fileName, line, offset);
 
-            let occurrences = compilerService.languageService.getOccurrencesAtPosition(fileName, position);
+            const occurrences = compilerService.languageService.getOccurrencesAtPosition(fileName, position);
 
             if (!occurrences) {
                 return undefined;
             }
 
             return occurrences.map(occurrence => {
-                let { fileName, isWriteAccess, textSpan } = occurrence;
-                let start = compilerService.host.positionToLineOffset(fileName, textSpan.start);
-                let end = compilerService.host.positionToLineOffset(fileName, ts.textSpanEnd(textSpan));
+                const { fileName, isWriteAccess, textSpan } = occurrence;
+                const start = compilerService.host.positionToLineOffset(fileName, textSpan.start);
+                const end = compilerService.host.positionToLineOffset(fileName, ts.textSpanEnd(textSpan));
                 return {
                     start,
                     end,
                     file: fileName,
                     isWriteAccess
-                }
+                };
             });
         }
 
         private getDocumentHighlights(line: number, offset: number, fileName: string, filesToSearch: string[]): protocol.DocumentHighlightsItem[] {
             fileName = ts.normalizePath(fileName);
-            let project = this.projectService.getProjectForFile(fileName);
+            const project = this.projectService.getProjectForFile(fileName);
 
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            let { compilerService } = project;
-            let position = compilerService.host.lineOffsetToPosition(fileName, line, offset);
-            
-            let documentHighlights = compilerService.languageService.getDocumentHighlights(fileName, position, filesToSearch);
-            
+            const { compilerService } = project;
+            const position = compilerService.host.lineOffsetToPosition(fileName, line, offset);
+
+            const documentHighlights = compilerService.languageService.getDocumentHighlights(fileName, position, filesToSearch);
+
             if (!documentHighlights) {
                 return undefined;
             }
@@ -385,7 +386,7 @@ namespace ts.server {
             return documentHighlights.map(convertToDocumentHighlightsItem);
 
             function convertToDocumentHighlightsItem(documentHighlights: ts.DocumentHighlights): ts.server.protocol.DocumentHighlightsItem {
-                let { fileName, highlightSpans } = documentHighlights;
+                const { fileName, highlightSpans } = documentHighlights;
 
                 return {
                     file: fileName,
@@ -393,21 +394,21 @@ namespace ts.server {
                 };
 
                 function convertHighlightSpan(highlightSpan: ts.HighlightSpan): ts.server.protocol.HighlightSpan {
-                    let { textSpan, kind } = highlightSpan;
-                    let start = compilerService.host.positionToLineOffset(fileName, textSpan.start);
-                    let end = compilerService.host.positionToLineOffset(fileName, ts.textSpanEnd(textSpan));
+                    const { textSpan, kind } = highlightSpan;
+                    const start = compilerService.host.positionToLineOffset(fileName, textSpan.start);
+                    const end = compilerService.host.positionToLineOffset(fileName, ts.textSpanEnd(textSpan));
                     return { start, end, kind };
                 }
             }
         }
 
         private getProjectInfo(fileName: string, needFileNameList: boolean): protocol.ProjectInfo {
-            fileName = ts.normalizePath(fileName)
-            let project = this.projectService.getProjectForFile(fileName)
+            fileName = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(fileName);
 
-            let projectInfo: protocol.ProjectInfo = {
+            const projectInfo: protocol.ProjectInfo = {
                 configFileName: project.projectFilename
-            }
+            };
 
             if (needFileNameList) {
                 projectInfo.fileNames = project.getFileNames();
@@ -416,16 +417,16 @@ namespace ts.server {
             return projectInfo;
         }
 
-        private getRenameLocations(line: number, offset: number, fileName: string,findInComments: boolean, findInStrings: boolean): protocol.RenameResponseBody {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+        private getRenameLocations(line: number, offset: number, fileName: string, findInComments: boolean, findInStrings: boolean): protocol.RenameResponseBody {
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
-            var renameInfo = compilerService.languageService.getRenameInfo(file, position);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const renameInfo = compilerService.languageService.getRenameInfo(file, position);
             if (!renameInfo) {
                 return undefined;
             }
@@ -437,12 +438,12 @@ namespace ts.server {
                 };
             }
 
-            var renameLocations = compilerService.languageService.findRenameLocations(file, position, findInStrings, findInComments);
+            const renameLocations = compilerService.languageService.findRenameLocations(file, position, findInStrings, findInComments);
             if (!renameLocations) {
                 return undefined;
             }
 
-            var bakedRenameLocs = renameLocations.map(location => (<protocol.FileSpan>{
+            const bakedRenameLocs = renameLocations.map(location => (<protocol.FileSpan>{
                 file: location.fileName,
                 start: compilerService.host.positionToLineOffset(location.fileName, location.textSpan.start),
                 end: compilerService.host.positionToLineOffset(location.fileName, ts.textSpanEnd(location.textSpan)),
@@ -466,7 +467,7 @@ namespace ts.server {
                     }
                 }
             }).reduce<protocol.SpanGroup[]>((accum: protocol.SpanGroup[], cur: protocol.FileSpan) => {
-                var curFileAccum: protocol.SpanGroup;
+                let curFileAccum: protocol.SpanGroup;
                 if (accum.length > 0) {
                     curFileAccum = accum[accum.length - 1];
                     if (curFileAccum.file != cur.file) {
@@ -487,34 +488,34 @@ namespace ts.server {
         private getReferences(line: number, offset: number, fileName: string): protocol.ReferencesResponseBody {
             // TODO: get all projects for this file; report refs for all projects deleting duplicates
             // can avoid duplicates by eliminating same ref file from subsequent projects
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
 
-            var references = compilerService.languageService.getReferencesAtPosition(file, position);
+            const references = compilerService.languageService.getReferencesAtPosition(file, position);
             if (!references) {
                 return undefined;
             }
 
-            var nameInfo = compilerService.languageService.getQuickInfoAtPosition(file, position);
+            const nameInfo = compilerService.languageService.getQuickInfoAtPosition(file, position);
             if (!nameInfo) {
                 return undefined;
             }
 
-            var displayString = ts.displayPartsToString(nameInfo.displayParts);
-            var nameSpan = nameInfo.textSpan;
-            var nameColStart = compilerService.host.positionToLineOffset(file, nameSpan.start).offset;
-            var nameText = compilerService.host.getScriptSnapshot(file).getText(nameSpan.start, ts.textSpanEnd(nameSpan));
-            var bakedRefs: protocol.ReferencesResponseItem[] = references.map(ref => {
-                var start = compilerService.host.positionToLineOffset(ref.fileName, ref.textSpan.start);
-                var refLineSpan = compilerService.host.lineToTextSpan(ref.fileName, start.line - 1);
-                var snap = compilerService.host.getScriptSnapshot(ref.fileName);
-                var lineText = snap.getText(refLineSpan.start, ts.textSpanEnd(refLineSpan)).replace(/\r|\n/g, "");
+            const displayString = ts.displayPartsToString(nameInfo.displayParts);
+            const nameSpan = nameInfo.textSpan;
+            const nameColStart = compilerService.host.positionToLineOffset(file, nameSpan.start).offset;
+            const nameText = compilerService.host.getScriptSnapshot(file).getText(nameSpan.start, ts.textSpanEnd(nameSpan));
+            const bakedRefs: protocol.ReferencesResponseItem[] = references.map(ref => {
+                const start = compilerService.host.positionToLineOffset(ref.fileName, ref.textSpan.start);
+                const refLineSpan = compilerService.host.lineToTextSpan(ref.fileName, start.line - 1);
+                const snap = compilerService.host.getScriptSnapshot(ref.fileName);
+                const lineText = snap.getText(refLineSpan.start, ts.textSpanEnd(refLineSpan)).replace(/\r|\n/g, "");
                 return {
                     file: ref.fileName,
                     start: start,
@@ -531,27 +532,31 @@ namespace ts.server {
             };
         }
 
-        private openClientFile(fileName: string) {
-            var file = ts.normalizePath(fileName);
-            this.projectService.openClientFile(file);
+        /**
+         * @param fileName is the name of the file to be opened
+         * @param fileContent is a version of the file content that is known to be more up to date than the one on disk
+         */
+        private openClientFile(fileName: string, fileContent?: string) {
+            const file = ts.normalizePath(fileName);
+            this.projectService.openClientFile(file, fileContent);
         }
 
         private getQuickInfo(line: number, offset: number, fileName: string): protocol.QuickInfoResponseBody {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
-            var quickInfo = compilerService.languageService.getQuickInfoAtPosition(file, position);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const quickInfo = compilerService.languageService.getQuickInfoAtPosition(file, position);
             if (!quickInfo) {
                 return undefined;
             }
 
-            var displayString = ts.displayPartsToString(quickInfo.displayParts);
-            var docString = ts.displayPartsToString(quickInfo.documentation);
+            const displayString = ts.displayPartsToString(quickInfo.displayParts);
+            const docString = ts.displayPartsToString(quickInfo.documentation);
             return {
                 kind: quickInfo.kind,
                 kindModifiers: quickInfo.kindModifiers,
@@ -563,18 +568,18 @@ namespace ts.server {
         }
 
         private getFormattingEditsForRange(line: number, offset: number, endLine: number, endOffset: number, fileName: string): protocol.CodeEdit[] {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var startPosition = compilerService.host.lineOffsetToPosition(file, line, offset);
-            var endPosition = compilerService.host.lineOffsetToPosition(file, endLine, endOffset);
-            
+            const compilerService = project.compilerService;
+            const startPosition = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const endPosition = compilerService.host.lineOffsetToPosition(file, endLine, endOffset);
+
             // TODO: avoid duplicate code (with formatonkey)
-            var edits = compilerService.languageService.getFormattingEditsForRange(file, startPosition, endPosition,
+            const edits = compilerService.languageService.getFormattingEditsForRange(file, startPosition, endPosition,
                 this.projectService.getFormatCodeOptions(file));
             if (!edits) {
                 return undefined;
@@ -590,17 +595,17 @@ namespace ts.server {
         }
 
         private getFormattingEditsAfterKeystroke(line: number, offset: number, key: string, fileName: string): protocol.CodeEdit[] {
-            var file = ts.normalizePath(fileName);
+            const file = ts.normalizePath(fileName);
 
-            var project = this.projectService.getProjectForFile(file);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
-            var formatOptions = this.projectService.getFormatCodeOptions(file);
-            var edits = compilerService.languageService.getFormattingEditsAfterKeystroke(file, position, key,
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const formatOptions = this.projectService.getFormatCodeOptions(file);
+            const edits = compilerService.languageService.getFormattingEditsAfterKeystroke(file, position, key,
                 formatOptions);
             // Check whether we should auto-indent. This will be when
             // the position is on a line containing only whitespace.
@@ -609,23 +614,24 @@ namespace ts.server {
             // only to the previous line.  If all this is true, then
             // add edits necessary to properly indent the current line.
             if ((key == "\n") && ((!edits) || (edits.length === 0) || allEditsBeforePos(edits, position))) {
-                var scriptInfo = compilerService.host.getScriptInfo(file);
+                const scriptInfo = compilerService.host.getScriptInfo(file);
                 if (scriptInfo) {
-                    var lineInfo = scriptInfo.getLineInfo(line);
+                    const lineInfo = scriptInfo.getLineInfo(line);
                     if (lineInfo && (lineInfo.leaf) && (lineInfo.leaf.text)) {
-                        var lineText = lineInfo.leaf.text;
+                        const lineText = lineInfo.leaf.text;
                         if (lineText.search("\\S") < 0) {
                             // TODO: get these options from host
-                            var editorOptions: ts.EditorOptions = {
+                            const editorOptions: ts.EditorOptions = {
                                 IndentSize: formatOptions.IndentSize,
                                 TabSize: formatOptions.TabSize,
                                 NewLineCharacter: "\n",
                                 ConvertTabsToSpaces: formatOptions.ConvertTabsToSpaces,
                                 IndentStyle: ts.IndentStyle.Smart,
                             };
-                            var preferredIndent = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
-                            var hasIndent = 0;
-                            for (var i = 0, len = lineText.length; i < len; i++) {
+                            const preferredIndent = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
+                            let hasIndent = 0;
+                            let i: number, len: number;
+                            for (i = 0, len = lineText.length; i < len; i++) {
                                 if (lineText.charAt(i) == " ") {
                                     hasIndent++;
                                 }
@@ -638,7 +644,7 @@ namespace ts.server {
                             }
                             // i points to the first non whitespace character
                             if (preferredIndent !== hasIndent) {
-                                var firstNoWhiteSpacePosition = lineInfo.offset + i;
+                                const firstNoWhiteSpacePosition = lineInfo.offset + i;
                                 edits.push({
                                     span: ts.createTextSpanFromBounds(lineInfo.offset, firstNoWhiteSpacePosition),
                                     newText: generateIndentString(preferredIndent, editorOptions)
@@ -668,16 +674,16 @@ namespace ts.server {
             if (!prefix) {
                 prefix = "";
             }
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
 
-            var completions = compilerService.languageService.getCompletionsAtPosition(file, position);
+            const completions = compilerService.languageService.getCompletionsAtPosition(file, position);
             if (!completions) {
                 return undefined;
             }
@@ -692,17 +698,17 @@ namespace ts.server {
 
         private getCompletionEntryDetails(line: number, offset: number,
             entryNames: string[], fileName: string): protocol.CompletionEntryDetails[] {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
 
             return entryNames.reduce((accum: protocol.CompletionEntryDetails[], entryName: string) => {
-                var details = compilerService.languageService.getCompletionEntryDetails(file, position, entryName);
+                const details = compilerService.languageService.getCompletionEntryDetails(file, position, entryName);
                 if (details) {
                     accum.push(details);
                 }
@@ -711,21 +717,21 @@ namespace ts.server {
         }
 
         private getSignatureHelpItems(line: number, offset: number, fileName: string): protocol.SignatureHelpItems {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
-            
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
-            var helpItems = compilerService.languageService.getSignatureHelpItems(file, position);
+
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
+            const helpItems = compilerService.languageService.getSignatureHelpItems(file, position);
             if (!helpItems) {
                 return undefined;
             }
-            
-            var span = helpItems.applicableSpan;
-            var result: protocol.SignatureHelpItems = {
+
+            const span = helpItems.applicableSpan;
+            const result: protocol.SignatureHelpItems = {
                 items: helpItems.items,
                 applicableSpan: {
                     start: compilerService.host.positionToLineOffset(file, span.start),
@@ -734,15 +740,15 @@ namespace ts.server {
                 selectedItemIndex: helpItems.selectedItemIndex,
                 argumentIndex: helpItems.argumentIndex,
                 argumentCount: helpItems.argumentCount,
-            }
-            
+            };
+
             return result;
         }
-                
+
         private getDiagnostics(delay: number, fileNames: string[]) {
-            var checkList = fileNames.reduce((accum: PendingErrorCheck[], fileName: string) => {
+            const checkList = fileNames.reduce((accum: PendingErrorCheck[], fileName: string) => {
                 fileName = ts.normalizePath(fileName);
-                var project = this.projectService.getProjectForFile(fileName);
+                const project = this.projectService.getProjectForFile(fileName);
                 if (project) {
                     accum.push({ fileName, project });
                 }
@@ -750,17 +756,17 @@ namespace ts.server {
             }, []);
 
             if (checkList.length > 0) {
-                this.updateErrorCheck(checkList, this.changeSeq,(n) => n === this.changeSeq, delay)
+                this.updateErrorCheck(checkList, this.changeSeq, (n) => n === this.changeSeq, delay);
             }
         }
 
         private change(line: number, offset: number, endLine: number, endOffset: number, insertString: string, fileName: string) {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (project) {
-                var compilerService = project.compilerService;
-                var start = compilerService.host.lineOffsetToPosition(file, line, offset);
-                var end = compilerService.host.lineOffsetToPosition(file, endLine, endOffset);
+                const compilerService = project.compilerService;
+                const start = compilerService.host.lineOffsetToPosition(file, line, offset);
+                const end = compilerService.host.lineOffsetToPosition(file, endLine, endOffset);
                 if (start >= 0) {
                     compilerService.host.editScript(file, start, end, insertString);
                     this.changeSeq++;
@@ -770,9 +776,9 @@ namespace ts.server {
         }
 
         private reload(fileName: string, tempFileName: string, reqSeq = 0) {
-            var file = ts.normalizePath(fileName);
-            var tmpfile = ts.normalizePath(tempFileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const tmpfile = ts.normalizePath(tempFileName);
+            const project = this.projectService.getProjectForFile(file);
             if (project) {
                 this.changeSeq++;
                 // make sure no changes happen before this one is finished
@@ -783,10 +789,10 @@ namespace ts.server {
         }
 
         private saveToTmp(fileName: string, tempFileName: string) {
-            var file = ts.normalizePath(fileName);
-            var tmpfile = ts.normalizePath(tempFileName);
+            const file = ts.normalizePath(fileName);
+            const tmpfile = ts.normalizePath(tempFileName);
 
-            var project = this.projectService.getProjectForFile(file);
+            const project = this.projectService.getProjectForFile(file);
             if (project) {
                 project.compilerService.host.saveTo(file, tmpfile);
             }
@@ -794,7 +800,7 @@ namespace ts.server {
 
         private closeClientFile(fileName: string) {
             if (!fileName) { return; }
-            var file = ts.normalizePath(fileName);
+            const file = ts.normalizePath(fileName);
             this.projectService.closeClientFile(file);
         }
 
@@ -803,7 +809,7 @@ namespace ts.server {
                 return undefined;
             }
 
-            var compilerService = project.compilerService;
+            const compilerService = project.compilerService;
 
             return items.map(item => ({
                 text: item.text,
@@ -818,14 +824,14 @@ namespace ts.server {
         }
 
         private getNavigationBarItems(fileName: string): protocol.NavigationBarItem[] {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var items = compilerService.languageService.getNavigationBarItems(file);
+            const compilerService = project.compilerService;
+            const items = compilerService.languageService.getNavigationBarItems(file);
             if (!items) {
                 return undefined;
             }
@@ -834,22 +840,22 @@ namespace ts.server {
         }
 
         private getNavigateToItems(searchValue: string, fileName: string, maxResultCount?: number): protocol.NavtoItem[] {
-            var file = ts.normalizePath(fileName);
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
-            var compilerService = project.compilerService;
-            var navItems = compilerService.languageService.getNavigateToItems(searchValue, maxResultCount);
+            const compilerService = project.compilerService;
+            const navItems = compilerService.languageService.getNavigateToItems(searchValue, maxResultCount);
             if (!navItems) {
                 return undefined;
             }
 
             return navItems.map((navItem) => {
-                var start = compilerService.host.positionToLineOffset(navItem.fileName, navItem.textSpan.start);
-                var end = compilerService.host.positionToLineOffset(navItem.fileName, ts.textSpanEnd(navItem.textSpan));
-                var bakedItem: protocol.NavtoItem = {
+                const start = compilerService.host.positionToLineOffset(navItem.fileName, navItem.textSpan.start);
+                const end = compilerService.host.positionToLineOffset(navItem.fileName, ts.textSpanEnd(navItem.textSpan));
+                const bakedItem: protocol.NavtoItem = {
                     name: navItem.name,
                     kind: navItem.kind,
                     file: navItem.fileName,
@@ -859,7 +865,7 @@ namespace ts.server {
                 if (navItem.kindModifiers && (navItem.kindModifiers != "")) {
                     bakedItem.kindModifiers = navItem.kindModifiers;
                 }
-                if (navItem.matchKind != 'none') {
+                if (navItem.matchKind !== "none") {
                     bakedItem.matchKind = navItem.matchKind;
                 }
                 if (navItem.containerName && (navItem.containerName.length > 0)) {
@@ -873,21 +879,21 @@ namespace ts.server {
         }
 
         private getBraceMatching(line: number, offset: number, fileName: string): protocol.TextSpan[] {
-            var file = ts.normalizePath(fileName);
-            
-            var project = this.projectService.getProjectForFile(file);
+            const file = ts.normalizePath(fileName);
+
+            const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
-            
-            var compilerService = project.compilerService;
-            var position = compilerService.host.lineOffsetToPosition(file, line, offset);
-            
-            var spans = compilerService.languageService.getBraceMatchingAtPosition(file, position);
+
+            const compilerService = project.compilerService;
+            const position = compilerService.host.lineOffsetToPosition(file, line, offset);
+
+            const spans = compilerService.languageService.getBraceMatchingAtPosition(file, position);
             if (!spans) {
                 return undefined;
             }
-            
+
             return spans.map(span => ({
                 start: compilerService.host.positionToLineOffset(file, span.start),
                 end: compilerService.host.positionToLineOffset(file, span.start + span.length)
@@ -895,22 +901,22 @@ namespace ts.server {
         }
 
         getDiagnosticsForProject(delay: number, fileName: string) {
-            let { configFileName, fileNames: fileNamesInProject } = this.getProjectInfo(fileName, true);
+            const { configFileName, fileNames } = this.getProjectInfo(fileName, /*needFileNameList*/ true);
             // No need to analyze lib.d.ts
-            fileNamesInProject = fileNamesInProject.filter((value, index, array) => value.indexOf("lib.d.ts") < 0);
+            let fileNamesInProject = fileNames.filter((value, index, array) => value.indexOf("lib.d.ts") < 0);
 
             // Sort the file name list to make the recently touched files come first
-            let highPriorityFiles: string[] = [];
-            let mediumPriorityFiles: string[] = [];
-            let lowPriorityFiles: string[] = [];
-            let veryLowPriorityFiles: string[] = [];
-            let normalizedFileName = ts.normalizePath(fileName);
-            let project = this.projectService.getProjectForFile(normalizedFileName);
-            for (let fileNameInProject of fileNamesInProject) {
+            const highPriorityFiles: string[] = [];
+            const mediumPriorityFiles: string[] = [];
+            const lowPriorityFiles: string[] = [];
+            const veryLowPriorityFiles: string[] = [];
+            const normalizedFileName = ts.normalizePath(fileName);
+            const project = this.projectService.getProjectForFile(normalizedFileName);
+            for (const fileNameInProject of fileNamesInProject) {
                 if (this.getCanonicalFileName(fileNameInProject) == this.getCanonicalFileName(fileName))
                     highPriorityFiles.push(fileNameInProject);
                 else {
-                    let info = this.projectService.getScriptInfo(fileNameInProject);
+                    const info = this.projectService.getScriptInfo(fileNameInProject);
                     if (!info.isOpen) {
                         if (fileNameInProject.indexOf(".d.ts") > 0)
                             veryLowPriorityFiles.push(fileNameInProject);
@@ -925,8 +931,8 @@ namespace ts.server {
             fileNamesInProject = highPriorityFiles.concat(mediumPriorityFiles).concat(lowPriorityFiles).concat(veryLowPriorityFiles);
 
             if (fileNamesInProject.length > 0) {
-                let checkList = fileNamesInProject.map<PendingErrorCheck>((fileName: string) => {
-                    let normalizedFileName = ts.normalizePath(fileName);
+                const checkList = fileNamesInProject.map<PendingErrorCheck>((fileName: string) => {
+                    const normalizedFileName = ts.normalizePath(fileName);
                     return { fileName: normalizedFileName, project };
                 });
                 // Project level error analysis runs on background files too, therefore
@@ -936,121 +942,121 @@ namespace ts.server {
         }
 
         getCanonicalFileName(fileName: string) {
-            let name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
+            const name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
             return ts.normalizePath(name);
         }
 
         exit() {
         }
 
-        private handlers : Map<(request: protocol.Request) => {response?: any, responseRequired?: boolean}> = {
+        private handlers: Map<(request: protocol.Request) => {response?: any, responseRequired?: boolean}> = {
             [CommandNames.Exit]: () => {
                 this.exit();
                 return { responseRequired: false};
             },
             [CommandNames.Definition]: (request: protocol.Request) => {
-                var defArgs = <protocol.FileLocationRequestArgs>request.arguments;
+                const defArgs = <protocol.FileLocationRequestArgs>request.arguments;
                 return {response: this.getDefinition(defArgs.line, defArgs.offset, defArgs.file), responseRequired: true};
             },
             [CommandNames.TypeDefinition]: (request: protocol.Request) => {
-                var defArgs = <protocol.FileLocationRequestArgs>request.arguments;
+                const defArgs = <protocol.FileLocationRequestArgs>request.arguments;
                 return {response: this.getTypeDefinition(defArgs.line, defArgs.offset, defArgs.file), responseRequired: true};
             },
             [CommandNames.References]: (request: protocol.Request) => {
-                var defArgs = <protocol.FileLocationRequestArgs>request.arguments;
+                const defArgs = <protocol.FileLocationRequestArgs>request.arguments;
                 return {response: this.getReferences(defArgs.line, defArgs.offset, defArgs.file), responseRequired: true};
             },
             [CommandNames.Rename]: (request: protocol.Request) => {
-                var renameArgs = <protocol.RenameRequestArgs>request.arguments;
-                return {response: this.getRenameLocations(renameArgs.line, renameArgs.offset, renameArgs.file, renameArgs.findInComments, renameArgs.findInStrings), responseRequired: true}
+                const renameArgs = <protocol.RenameRequestArgs>request.arguments;
+                return {response: this.getRenameLocations(renameArgs.line, renameArgs.offset, renameArgs.file, renameArgs.findInComments, renameArgs.findInStrings), responseRequired: true};
             },
             [CommandNames.Open]: (request: protocol.Request) => {
-                var openArgs = <protocol.OpenRequestArgs>request.arguments;
-                this.openClientFile(openArgs.file);
-                return {responseRequired: false}
+                const openArgs = <protocol.OpenRequestArgs>request.arguments;
+                this.openClientFile(openArgs.file, openArgs.fileContent);
+                return {responseRequired: false};
             },
             [CommandNames.Quickinfo]: (request: protocol.Request) => {
-                var quickinfoArgs = <protocol.FileLocationRequestArgs>request.arguments;
+                const quickinfoArgs = <protocol.FileLocationRequestArgs>request.arguments;
                 return {response: this.getQuickInfo(quickinfoArgs.line, quickinfoArgs.offset, quickinfoArgs.file), responseRequired: true};
             },
             [CommandNames.Format]: (request: protocol.Request) => {
-                var formatArgs = <protocol.FormatRequestArgs>request.arguments;
+                const formatArgs = <protocol.FormatRequestArgs>request.arguments;
                 return {response: this.getFormattingEditsForRange(formatArgs.line, formatArgs.offset, formatArgs.endLine, formatArgs.endOffset, formatArgs.file), responseRequired: true};
             },
             [CommandNames.Formatonkey]: (request: protocol.Request) => {
-                var formatOnKeyArgs = <protocol.FormatOnKeyRequestArgs>request.arguments;
+                const formatOnKeyArgs = <protocol.FormatOnKeyRequestArgs>request.arguments;
                 return {response: this.getFormattingEditsAfterKeystroke(formatOnKeyArgs.line, formatOnKeyArgs.offset, formatOnKeyArgs.key, formatOnKeyArgs.file), responseRequired: true};
             },
             [CommandNames.Completions]: (request: protocol.Request) => {
-                var completionsArgs = <protocol.CompletionsRequestArgs>request.arguments;
-                return {response: this.getCompletions(completionsArgs.line, completionsArgs.offset, completionsArgs.prefix, completionsArgs.file), responseRequired: true}
+                const completionsArgs = <protocol.CompletionsRequestArgs>request.arguments;
+                return {response: this.getCompletions(completionsArgs.line, completionsArgs.offset, completionsArgs.prefix, completionsArgs.file), responseRequired: true};
             },
             [CommandNames.CompletionDetails]: (request: protocol.Request) => {
-                var completionDetailsArgs = <protocol.CompletionDetailsRequestArgs>request.arguments;
-                return {response: this.getCompletionEntryDetails(completionDetailsArgs.line,completionDetailsArgs.offset,
-                                                                  completionDetailsArgs.entryNames,completionDetailsArgs.file), responseRequired: true}
+                const completionDetailsArgs = <protocol.CompletionDetailsRequestArgs>request.arguments;
+                return {response: this.getCompletionEntryDetails(completionDetailsArgs.line, completionDetailsArgs.offset,
+                                                                  completionDetailsArgs.entryNames, completionDetailsArgs.file), responseRequired: true};
             },
             [CommandNames.SignatureHelp]: (request: protocol.Request) => {
-                var signatureHelpArgs = <protocol.SignatureHelpRequestArgs>request.arguments;
-                return {response: this.getSignatureHelpItems(signatureHelpArgs.line, signatureHelpArgs.offset, signatureHelpArgs.file), responseRequired: true}
+                const signatureHelpArgs = <protocol.SignatureHelpRequestArgs>request.arguments;
+                return {response: this.getSignatureHelpItems(signatureHelpArgs.line, signatureHelpArgs.offset, signatureHelpArgs.file), responseRequired: true};
             },
             [CommandNames.Geterr]: (request: protocol.Request) => {
-                var geterrArgs = <protocol.GeterrRequestArgs>request.arguments;
+                const geterrArgs = <protocol.GeterrRequestArgs>request.arguments;
                 return {response: this.getDiagnostics(geterrArgs.delay, geterrArgs.files), responseRequired: false};
             },
             [CommandNames.GeterrForProject]: (request: protocol.Request) => {
-                let { file, delay } = <protocol.GeterrForProjectRequestArgs>request.arguments;
+                const { file, delay } = <protocol.GeterrForProjectRequestArgs>request.arguments;
                 return {response: this.getDiagnosticsForProject(delay, file), responseRequired: false};
             },
             [CommandNames.Change]: (request: protocol.Request) => {
-                var changeArgs = <protocol.ChangeRequestArgs>request.arguments;
+                const changeArgs = <protocol.ChangeRequestArgs>request.arguments;
                 this.change(changeArgs.line, changeArgs.offset, changeArgs.endLine, changeArgs.endOffset,
                             changeArgs.insertString, changeArgs.file);
-                return {responseRequired: false}
+                return {responseRequired: false};
             },
             [CommandNames.Configure]: (request: protocol.Request) => {
-                var configureArgs = <protocol.ConfigureRequestArguments>request.arguments;
+                const configureArgs = <protocol.ConfigureRequestArguments>request.arguments;
                 this.projectService.setHostConfiguration(configureArgs);
                 this.output(undefined, CommandNames.Configure, request.seq);
-                return {responseRequired: false}
+                return {responseRequired: false};
             },
             [CommandNames.Reload]: (request: protocol.Request) => {
-                var reloadArgs = <protocol.ReloadRequestArgs>request.arguments;
+                const reloadArgs = <protocol.ReloadRequestArgs>request.arguments;
                 this.reload(reloadArgs.file, reloadArgs.tmpfile, request.seq);
-                return {responseRequired: false}
+                return {responseRequired: false};
             },
             [CommandNames.Saveto]: (request: protocol.Request) => {
-                var savetoArgs = <protocol.SavetoRequestArgs>request.arguments;
+                const savetoArgs = <protocol.SavetoRequestArgs>request.arguments;
                 this.saveToTmp(savetoArgs.file, savetoArgs.tmpfile);
-                return {responseRequired: false}
+                return {responseRequired: false};
             },
             [CommandNames.Close]: (request: protocol.Request) => {
-                var closeArgs = <protocol.FileRequestArgs>request.arguments;
+                const closeArgs = <protocol.FileRequestArgs>request.arguments;
                 this.closeClientFile(closeArgs.file);
                 return {responseRequired: false};
             },
             [CommandNames.Navto]: (request: protocol.Request) => {
-                var navtoArgs = <protocol.NavtoRequestArgs>request.arguments;
+                const navtoArgs = <protocol.NavtoRequestArgs>request.arguments;
                 return {response: this.getNavigateToItems(navtoArgs.searchValue, navtoArgs.file, navtoArgs.maxResultCount), responseRequired: true};
             },
             [CommandNames.Brace]: (request: protocol.Request) => {
-                var braceArguments = <protocol.FileLocationRequestArgs>request.arguments;
+                const braceArguments = <protocol.FileLocationRequestArgs>request.arguments;
                 return {response: this.getBraceMatching(braceArguments.line, braceArguments.offset, braceArguments.file), responseRequired: true};
             },
             [CommandNames.NavBar]: (request: protocol.Request) => {
-                var navBarArgs = <protocol.FileRequestArgs>request.arguments;
+                const navBarArgs = <protocol.FileRequestArgs>request.arguments;
                 return {response: this.getNavigationBarItems(navBarArgs.file), responseRequired: true};
             },
             [CommandNames.Occurrences]: (request: protocol.Request) => {
-                var { line, offset, file: fileName } = <protocol.FileLocationRequestArgs>request.arguments;
+                const { line, offset, file: fileName } = <protocol.FileLocationRequestArgs>request.arguments;
                 return {response: this.getOccurrences(line, offset, fileName), responseRequired: true};
             },
             [CommandNames.DocumentHighlights]: (request: protocol.Request) => {
-                var { line, offset, file: fileName, filesToSearch } = <protocol.DocumentHighlightsRequestArgs>request.arguments;
+                const { line, offset, file: fileName, filesToSearch } = <protocol.DocumentHighlightsRequestArgs>request.arguments;
                 return {response: this.getDocumentHighlights(line, offset, fileName, filesToSearch), responseRequired: true};
             },
             [CommandNames.ProjectInfo]: (request: protocol.Request) => {
-                var { file, needFileNameList } = <protocol.ProjectInfoRequestArgs>request.arguments;
+                const { file, needFileNameList } = <protocol.ProjectInfoRequestArgs>request.arguments;
                 return {response: this.getProjectInfo(file, needFileNameList), responseRequired: true};
             },
             [CommandNames.ReloadProjects]: (request: protocol.ReloadProjectsRequest) => {
@@ -1065,11 +1071,12 @@ namespace ts.server {
             this.handlers[command] = handler;
         }
 
-        public executeCommand(request: protocol.Request) : {response?: any, responseRequired?: boolean} {
-            var handler = this.handlers[request.command];
+        public executeCommand(request: protocol.Request): {response?: any, responseRequired?: boolean} {
+            const handler = this.handlers[request.command];
             if (handler) {
                 return handler(request);
-            } else {
+            }
+            else {
                 this.projectService.log("Unrecognized JSON command: " + JSON.stringify(request));
                 this.output(undefined, CommandNames.Unknown, request.seq, "Unrecognized JSON command: " + request.command);
                 return {responseRequired: false};
@@ -1077,20 +1084,22 @@ namespace ts.server {
         }
 
         public onMessage(message: string) {
+            let start: number[];
             if (this.logger.isVerbose()) {
                 this.logger.info("request: " + message);
-                var start = this.hrtime();                
+                start = this.hrtime();
             }
+            let request: protocol.Request;
             try {
-                var request = <protocol.Request>JSON.parse(message);
-                var {response, responseRequired} = this.executeCommand(request);
+                request = <protocol.Request>JSON.parse(message);
+                const {response, responseRequired} = this.executeCommand(request);
 
                 if (this.logger.isVerbose()) {
-                    var elapsed = this.hrtime(start);
-                    var seconds = elapsed[0]
-                    var nanoseconds = elapsed[1];
-                    var elapsedMs = ((1e9 * seconds) + nanoseconds)/1000000.0;
-                    var leader = "Elapsed time (in milliseconds)";
+                    const elapsed = this.hrtime(start);
+                    const seconds = elapsed[0];
+                    const nanoseconds = elapsed[1];
+                    const elapsedMs = ((1e9 * seconds) + nanoseconds) / 1000000.0;
+                    let leader = "Elapsed time (in milliseconds)";
                     if (!responseRequired) {
                         leader = "Async elapsed time (in milliseconds)";
                     }
@@ -1102,7 +1111,8 @@ namespace ts.server {
                 else if (responseRequired) {
                     this.output(undefined, request.command, request.seq, "No content available.");
                 }
-            } catch (err) {
+            }
+            catch (err) {
                 if (err instanceof OperationCanceledException) {
                     // Handle cancellation exceptions
                 }
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index 227ba6a7970..e307b21979e 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -446,7 +446,7 @@ namespace ts.BreakpointResolver {
                         // fall through.
 
                     case SyntaxKind.CatchClause:
-                        return spanInNode(lastOrUndefined((<Block>node.parent).statements));;
+                        return spanInNode(lastOrUndefined((<Block>node.parent).statements));
 
                     case SyntaxKind.CaseBlock:
                         // breakpoint in last statement of the last clause
@@ -493,9 +493,6 @@ namespace ts.BreakpointResolver {
                     default:
                         return spanInNode(node.parent);
                 }
-
-                // Default to parent node
-                return spanInNode(node.parent);
             }
 
             function spanInColonToken(node: Node): TextSpan {
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 4a7033c6f3e..651105e9d5c 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -695,8 +695,8 @@ namespace ts.formatting {
                 let tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
                 if (isTokenInRange) {
                     let rangeHasError = rangeContainsError(currentTokenInfo.token);
-                    // save prevStartLine since processRange will overwrite this value with current ones
-                    let prevStartLine = previousRangeStartLine;
+                    // save previousRange since processRange will overwrite this value with current one
+                    let savePreviousRange = previousRange;
                     lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
                     if (rangeHasError) {
                         // do not indent comments\token if token range overlaps with some error
@@ -707,7 +707,9 @@ namespace ts.formatting {
                             indentToken = lineAdded;
                         }
                         else {
-                            indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                            // indent token only if end line of previous range does not match start line of the token
+                            const prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
+                            indentToken = lastTriviaWasNewLine &&  tokenStart.line !== prevEndLine;
                         }
                     }
                 }
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index 3b68cd0ebb2..de1d1b19cf2 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -360,7 +360,6 @@ namespace ts.formatting {
                             return node;
                     }
                 }
-                return node;
             }
         }
 
diff --git a/src/services/formatting/tokenRange.ts b/src/services/formatting/tokenRange.ts
index 19185cdf78d..1afde613618 100644
--- a/src/services/formatting/tokenRange.ts
+++ b/src/services/formatting/tokenRange.ts
@@ -14,7 +14,7 @@ namespace ts.formatting {
             constructor(from: SyntaxKind, to: SyntaxKind, except: SyntaxKind[]) {
                 this.tokens = [];
                 for (let token = from; token <= to; token++) {
-                    if (except.indexOf(token) < 0) {
+                    if (ts.indexOf(except, token) < 0) {
                         this.tokens.push(token);
                     }
                 }
@@ -123,4 +123,4 @@ namespace ts.formatting {
             static TypeNames = TokenRange.FromTokens([SyntaxKind.Identifier, SyntaxKind.NumberKeyword, SyntaxKind.StringKeyword, SyntaxKind.BooleanKeyword, SyntaxKind.SymbolKeyword, SyntaxKind.VoidKeyword, SyntaxKind.AnyKeyword]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/services/navigateTo.ts b/src/services/navigateTo.ts
index bc506bc22f9..2a0abba8695 100644
--- a/src/services/navigateTo.ts
+++ b/src/services/navigateTo.ts
@@ -6,6 +6,9 @@ namespace ts.NavigateTo {
         let patternMatcher = createPatternMatcher(searchValue);
         let rawItems: RawNavigateToItem[] = [];
 
+        // This means "compare in a case insensitive manner."
+        let baseSensitivity: Intl.CollatorOptions = { sensitivity: "base" };
+
         // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[] 
         forEach(program.getSourceFiles(), sourceFile => {
             cancellationToken.throwIfCancellationRequested();
@@ -162,8 +165,6 @@ namespace ts.NavigateTo {
             return bestMatchKind;
         }
 
-        // This means "compare in a case insensitive manner."
-        let baseSensitivity: Intl.CollatorOptions = { sensitivity: "base" };
         function compareNavigateToItems(i1: RawNavigateToItem, i2: RawNavigateToItem) {
             // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
             // Right now we just sort by kind first, and then by name of the item.
diff --git a/src/services/services.ts b/src/services/services.ts
index 15c6e3df56f..f345cf647cc 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -132,51 +132,49 @@ namespace ts {
     let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
 
     let emptyArray: any[] = [];
-    
+
     const jsDocTagNames = [
-        "augments", 
-        "author", 
-        "argument", 
-        "borrows", 
-        "class", 
-        "constant", 
-        "constructor", 
-        "constructs", 
-        "default", 
-        "deprecated", 
-        "description", 
-        "event", 
-        "example", 
-        "extends", 
-        "field", 
-        "fileOverview", 
-        "function", 
-        "ignore", 
-        "inner", 
-        "lends", 
-        "link", 
-        "memberOf", 
-        "name", 
-        "namespace", 
-        "param", 
-        "private", 
-        "property", 
-        "public", 
-        "requires", 
-        "returns", 
-        "see", 
-        "since", 
-        "static", 
-        "throws", 
-        "type", 
+        "augments",
+        "author",
+        "argument",
+        "borrows",
+        "class",
+        "constant",
+        "constructor",
+        "constructs",
+        "default",
+        "deprecated",
+        "description",
+        "event",
+        "example",
+        "extends",
+        "field",
+        "fileOverview",
+        "function",
+        "ignore",
+        "inner",
+        "lends",
+        "link",
+        "memberOf",
+        "name",
+        "namespace",
+        "param",
+        "private",
+        "property",
+        "public",
+        "requires",
+        "returns",
+        "see",
+        "since",
+        "static",
+        "throws",
+        "type",
         "version"
     ];
     let jsDocCompletionEntries: CompletionEntry[];
 
     function createNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags, parent?: Node): NodeObject {
-        let node = <NodeObject> new (getNodeConstructor(kind))();
-        node.pos = pos;
-        node.end = end;
+        let node = new NodeObject(kind, pos, end);
         node.flags = flags;
         node.parent = parent;
         return node;
@@ -190,6 +188,14 @@ namespace ts {
         public parent: Node;
         private _children: Node[];
 
+        constructor(kind: SyntaxKind, pos: number, end: number) {
+            this.kind = kind;
+            this.pos = pos;
+            this.end = end;
+            this.flags = NodeFlags.None;
+            this.parent = undefined;
+        }
+
         public getSourceFile(): SourceFile {
             return getSourceFileOfNode(this);
         }
@@ -775,6 +781,7 @@ namespace ts {
     class SourceFileObject extends NodeObject implements SourceFile {
         public _declarationBrand: any;
         public fileName: string;
+        public path: Path;
         public text: string;
         public scriptSnapshot: IScriptSnapshot;
         public lineMap: number[];
@@ -794,6 +801,7 @@ namespace ts {
         public isDefaultLib: boolean;
         public hasNoDefaultLib: boolean;
         public externalModuleIndicator: Node; // The first node that causes this file to be an external module
+        public commonJsModuleIndicator: Node; // The first node that causes this file to be a CommonJS module
         public nodeCount: number;
         public identifierCount: number;
         public symbolCount: number;
@@ -806,6 +814,10 @@ namespace ts {
         public imports: LiteralExpression[];
         private namedDeclarations: Map<Declaration[]>;
 
+        constructor(kind: SyntaxKind, pos: number, end: number) {
+            super(kind, pos, end)
+        }
+
         public update(newText: string, textChangeRange: TextChangeRange): SourceFile {
             return updateSourceFile(this, newText, textChangeRange);
         }
@@ -1019,7 +1031,7 @@ namespace ts {
 
         /*
          * LS host can optionally implement this method if it wants to be completely in charge of module name resolution.
-         * if implementation is omitted then language service will use built-in module resolution logic and get answers to 
+         * if implementation is omitted then language service will use built-in module resolution logic and get answers to
          * host specific questions using 'getScriptSnapshot'.
          */
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
@@ -1600,6 +1612,9 @@ namespace ts {
         public static typeAliasName = "type alias name";
         public static parameterName = "parameter name";
         public static docCommentTagName = "doc comment tag name";
+        public static jsxOpenTagName = "jsx open tag name";
+        public static jsxCloseTagName = "jsx close tag name";
+        public static jsxSelfClosingTagName = "jsx self closing tag name";
     }
 
     export const enum ClassificationType {
@@ -1621,6 +1636,9 @@ namespace ts {
         typeAliasName = 16,
         parameterName = 17,
         docCommentTagName = 18,
+        jsxOpenTagName = 19,
+        jsxCloseTagName = 20,
+        jsxSelfClosingTagName = 21,
     }
 
     /// Language Service
@@ -1697,15 +1715,17 @@ namespace ts {
     class HostCache {
         private fileNameToEntry: FileMap<HostFileInformation>;
         private _compilationSettings: CompilerOptions;
+        private currentDirectory: string;
 
-        constructor(private host: LanguageServiceHost, getCanonicalFileName: (fileName: string) => string) {
+        constructor(private host: LanguageServiceHost, private getCanonicalFileName: (fileName: string) => string) {
             // script id => script index
-            this.fileNameToEntry = createFileMap<HostFileInformation>(getCanonicalFileName);
+            this.currentDirectory = host.getCurrentDirectory();
+            this.fileNameToEntry = createFileMap<HostFileInformation>();
 
             // Initialize the list with the root file names
             let rootFileNames = host.getScriptFileNames();
             for (let fileName of rootFileNames) {
-                this.createEntry(fileName);
+                this.createEntry(fileName, toPath(fileName, this.currentDirectory, getCanonicalFileName));
             }
 
             // store the compilation settings
@@ -1716,7 +1736,7 @@ namespace ts {
             return this._compilationSettings;
         }
 
-        private createEntry(fileName: string) {
+        private createEntry(fileName: string, path: Path) {
             let entry: HostFileInformation;
             let scriptSnapshot = this.host.getScriptSnapshot(fileName);
             if (scriptSnapshot) {
@@ -1727,30 +1747,31 @@ namespace ts {
                 };
             }
 
-            this.fileNameToEntry.set(fileName, entry);
+            this.fileNameToEntry.set(path, entry);
             return entry;
         }
 
-        private getEntry(fileName: string): HostFileInformation {
-            return this.fileNameToEntry.get(fileName);
+        private getEntry(path: Path): HostFileInformation {
+            return this.fileNameToEntry.get(path);
         }
 
-        private contains(fileName: string): boolean {
-            return this.fileNameToEntry.contains(fileName);
+        private contains(path: Path): boolean {
+            return this.fileNameToEntry.contains(path);
         }
 
         public getOrCreateEntry(fileName: string): HostFileInformation {
-            if (this.contains(fileName)) {
-                return this.getEntry(fileName);
+            let path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName)
+            if (this.contains(path)) {
+                return this.getEntry(path);
             }
 
-            return this.createEntry(fileName);
+            return this.createEntry(fileName, path);
         }
 
         public getRootFileNames(): string[] {
             let fileNames: string[] = [];
 
-            this.fileNameToEntry.forEachValue(value => {
+            this.fileNameToEntry.forEachValue((path, value) => {
                 if (value) {
                     fileNames.push(value.hostFileName);
                 }
@@ -1759,13 +1780,13 @@ namespace ts {
             return fileNames;
         }
 
-        public getVersion(fileName: string): string {
-            let file = this.getEntry(fileName);
+        public getVersion(path: Path): string {
+            let file = this.getEntry(path);
             return file && file.version;
         }
 
-        public getScriptSnapshot(fileName: string): IScriptSnapshot {
-            let file = this.getEntry(fileName);
+        public getScriptSnapshot(path: Path): IScriptSnapshot {
+            let file = this.getEntry(path);
             return file && file.scriptSnapshot;
         }
     }
@@ -1840,7 +1861,7 @@ namespace ts {
      * - allowNonTsExtensions = true
      * - noLib = true
      * - noResolve = true
-     */    
+     */
     export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput {
         let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions();
 
@@ -1995,7 +2016,7 @@ namespace ts {
     }
 
 
-    export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean): DocumentRegistry {
+    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.
         let buckets: Map<FileMap<DocumentRegistryEntry>> = {};
@@ -2009,7 +2030,7 @@ namespace ts {
             let key = getKeyFromCompilationSettings(settings);
             let bucket = lookUp(buckets, key);
             if (!bucket && createIfMissing) {
-                buckets[key] = bucket = createFileMap<DocumentRegistryEntry>(getCanonicalFileName);
+                buckets[key] = bucket = createFileMap<DocumentRegistryEntry>();
             }
             return bucket;
         }
@@ -2018,14 +2039,13 @@ namespace ts {
             let bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => {
                 let entries = lookUp(buckets, name);
                 let sourceFiles: { name: string; refCount: number; references: string[]; }[] = [];
-                for (let i in entries) {
-                    let entry = entries.get(i);
+                entries.forEachValue((key, entry) => {
                     sourceFiles.push({
-                        name: i,
+                        name: key,
                         refCount: entry.languageServiceRefCount,
                         references: entry.owners.slice(0)
                     });
-                }
+                });
                 sourceFiles.sort((x, y) => y.refCount - x.refCount);
                 return {
                     bucket: name,
@@ -2051,7 +2071,8 @@ namespace ts {
             acquiring: boolean): SourceFile {
 
             let bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
-            let entry = bucket.get(fileName);
+            let path = toPath(fileName, currentDirectory, getCanonicalFileName);
+            let entry = bucket.get(path);
             if (!entry) {
                 Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
 
@@ -2063,7 +2084,7 @@ namespace ts {
                     languageServiceRefCount: 0,
                     owners: []
                 };
-                bucket.set(fileName, entry);
+                bucket.set(path, entry);
             }
             else {
                 // We have an entry for this file.  However, it may be for a different version of
@@ -2091,12 +2112,14 @@ namespace ts {
             let bucket = getBucketForCompilationSettings(compilationSettings, false);
             Debug.assert(bucket !== undefined);
 
-            let entry = bucket.get(fileName);
+            let path = toPath(fileName, currentDirectory, getCanonicalFileName);
+
+            let entry = bucket.get(path);
             entry.languageServiceRefCount--;
 
             Debug.assert(entry.languageServiceRefCount >= 0);
             if (entry.languageServiceRefCount === 0) {
-                bucket.remove(fileName);
+                bucket.remove(path);
             }
         }
 
@@ -2108,7 +2131,7 @@ namespace ts {
         };
     }
 
-    export function preProcessFile(sourceText: string, readImportFiles = true): PreProcessedFileInfo {
+    export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo {
         let referencedFiles: FileReference[] = [];
         let importedFiles: FileReference[] = [];
         let ambientExternalModules: string[];
@@ -2146,9 +2169,225 @@ namespace ts {
             });
         }
 
-        function processImport(): void {
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeDeclare(): boolean {
+            let token = scanner.getToken();
+            if (token === SyntaxKind.DeclareKeyword) {
+                // declare module "mod"
+                token = scanner.scan();
+                if (token === SyntaxKind.ModuleKeyword) {
+                    token = scanner.scan();
+                    if (token === SyntaxKind.StringLiteral) {
+                        recordAmbientExternalModule();
+                    }
+                }
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeImport(): boolean {
+            let token = scanner.getToken();
+            if (token === SyntaxKind.ImportKeyword) {
+                token = scanner.scan();
+                if (token === SyntaxKind.StringLiteral) {
+                    // import "mod";
+                    recordModuleName();
+                    return true;
+                }
+                else {
+                    if (token === SyntaxKind.Identifier || isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === SyntaxKind.FromKeyword) {
+                            token = scanner.scan();
+                            if (token === SyntaxKind.StringLiteral) {
+                                // import d from "mod";
+                                recordModuleName();
+                                return true;
+                            }
+                        }
+                        else if (token === SyntaxKind.EqualsToken) {
+                            if (tryConsumeRequireCall(/* skipCurrentToken */ true)) {
+                                return true;
+                            }
+                        }
+                        else if (token === SyntaxKind.CommaToken) {
+                            // consume comma and keep going
+                            token = scanner.scan();
+                        }
+                        else {
+                            // unknown syntax
+                            return true;
+                        }
+                    }
+
+                    if (token === SyntaxKind.OpenBraceToken) {
+                        token = scanner.scan();
+                        // consume "{ a as B, c, d as D}" clauses
+                        // make sure that it stops on EOF
+                        while (token !== SyntaxKind.CloseBraceToken && token !== SyntaxKind.EndOfFileToken) {
+                            token = scanner.scan();
+                        }
+
+                        if (token === SyntaxKind.CloseBraceToken) {
+                            token = scanner.scan();
+                            if (token === SyntaxKind.FromKeyword) {
+                                token = scanner.scan();
+                                if (token === SyntaxKind.StringLiteral) {
+                                    // import {a as A} from "mod";
+                                    // import d, {a, b as B} from "mod"
+                                    recordModuleName();
+                                }
+                            }
+                        }
+                    }
+                    else if (token === SyntaxKind.AsteriskToken) {
+                        token = scanner.scan();
+                        if (token === SyntaxKind.AsKeyword) {
+                            token = scanner.scan();
+                            if (token === SyntaxKind.Identifier || isKeyword(token)) {
+                                token = scanner.scan();
+                                if (token === SyntaxKind.FromKeyword) {
+                                    token = scanner.scan();
+                                    if (token === SyntaxKind.StringLiteral) {
+                                        // import * as NS from "mod"
+                                        // import d, * as NS from "mod"
+                                        recordModuleName();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        function tryConsumeExport(): boolean {
+            let token = scanner.getToken();
+            if (token === SyntaxKind.ExportKeyword) {
+                token = scanner.scan();
+                if (token === SyntaxKind.OpenBraceToken) {
+                    token = scanner.scan();
+                    // consume "{ a as B, c, d as D}" clauses
+                    // make sure it stops on EOF
+                    while (token !== SyntaxKind.CloseBraceToken && token !== SyntaxKind.EndOfFileToken) {
+                        token = scanner.scan();
+                    }
+
+                    if (token === SyntaxKind.CloseBraceToken) {
+                        token = scanner.scan();
+                        if (token === SyntaxKind.FromKeyword) {
+                            token = scanner.scan();
+                            if (token === SyntaxKind.StringLiteral) {
+                                // export {a as A} from "mod";
+                                // export {a, b as B} from "mod"
+                                recordModuleName();
+                            }
+                        }
+                    }
+                }
+                else if (token === SyntaxKind.AsteriskToken) {
+                    token = scanner.scan();
+                    if (token === SyntaxKind.FromKeyword) {
+                        token = scanner.scan();
+                        if (token === SyntaxKind.StringLiteral) {
+                            // export * from "mod"
+                            recordModuleName();
+                        }
+                    }
+                }
+                else if (token === SyntaxKind.ImportKeyword) {
+                    token = scanner.scan();
+                    if (token === SyntaxKind.Identifier || isKeyword(token)) {
+                        token = scanner.scan();
+                        if (token === SyntaxKind.EqualsToken) {
+                            if (tryConsumeRequireCall(/* skipCurrentToken */ true)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+
+                return true;
+            }
+            
+            return false;
+        }
+
+        function tryConsumeRequireCall(skipCurrentToken: boolean): boolean {
+            let token = skipCurrentToken ? scanner.scan() : scanner.getToken();
+            if (token === SyntaxKind.RequireKeyword) {
+                token = scanner.scan();
+                if (token === SyntaxKind.OpenParenToken) {
+                    token = scanner.scan();
+                    if (token === SyntaxKind.StringLiteral) {
+                        //  require("mod");
+                        recordModuleName();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        
+        function tryConsumeDefine(): boolean {
+            let token = scanner.getToken();
+            if (token === SyntaxKind.Identifier && scanner.getTokenValue() === "define") {
+                token = scanner.scan();
+                if (token !== SyntaxKind.OpenParenToken) {
+                    return true;
+                }
+
+                token = scanner.scan();
+                if (token === SyntaxKind.StringLiteral) {
+                    // looks like define ("modname", ... - skip string literal and comma
+                    token = scanner.scan();
+                    if (token === SyntaxKind.CommaToken) {
+                        token = scanner.scan();
+                    }
+                    else {
+                        // unexpected token
+                        return true;
+                    }
+                }
+
+                // should be start of dependency list
+                if (token !== SyntaxKind.OpenBracketToken)  {
+                    return true;
+                }
+                
+                // skip open bracket
+                token = scanner.scan();
+                let i = 0;
+                // scan until ']' or EOF
+                while (token !== SyntaxKind.CloseBracketToken && token !== SyntaxKind.EndOfFileToken) {
+                    // record string literals as module names
+                    if (token === SyntaxKind.StringLiteral) {
+                        recordModuleName();
+                        i++;
+                    }
+
+                    token = scanner.scan();
+                }
+                return true;
+                
+            }
+            return false;
+        }
+
+        function processImports(): void {
             scanner.setText(sourceText);
-            let token = scanner.scan();
+            scanner.scan();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -2160,157 +2399,30 @@ namespace ts {
             //    export * from "mod"
             //    export {a as b} from "mod"
             //    export import i = require("mod")
+            //    (for JavaScript files) require("mod")
 
-            while (token !== SyntaxKind.EndOfFileToken) {
-                if (token === SyntaxKind.DeclareKeyword) {
-                    // declare module "mod"
-                    token = scanner.scan();
-                    if (token === SyntaxKind.ModuleKeyword) {
-                        token = scanner.scan();
-                        if (token === SyntaxKind.StringLiteral) {
-                            recordAmbientExternalModule();
-                            continue;
-                        }
-                    }
+            while (true) {
+                if (scanner.getToken() === SyntaxKind.EndOfFileToken) {
+                    break;
                 }
-                else if (token === SyntaxKind.ImportKeyword) {
-                    token = scanner.scan();
-                    if (token === SyntaxKind.StringLiteral) {
-                        // import "mod";
-                        recordModuleName();
-                        continue;
-                    }
-                    else {
-                        if (token === SyntaxKind.Identifier || isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === SyntaxKind.FromKeyword) {
-                                token = scanner.scan();
-                                if (token === SyntaxKind.StringLiteral) {
-                                    // import d from "mod";
-                                    recordModuleName();
-                                    continue
-                                }
-                            }
-                            else if (token === SyntaxKind.EqualsToken) {
-                                token = scanner.scan();
-                                if (token === SyntaxKind.RequireKeyword) {
-                                    token = scanner.scan();
-                                    if (token === SyntaxKind.OpenParenToken) {
-                                        token = scanner.scan();
-                                        if (token === SyntaxKind.StringLiteral) {
-                                            //  import i = require("mod");
-                                            recordModuleName();
-                                            continue;
-                                        }
-                                    }
-                                }
-                            }
-                            else if (token === SyntaxKind.CommaToken) {
-                                // consume comma and keep going
-                                token = scanner.scan();
-                            }
-                            else {
-                                // unknown syntax
-                                continue;
-                            }
-                        }
 
-                        if (token === SyntaxKind.OpenBraceToken) {
-                            token = scanner.scan();
-                            // consume "{ a as B, c, d as D}" clauses
-                            while (token !== SyntaxKind.CloseBraceToken) {
-                                token = scanner.scan();
-                            }
-
-                            if (token === SyntaxKind.CloseBraceToken) {
-                                token = scanner.scan();
-                                if (token === SyntaxKind.FromKeyword) {
-                                    token = scanner.scan();
-                                    if (token === SyntaxKind.StringLiteral) {
-                                        // import {a as A} from "mod";
-                                        // import d, {a, b as B} from "mod"
-                                        recordModuleName();
-                                    }
-                                }
-                            }
-                        }
-                        else if (token === SyntaxKind.AsteriskToken) {
-                            token = scanner.scan();
-                            if (token === SyntaxKind.AsKeyword) {
-                                token = scanner.scan();
-                                if (token === SyntaxKind.Identifier || isKeyword(token)) {
-                                    token = scanner.scan();
-                                    if (token === SyntaxKind.FromKeyword) {
-                                        token = scanner.scan();
-                                        if (token === SyntaxKind.StringLiteral) {
-                                            // import * as NS from "mod"
-                                            // import d, * as NS from "mod"
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                // check if at least one of alternative have moved scanner forward
+                if (tryConsumeDeclare() ||
+                    tryConsumeImport() ||
+                    tryConsumeExport() ||
+                    (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) {
+                    continue;
                 }
-                else if (token === SyntaxKind.ExportKeyword) {
-                    token = scanner.scan();
-                    if (token === SyntaxKind.OpenBraceToken) {
-                        token = scanner.scan();
-                        // consume "{ a as B, c, d as D}" clauses
-                        while (token !== SyntaxKind.CloseBraceToken) {
-                            token = scanner.scan();
-                        }
-
-                        if (token === SyntaxKind.CloseBraceToken) {
-                            token = scanner.scan();
-                            if (token === SyntaxKind.FromKeyword) {
-                                token = scanner.scan();
-                                if (token === SyntaxKind.StringLiteral) {
-                                    // export {a as A} from "mod";
-                                    // export {a, b as B} from "mod"
-                                    recordModuleName();
-                                }
-                            }
-                        }
-                    }
-                    else if (token === SyntaxKind.AsteriskToken) {
-                        token = scanner.scan();
-                        if (token === SyntaxKind.FromKeyword) {
-                            token = scanner.scan();
-                            if (token === SyntaxKind.StringLiteral) {
-                                // export * from "mod"
-                                recordModuleName();
-                            }
-                        }
-                    }
-                    else if (token === SyntaxKind.ImportKeyword) {
-                        token = scanner.scan();
-                        if (token === SyntaxKind.Identifier || isKeyword(token)) {
-                            token = scanner.scan();
-                            if (token === SyntaxKind.EqualsToken) {
-                                token = scanner.scan();
-                                if (token === SyntaxKind.RequireKeyword) {
-                                    token = scanner.scan();
-                                    if (token === SyntaxKind.OpenParenToken) {
-                                        token = scanner.scan();
-                                        if (token === SyntaxKind.StringLiteral) {
-                                            //  export import i = require("mod");
-                                            recordModuleName();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                else {
+                    scanner.scan();
                 }
-                token = scanner.scan();
             }
+
             scanner.setText(undefined);
         }
 
         if (readImportFiles) {
-            processImport();
+            processImports();
         }
         processTripleSlashDirectives();
         return { referencedFiles, importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules };
@@ -2558,7 +2670,9 @@ namespace ts {
         }
     }
 
-    export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry()): LanguageService {
+    export function createLanguageService(host: LanguageServiceHost,
+        documentRegistry: DocumentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory())): LanguageService {
+
         let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host);
         let ruleProvider: formatting.RulesProvider;
         let program: Program;
@@ -2567,6 +2681,7 @@ namespace ts {
         let useCaseSensitivefileNames = false;
         let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
 
+        let currentDirectory = host.getCurrentDirectory();
         // Check if the localized messages json is set, otherwise query the host for it
         if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
             localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
@@ -2581,8 +2696,7 @@ namespace ts {
         let getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames);
 
         function getValidSourceFile(fileName: string): SourceFile {
-            fileName = normalizeSlashes(fileName);
-            let sourceFile = program.getSourceFile(getCanonicalFileName(fileName));
+            let sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
@@ -2643,11 +2757,11 @@ namespace ts {
                 getNewLine: () => getNewLineOrDefaultFromHost(host),
                 getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
                 writeFile: (fileName, data, writeByteOrderMark) => { },
-                getCurrentDirectory: () => host.getCurrentDirectory(),
-                fileExists: (fileName): boolean => { 
+                getCurrentDirectory: () => currentDirectory,
+                fileExists: (fileName): boolean => {
                     // stub missing host functionality
                     Debug.assert(!host.resolveModuleNames);
-                    return hostCache.getOrCreateEntry(fileName) !== undefined; 
+                    return hostCache.getOrCreateEntry(fileName) !== undefined;
                 },
                 readFile: (fileName): string => {
                     // stub missing host functionality
@@ -2667,9 +2781,8 @@ namespace ts {
             if (program) {
                 let oldSourceFiles = program.getSourceFiles();
                 for (let oldSourceFile of oldSourceFiles) {
-                    let fileName = oldSourceFile.fileName;
-                    if (!newProgram.getSourceFile(fileName) || changesInCompilationSettingsAffectSyntax) {
-                        documentRegistry.releaseDocument(fileName, oldSettings);
+                    if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) {
+                        documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings);
                     }
                 }
             }
@@ -2734,7 +2847,11 @@ namespace ts {
             }
 
             function sourceFileUpToDate(sourceFile: SourceFile): boolean {
-                return sourceFile && sourceFile.version === hostCache.getVersion(sourceFile.fileName);
+                if (!sourceFile) {
+                    return false;
+                }
+                let path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName);
+                return sourceFile.version === hostCache.getVersion(path);
             }
 
             function programUpToDate(): boolean {
@@ -2797,7 +2914,7 @@ namespace ts {
             // For JavaScript files, we don't want to report the normal typescript semantic errors.
             // Instead, we just report errors for using TypeScript-only constructs from within a
             // JavaScript file.
-            if (isJavaScript(fileName)) {
+            if (isSourceFileJavaScript(targetSourceFile)) {
                 return getJavaScriptSemanticDiagnostics(targetSourceFile);
             }
 
@@ -3036,7 +3153,7 @@ namespace ts {
             let typeChecker = program.getTypeChecker();
             let syntacticStart = new Date().getTime();
             let sourceFile = getValidSourceFile(fileName);
-            let isJavaScriptFile = isJavaScript(fileName);
+            let isJavaScriptFile = isSourceFileJavaScript(sourceFile);
 
             let isJsDocTagName = false;
 
@@ -3050,7 +3167,7 @@ namespace ts {
             log("getCompletionData: Is inside comment: " + (new Date().getTime() - start));
 
             if (insideComment) {
-                // The current position is next to the '@' sign, when no tag name being provided yet. 
+                // The current position is next to the '@' sign, when no tag name being provided yet.
                 // Provide a full list of tag names
                 if (hasDocComment(sourceFile, position) && sourceFile.text.charCodeAt(position - 1) === CharacterCodes.at) {
                     isJsDocTagName = true;
@@ -3083,7 +3200,7 @@ namespace ts {
                 }
 
                 if (!insideJsDocTagExpression) {
-                    // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal 
+                    // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal
                     // comment or the plain text part of a jsDoc comment, so no completion should be available
                     log("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment.");
                     return undefined;
@@ -3604,8 +3721,8 @@ namespace ts {
 
                         case SyntaxKind.CloseBraceToken:
                             if (parent &&
-                                parent.kind === SyntaxKind.JsxExpression && 
-                                parent.parent && 
+                                parent.kind === SyntaxKind.JsxExpression &&
+                                parent.parent &&
                                 (parent.parent.kind === SyntaxKind.JsxAttribute)) {
                                 return <JsxOpeningLikeElement>parent.parent.parent;
                             }
@@ -3654,7 +3771,7 @@ namespace ts {
                             containingNodeKind === SyntaxKind.InterfaceDeclaration ||                   // interface A<T, |
                             containingNodeKind === SyntaxKind.ArrayBindingPattern ||                    // var [x, y|
                             containingNodeKind === SyntaxKind.TypeAliasDeclaration;                     // type Map, K, |
-                                                                                                          
+
                     case SyntaxKind.DotToken:
                         return containingNodeKind === SyntaxKind.ArrayBindingPattern;                   // var [.|
 
@@ -3808,7 +3925,10 @@ namespace ts {
                     let existingName: string;
 
                     if (m.kind === SyntaxKind.BindingElement && (<BindingElement>m).propertyName) {
-                        existingName = (<BindingElement>m).propertyName.text;
+                        // include only identifiers in completion list
+                        if ((<BindingElement>m).propertyName.kind === SyntaxKind.Identifier) {
+                            existingName = (<Identifier>(<BindingElement>m).propertyName).text
+                        }
                     }
                     else {
                         // TODO(jfreeman): Account for computed property name
@@ -3857,22 +3977,25 @@ namespace ts {
 
             let { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData;
 
-            let entries: CompletionEntry[];
             if (isJsDocTagName) {
                 // If the current position is a jsDoc tag name, only tag names should be provided for completion
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
 
-            if (isRightOfDot && isJavaScript(fileName)) {
-                entries = getCompletionEntriesFromSymbols(symbols);
-                addRange(entries, getJavaScriptCompletionEntries());
+            let sourceFile = getValidSourceFile(fileName);
+
+            let entries: CompletionEntry[] = [];
+            
+            if (isRightOfDot && isSourceFileJavaScript(sourceFile)) {
+                const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
+                addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     return undefined;
                 }
 
-                entries = getCompletionEntriesFromSymbols(symbols);
+                getCompletionEntriesFromSymbols(symbols, entries);
             }
 
             // Add keywords if this is not a member completion list
@@ -3882,26 +4005,23 @@ namespace ts {
 
             return { isMemberCompletion, isNewIdentifierLocation, entries };
 
-            function getJavaScriptCompletionEntries(): CompletionEntry[] {
+            function getJavaScriptCompletionEntries(sourceFile: SourceFile, uniqueNames: Map<string>): CompletionEntry[] {
                 let entries: CompletionEntry[] = [];
-                let allNames: Map<string> = {};
                 let target = program.getCompilerOptions().target;
 
-                for (let sourceFile of program.getSourceFiles()) {
-                    let nameTable = getNameTable(sourceFile);
-                    for (let name in nameTable) {
-                        if (!allNames[name]) {
-                            allNames[name] = name;
-                            let displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks:*/ true);
-                            if (displayName) {
-                                let entry = {
-                                    name: displayName,
-                                    kind: ScriptElementKind.warning,
-                                    kindModifiers: "",
-                                    sortText: "1"
-                                };
-                                entries.push(entry);
-                            }
+                let nameTable = getNameTable(sourceFile);
+                for (let name in nameTable) {
+                    if (!uniqueNames[name]) {
+                        uniqueNames[name] = name;
+                        let displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks:*/ true);
+                        if (displayName) {
+                            let entry = {
+                                name: displayName,
+                                kind: ScriptElementKind.warning,
+                                kindModifiers: "",
+                                sortText: "1"
+                            };
+                            entries.push(entry);
                         }
                     }
                 }
@@ -3945,26 +4065,24 @@ namespace ts {
                 };
             }
 
-            function getCompletionEntriesFromSymbols(symbols: Symbol[]): CompletionEntry[] {
+            function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[]): Map<string> {
                 let start = new Date().getTime();
-                let entries: CompletionEntry[] = [];
-
+                let uniqueNames: Map<string> = {};
                 if (symbols) {
-                    let nameToSymbol: Map<Symbol> = {};
                     for (let symbol of symbols) {
                         let entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             let id = escapeIdentifier(entry.name);
-                            if (!lookUp(nameToSymbol, id)) {
+                            if (!lookUp(uniqueNames, id)) {
                                 entries.push(entry);
-                                nameToSymbol[id] = symbol;
+                                uniqueNames[id] = id;
                             }
                         }
                     }
                 }
 
                 log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
-                return entries;
+                return uniqueNames;
             }
         }
 
@@ -4888,7 +5006,7 @@ namespace ts {
                                 }
                                 break;
                             default:
-                                if (isModifier(node.kind) && node.parent &&
+                                if (isModifierKind(node.kind) && node.parent &&
                                     (isDeclaration(node.parent) || node.parent.kind === SyntaxKind.VariableStatement)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
@@ -4931,7 +5049,7 @@ namespace ts {
                         else if (!isFunctionLike(node)) {
                             forEachChild(node, aggregate);
                         }
-                    };
+                    }
                 }
 
                 /**
@@ -4978,7 +5096,7 @@ namespace ts {
                         else if (!isFunctionLike(node)) {
                             forEachChild(node, aggregate);
                         }
-                    };
+                    }
                 }
 
                 function ownsBreakOrContinueStatement(owner: Node, statement: BreakOrContinueStatement): boolean {
@@ -6287,8 +6405,6 @@ namespace ts {
             }
 
             return SemanticMeaning.Value | SemanticMeaning.Type | SemanticMeaning.Namespace;
-
-            Debug.fail("Unknown declaration type");
         }
 
         function isTypeReference(node: Node): boolean {
@@ -6603,6 +6719,9 @@ namespace ts {
                 case ClassificationType.typeAliasName: return ClassificationTypeNames.typeAliasName;
                 case ClassificationType.parameterName: return ClassificationTypeNames.parameterName;
                 case ClassificationType.docCommentTagName: return ClassificationTypeNames.docCommentTagName;
+                case ClassificationType.jsxOpenTagName: return ClassificationTypeNames.jsxOpenTagName;
+                case ClassificationType.jsxCloseTagName: return ClassificationTypeNames.jsxCloseTagName;
+                case ClassificationType.jsxSelfClosingTagName: return ClassificationTypeNames.jsxSelfClosingTagName;
             }
         }
 
@@ -6915,6 +7034,23 @@ namespace ts {
                                 }
                                 return;
 
+                            case SyntaxKind.JsxOpeningElement:
+                                if ((<JsxOpeningElement>token.parent).tagName === token) {
+                                    return ClassificationType.jsxOpenTagName;
+                                }
+                                return;
+
+                            case SyntaxKind.JsxClosingElement:
+                                if ((<JsxClosingElement>token.parent).tagName === token) {
+                                    return ClassificationType.jsxCloseTagName;
+                                }
+                                return;
+
+                            case SyntaxKind.JsxSelfClosingElement:
+                                if ((<JsxSelfClosingElement>token.parent).tagName === token) {
+                                    return ClassificationType.jsxSelfClosingTagName;
+                                }
+                                return;
                         }
                     }
 
@@ -7362,7 +7498,7 @@ namespace ts {
                                 let sourceFile = current.getSourceFile();
                                 var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName));
                                 if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) {
-                                    return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                                    return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
                             }
                         }
@@ -7384,7 +7520,7 @@ namespace ts {
                 }
             }
 
-            return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key));
+            return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element));
 
             function getRenameInfoError(localizedErrorMessage: string): RenameInfo {
                 return {
@@ -7966,18 +8102,8 @@ namespace ts {
 
     function initializeServices() {
         objectAllocator = {
-            getNodeConstructor: kind => {
-                function Node() {
-                }
-                let proto = kind === SyntaxKind.SourceFile ? new SourceFileObject() : new NodeObject();
-                proto.kind = kind;
-                proto.pos = -1;
-                proto.end = -1;
-                proto.flags = 0;
-                proto.parent = undefined;
-                Node.prototype = proto;
-                return <any>Node;
-            },
+            getNodeConstructor: () => NodeObject,
+            getSourceFileConstructor: () => SourceFileObject,
             getSymbolConstructor: () => SymbolObject,
             getTypeConstructor: () => TypeObject,
             getSignatureConstructor: () => SignatureObject,
diff --git a/src/services/shims.ts b/src/services/shims.ts
index e919625395d..6b656ea2738 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -323,7 +323,6 @@ namespace ts {
             // TODO: should this be '==='?
             if (settingsJson == null || settingsJson == "") {
                 throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-                return null;
             }
             return <CompilerOptions>JSON.parse(settingsJson);
         }
@@ -957,7 +956,8 @@ namespace ts {
             return this.forwardJSONCall(
                 "getPreProcessedFileInfo('" + fileName + "')",
                 () => {
-                    var result = preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()));
+                    // for now treat files as JavaScript 
+                    var result = preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
                     var convertResult = {
                         referencedFiles: <IFileReference[]>[],
                         importedFiles: <IFileReference[]>[],
@@ -1033,7 +1033,7 @@ namespace ts {
         public createLanguageServiceShim(host: LanguageServiceShimHost): LanguageServiceShim {
             try {
                 if (this.documentRegistry === undefined) {
-                    this.documentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                    this.documentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
                 }
                 var hostAdapter = new LanguageServiceShimHostAdapter(host);
                 var languageService = createLanguageService(hostAdapter, this.documentRegistry);
@@ -1069,7 +1069,7 @@ namespace ts {
         public close(): void {
             // Forget all the registered shims
             this._shims = [];
-            this.documentRegistry = createDocumentRegistry();
+            this.documentRegistry = undefined;
         }
 
         public registerShim(shim: Shim): void {
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index df321647e5c..02e36e185a5 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -204,7 +204,7 @@ namespace ts.SignatureHelp {
         if (!candidates.length) {
             // We didn't have any sig help items produced by the TS compiler.  If this is a JS 
             // file, then see if we can figure out anything better.
-            if (isJavaScript(sourceFile.fileName)) {
+            if (isSourceFileJavaScript(sourceFile)) {
                 return createJavaScriptSignatureHelpItems(argumentInfo);
             }
 
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index f30bd2c21a9..694730e61c4 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -57,5 +57,5 @@ function compile(fileNames, options) {
 exports.compile = compile;
 compile(process.argv.slice(2), {
     noEmitOnError: true, noImplicitAny: true,
-    target: 1 /* ES5 */, module: 1 /* CommonJS */
+    target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
 });
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index aeff3a327f5..b7b2a93ba87 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -75,28 +75,28 @@ function delint(sourceFile) {
     delintNode(sourceFile);
     function delintNode(node) {
         switch (node.kind) {
-            case 199 /* ForStatement */:
-            case 200 /* ForInStatement */:
-            case 198 /* WhileStatement */:
-            case 197 /* DoStatement */:
-                if (node.statement.kind !== 192 /* Block */) {
+            case ts.SyntaxKind.ForStatement:
+            case ts.SyntaxKind.ForInStatement:
+            case ts.SyntaxKind.WhileStatement:
+            case ts.SyntaxKind.DoStatement:
+                if (node.statement.kind !== ts.SyntaxKind.Block) {
                     report(node, "A looping statement's contents should be wrapped in a block body.");
                 }
                 break;
-            case 196 /* IfStatement */:
+            case ts.SyntaxKind.IfStatement:
                 var ifStatement = node;
-                if (ifStatement.thenStatement.kind !== 192 /* Block */) {
+                if (ifStatement.thenStatement.kind !== ts.SyntaxKind.Block) {
                     report(ifStatement.thenStatement, "An if statement's contents should be wrapped in a block body.");
                 }
                 if (ifStatement.elseStatement &&
-                    ifStatement.elseStatement.kind !== 192 /* Block */ &&
-                    ifStatement.elseStatement.kind !== 196 /* IfStatement */) {
+                    ifStatement.elseStatement.kind !== ts.SyntaxKind.Block &&
+                    ifStatement.elseStatement.kind !== ts.SyntaxKind.IfStatement) {
                     report(ifStatement.elseStatement, "An else statement's contents should be wrapped in a block body.");
                 }
                 break;
-            case 181 /* BinaryExpression */:
+            case ts.SyntaxKind.BinaryExpression:
                 var op = node.operatorToken.kind;
-                if (op === 30 /* EqualsEqualsToken */ || op == 31 /* ExclamationEqualsToken */) {
+                if (op === ts.SyntaxKind.EqualsEqualsToken || op == ts.SyntaxKind.ExclamationEqualsToken) {
                     report(node, "Use '===' and '!=='.");
                 }
                 break;
@@ -112,7 +112,7 @@ exports.delint = delint;
 var fileNames = process.argv.slice(2);
 fileNames.forEach(function (fileName) {
     // Parse a file
-    var sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), 2 /* ES6 */, /*setParentNodes */ true);
+    var sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
     // delint it
     delint(sourceFile);
 });
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index a7f83f19b5e..0f22b8486dc 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -24,5 +24,5 @@ console.log(JSON.stringify(result));
  */
 var ts = require("typescript");
 var source = "let x: string  = 'string'";
-var result = ts.transpile(source, { module: 1 /* CommonJS */ });
+var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
 console.log(JSON.stringify(result));
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index e2ab4e135dd..0b31ca3c7bf 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -181,4 +181,4 @@ function watch(rootFileNames, options) {
 var currentDirectoryFiles = fs.readdirSync(process.cwd()).
     filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; });
 // Start the watcher
-watch(currentDirectoryFiles, { module: 1 /* CommonJS */ });
+watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck4.js b/tests/baselines/reference/ES3For-ofTypeCheck4.js
index 7386a1967eb..a628a81c517 100644
--- a/tests/baselines/reference/ES3For-ofTypeCheck4.js
+++ b/tests/baselines/reference/ES3For-ofTypeCheck4.js
@@ -4,6 +4,6 @@ for (const v of union) { }
 
 //// [ES3For-ofTypeCheck4.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck6.js b/tests/baselines/reference/ES3For-ofTypeCheck6.js
index ddc11808b18..8b4a917eb85 100644
--- a/tests/baselines/reference/ES3For-ofTypeCheck6.js
+++ b/tests/baselines/reference/ES3For-ofTypeCheck6.js
@@ -4,6 +4,6 @@ for (var v of union) { }
 
 //// [ES3For-ofTypeCheck6.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-of24.js b/tests/baselines/reference/ES5For-of24.js
index cdc0876692f..ce4376ad648 100644
--- a/tests/baselines/reference/ES5For-of24.js
+++ b/tests/baselines/reference/ES5For-of24.js
@@ -6,7 +6,7 @@ for (var v of a) {
 
 //// [ES5For-of24.js]
 var a = [1, 2, 3];
-for (var _i = 0; _i < a.length; _i++) {
-    var v = a[_i];
-    var a_1 = 0;
+for (var _i = 0, a_1 = a; _i < a_1.length; _i++) {
+    var v = a_1[_i];
+    var a_2 = 0;
 }
diff --git a/tests/baselines/reference/ES5For-of25.js b/tests/baselines/reference/ES5For-of25.js
index 756c14fbe81..440c0b55efb 100644
--- a/tests/baselines/reference/ES5For-of25.js
+++ b/tests/baselines/reference/ES5For-of25.js
@@ -7,8 +7,8 @@ for (var v of a) {
 
 //// [ES5For-of25.js]
 var a = [1, 2, 3];
-for (var _i = 0; _i < a.length; _i++) {
-    var v = a[_i];
+for (var _i = 0, a_1 = a; _i < a_1.length; _i++) {
+    var v = a_1[_i];
     v;
     a;
 }
diff --git a/tests/baselines/reference/ES5For-of25.js.map b/tests/baselines/reference/ES5For-of25.js.map
index cc31767128b..1c4d8c2101f 100644
--- a/tests/baselines/reference/ES5For-of25.js.map
+++ b/tests/baselines/reference/ES5For-of25.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of25.js.map]
-{"version":3,"file":"ES5For-of25.js","sourceRoot":"","sources":["ES5For-of25.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAClB,GAAG,CAAC,CAAU,UAAC,EAAV,aAAK,EAAL,IAAU,CAAC;IAAX,IAAI,CAAC,GAAI,CAAC,IAAL;IACN,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of25.js","sourceRoot":"","sources":["ES5For-of25.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAClB,GAAG,CAAC,CAAU,UAAC,EAAD,OAAC,EAAV,eAAK,EAAL,IAAU,CAAC;IAAX,IAAI,CAAC,UAAA;IACN,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of25.sourcemap.txt b/tests/baselines/reference/ES5For-of25.sourcemap.txt
index 623627fde20..453eef4ee46 100644
--- a/tests/baselines/reference/ES5For-of25.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of25.sourcemap.txt
@@ -21,7 +21,7 @@ sourceFile:ES5For-of25.ts
 10>               ^
 11>                ^
 12>                 ^
-13>                  ^^^^^^^^^^^^^^^^^^^^^^->
+13>                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >var 
 3 >    a
@@ -47,17 +47,19 @@ sourceFile:ES5For-of25.ts
 11>Emitted(1, 18) Source(1, 18) + SourceIndex(0)
 12>Emitted(1, 19) Source(1, 19) + SourceIndex(0)
 ---
->>>for (var _i = 0; _i < a.length; _i++) {
+>>>for (var _i = 0, a_1 = a; _i < a_1.length; _i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^
 6 >               ^^
-7 >                 ^^^^^^^^^^^^^
-8 >                              ^^
-9 >                                ^^^^
-10>                                    ^
+7 >                 ^^^^^^^
+8 >                        ^^
+9 >                          ^^^^^^^^^^^^^^^
+10>                                         ^^
+11>                                           ^^^^
+12>                                               ^
 1->
   >
 2 >for
@@ -65,40 +67,38 @@ sourceFile:ES5For-of25.ts
 4 >    (var v of 
 5 >     a
 6 >               
-7 >                 var v
-8 >                              
-9 >                                var v of a
-10>                                    )
+7 >                 a
+8 >                        
+9 >                          var v
+10>                                         
+11>                                           var v of a
+12>                                               )
 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
 2 >Emitted(2, 4) Source(2, 4) + SourceIndex(0)
 3 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
 4 >Emitted(2, 6) Source(2, 15) + SourceIndex(0)
 5 >Emitted(2, 16) Source(2, 16) + SourceIndex(0)
-6 >Emitted(2, 18) Source(2, 6) + SourceIndex(0)
-7 >Emitted(2, 31) Source(2, 11) + SourceIndex(0)
-8 >Emitted(2, 33) Source(2, 6) + SourceIndex(0)
-9 >Emitted(2, 37) Source(2, 16) + SourceIndex(0)
-10>Emitted(2, 38) Source(2, 17) + SourceIndex(0)
+6 >Emitted(2, 18) Source(2, 15) + SourceIndex(0)
+7 >Emitted(2, 25) Source(2, 16) + SourceIndex(0)
+8 >Emitted(2, 27) Source(2, 6) + SourceIndex(0)
+9 >Emitted(2, 42) Source(2, 11) + SourceIndex(0)
+10>Emitted(2, 44) Source(2, 6) + SourceIndex(0)
+11>Emitted(2, 48) Source(2, 16) + SourceIndex(0)
+12>Emitted(2, 49) Source(2, 17) + SourceIndex(0)
 ---
->>>    var v = a[_i];
+>>>    var v = a_1[_i];
 1 >^^^^
 2 >    ^^^^
 3 >        ^
-4 >         ^^^
-5 >            ^
-6 >             ^^^^
+4 >         ^^^^^^^^^^
 1 >
 2 >    var 
 3 >        v
-4 >          of 
-5 >            a
-6 >             
+4 >         
 1 >Emitted(3, 5) Source(2, 6) + SourceIndex(0)
 2 >Emitted(3, 9) Source(2, 10) + SourceIndex(0)
 3 >Emitted(3, 10) Source(2, 11) + SourceIndex(0)
-4 >Emitted(3, 13) Source(2, 15) + SourceIndex(0)
-5 >Emitted(3, 14) Source(2, 16) + SourceIndex(0)
-6 >Emitted(3, 18) Source(2, 11) + SourceIndex(0)
+4 >Emitted(3, 20) Source(2, 11) + SourceIndex(0)
 ---
 >>>    v;
 1 >^^^^
diff --git a/tests/baselines/reference/ES5For-of30.js b/tests/baselines/reference/ES5For-of30.js
index 2a1dc5a3399..fead25e7cf0 100644
--- a/tests/baselines/reference/ES5For-of30.js
+++ b/tests/baselines/reference/ES5For-of30.js
@@ -9,8 +9,8 @@ for ([a = 1, b = ""] of tuple) {
 //// [ES5For-of30.js]
 var a, b;
 var tuple = [2, "3"];
-for (var _i = 0; _i < tuple.length; _i++) {
-    _a = tuple[_i], _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], b = _c === void 0 ? "" : _c;
+for (var _i = 0, tuple_1 = tuple; _i < tuple_1.length; _i++) {
+    _a = tuple_1[_i], _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], b = _c === void 0 ? "" : _c;
     a;
     b;
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.js b/tests/baselines/reference/ES5For-ofTypeCheck11.js
index c0e46a45452..ce439427755 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck11.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.js
@@ -6,6 +6,6 @@ for (v of union) { }
 //// [ES5For-ofTypeCheck11.js]
 var union;
 var v;
-for (var _i = 0; _i < union.length; _i++) {
-    v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck3.js b/tests/baselines/reference/ES5For-ofTypeCheck3.js
index 76d8237997b..61a60727cba 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck3.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck3.js
@@ -4,6 +4,6 @@ for (var v of tuple) { }
 
 //// [ES5For-ofTypeCheck3.js]
 var tuple = ["", 0];
-for (var _i = 0; _i < tuple.length; _i++) {
-    var v = tuple[_i];
+for (var _i = 0, tuple_1 = tuple; _i < tuple_1.length; _i++) {
+    var v = tuple_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck4.js b/tests/baselines/reference/ES5For-ofTypeCheck4.js
index 630bc869c58..6240b6a799a 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck4.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck4.js
@@ -4,6 +4,6 @@ for (const v of union) { }
 
 //// [ES5For-ofTypeCheck4.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck5.js b/tests/baselines/reference/ES5For-ofTypeCheck5.js
index 2e6b47f779d..0d285d67d8b 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck5.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck5.js
@@ -4,6 +4,6 @@ for (var v of union) { }
 
 //// [ES5For-ofTypeCheck5.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck6.js b/tests/baselines/reference/ES5For-ofTypeCheck6.js
index 9249020b9d4..c99fd415b23 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck6.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck6.js
@@ -4,6 +4,6 @@ for (var v of union) { }
 
 //// [ES5For-ofTypeCheck6.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.js b/tests/baselines/reference/ES5For-ofTypeCheck7.js
index d5b74a24728..1bd360e5132 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck7.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.js
@@ -4,6 +4,6 @@ for (var v of union) { }
 
 //// [ES5For-ofTypeCheck7.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.js b/tests/baselines/reference/ES5For-ofTypeCheck8.js
index d73aea1cb7b..ae4a823a18c 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck8.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.js
@@ -6,6 +6,6 @@ for (v of union) { }
 //// [ES5For-ofTypeCheck8.js]
 var union;
 var v;
-for (var _i = 0; _i < union.length; _i++) {
-    v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.js b/tests/baselines/reference/ES5For-ofTypeCheck9.js
index 6c7465d10ec..3e18c2da31f 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck9.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.js
@@ -4,6 +4,6 @@ for (let v of union) { }
 
 //// [ES5For-ofTypeCheck9.js]
 var union;
-for (var _i = 0; _i < union.length; _i++) {
-    var v = union[_i];
+for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
+    var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5for-of32.js b/tests/baselines/reference/ES5for-of32.js
new file mode 100644
index 00000000000..7af7cc3874a
--- /dev/null
+++ b/tests/baselines/reference/ES5for-of32.js
@@ -0,0 +1,23 @@
+//// [ES5for-of32.ts]
+
+var array = [1,2,3];
+var sum = 0;
+
+for (let num of array) {
+    if (sum === 0) {
+        array = [4,5,6]
+    }
+    
+    sum += num;
+}
+
+//// [ES5for-of32.js]
+var array = [1, 2, 3];
+var sum = 0;
+for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
+    var num = array_1[_i];
+    if (sum === 0) {
+        array = [4, 5, 6];
+    }
+    sum += num;
+}
diff --git a/tests/baselines/reference/ES5for-of32.symbols b/tests/baselines/reference/ES5for-of32.symbols
new file mode 100644
index 00000000000..5672ad01109
--- /dev/null
+++ b/tests/baselines/reference/ES5for-of32.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts ===
+
+var array = [1,2,3];
+>array : Symbol(array, Decl(ES5for-of32.ts, 1, 3))
+
+var sum = 0;
+>sum : Symbol(sum, Decl(ES5for-of32.ts, 2, 3))
+
+for (let num of array) {
+>num : Symbol(num, Decl(ES5for-of32.ts, 4, 8))
+>array : Symbol(array, Decl(ES5for-of32.ts, 1, 3))
+
+    if (sum === 0) {
+>sum : Symbol(sum, Decl(ES5for-of32.ts, 2, 3))
+
+        array = [4,5,6]
+>array : Symbol(array, Decl(ES5for-of32.ts, 1, 3))
+    }
+    
+    sum += num;
+>sum : Symbol(sum, Decl(ES5for-of32.ts, 2, 3))
+>num : Symbol(num, Decl(ES5for-of32.ts, 4, 8))
+}
diff --git a/tests/baselines/reference/ES5for-of32.types b/tests/baselines/reference/ES5for-of32.types
new file mode 100644
index 00000000000..6fe5ba2008b
--- /dev/null
+++ b/tests/baselines/reference/ES5for-of32.types
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts ===
+
+var array = [1,2,3];
+>array : number[]
+>[1,2,3] : number[]
+>1 : number
+>2 : number
+>3 : number
+
+var sum = 0;
+>sum : number
+>0 : number
+
+for (let num of array) {
+>num : number
+>array : number[]
+
+    if (sum === 0) {
+>sum === 0 : boolean
+>sum : number
+>0 : number
+
+        array = [4,5,6]
+>array = [4,5,6] : number[]
+>array : number[]
+>[4,5,6] : number[]
+>4 : number
+>5 : number
+>6 : number
+    }
+    
+    sum += num;
+>sum += num : number
+>sum : number
+>num : number
+}
diff --git a/tests/baselines/reference/ParameterList5.errors.txt b/tests/baselines/reference/ParameterList5.errors.txt
index 02b86633b95..618ce740915 100644
--- a/tests/baselines/reference/ParameterList5.errors.txt
+++ b/tests/baselines/reference/ParameterList5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/ParameterList5.ts(1,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/ParameterList5.ts(1,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/ParameterList5.ts(1,16): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/compiler/ParameterList5.ts(1,29): error TS2304: Cannot find name 'C'.
 
@@ -6,7 +6,7 @@ tests/cases/compiler/ParameterList5.ts(1,29): error TS2304: Cannot find name 'C'
 ==== tests/cases/compiler/ParameterList5.ts (3 errors) ====
     function A(): (public B) => C {
                   ~~~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
                    ~~~~~~~~
 !!! error TS2369: A parameter property is only allowed in a constructor implementation.
                                 ~
diff --git a/tests/baselines/reference/YieldExpression17_es6.errors.txt b/tests/baselines/reference/YieldExpression17_es6.errors.txt
index bc262212526..f987517371f 100644
--- a/tests/baselines/reference/YieldExpression17_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression17_es6.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,15): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,15): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,23): error TS1163: A 'yield' expression is only allowed in a generator body.
 
 
@@ -8,6 +8,6 @@ tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,23): err
                   ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
                   ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                           ~~~~~
 !!! error TS1163: A 'yield' expression is only allowed in a generator body.
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.js b/tests/baselines/reference/ambientClassDeclarationWithExtends.js
index 5fd4d5b4b28..940efb8899f 100644
--- a/tests/baselines/reference/ambientClassDeclarationWithExtends.js
+++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.js
@@ -1,6 +1,40 @@
-//// [ambientClassDeclarationWithExtends.ts]
+//// [tests/cases/compiler/ambientClassDeclarationWithExtends.ts] ////
+
+//// [ambientClassDeclarationExtends_singleFile.ts]
 declare class A { }
 declare class B extends A { }
+
+declare class C {
+    public foo;
+}
+namespace D { var x; }
+declare class D extends C { }
+
+var d: C = new D();
+
+//// [ambientClassDeclarationExtends_file1.ts]
+
+declare class E {
+    public bar;
+}
+namespace F { var y; }
+
+//// [ambientClassDeclarationExtends_file2.ts]
+
+declare class F extends E { }
+var f: E = new F();
 
 
-//// [ambientClassDeclarationWithExtends.js]
+//// [ambientClassDeclarationExtends_singleFile.js]
+var D;
+(function (D) {
+    var x;
+})(D || (D = {}));
+var d = new D();
+//// [ambientClassDeclarationExtends_file1.js]
+var F;
+(function (F) {
+    var y;
+})(F || (F = {}));
+//// [ambientClassDeclarationExtends_file2.js]
+var f = new F();
diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols
index 71d1e1a66d8..023ae6bf582 100644
--- a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols
+++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols
@@ -1,8 +1,50 @@
-=== tests/cases/compiler/ambientClassDeclarationWithExtends.ts ===
+=== tests/cases/compiler/ambientClassDeclarationExtends_singleFile.ts ===
 declare class A { }
->A : Symbol(A, Decl(ambientClassDeclarationWithExtends.ts, 0, 0))
+>A : Symbol(A, Decl(ambientClassDeclarationExtends_singleFile.ts, 0, 0))
 
 declare class B extends A { }
->B : Symbol(B, Decl(ambientClassDeclarationWithExtends.ts, 0, 19))
->A : Symbol(A, Decl(ambientClassDeclarationWithExtends.ts, 0, 0))
+>B : Symbol(B, Decl(ambientClassDeclarationExtends_singleFile.ts, 0, 19))
+>A : Symbol(A, Decl(ambientClassDeclarationExtends_singleFile.ts, 0, 0))
+
+declare class C {
+>C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29))
+
+    public foo;
+>foo : Symbol(foo, Decl(ambientClassDeclarationExtends_singleFile.ts, 3, 17))
+}
+namespace D { var x; }
+>D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22))
+>x : Symbol(x, Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 17))
+
+declare class D extends C { }
+>D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22))
+>C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29))
+
+var d: C = new D();
+>d : Symbol(d, Decl(ambientClassDeclarationExtends_singleFile.ts, 9, 3))
+>C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29))
+>D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22))
+
+=== tests/cases/compiler/ambientClassDeclarationExtends_file1.ts ===
+
+declare class E {
+>E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0))
+
+    public bar;
+>bar : Symbol(bar, Decl(ambientClassDeclarationExtends_file1.ts, 1, 17))
+}
+namespace F { var y; }
+>F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0))
+>y : Symbol(y, Decl(ambientClassDeclarationExtends_file1.ts, 4, 17))
+
+=== tests/cases/compiler/ambientClassDeclarationExtends_file2.ts ===
+
+declare class F extends E { }
+>F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0))
+>E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0))
+
+var f: E = new F();
+>f : Symbol(f, Decl(ambientClassDeclarationExtends_file2.ts, 2, 3))
+>E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0))
+>F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0))
 
diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.types b/tests/baselines/reference/ambientClassDeclarationWithExtends.types
index 7609856882b..c7f22eeb65f 100644
--- a/tests/baselines/reference/ambientClassDeclarationWithExtends.types
+++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.types
@@ -1,4 +1,4 @@
-=== tests/cases/compiler/ambientClassDeclarationWithExtends.ts ===
+=== tests/cases/compiler/ambientClassDeclarationExtends_singleFile.ts ===
 declare class A { }
 >A : A
 
@@ -6,3 +6,47 @@ declare class B extends A { }
 >B : B
 >A : A
 
+declare class C {
+>C : C
+
+    public foo;
+>foo : any
+}
+namespace D { var x; }
+>D : typeof D
+>x : any
+
+declare class D extends C { }
+>D : D
+>C : C
+
+var d: C = new D();
+>d : C
+>C : C
+>new D() : D
+>D : typeof D
+
+=== tests/cases/compiler/ambientClassDeclarationExtends_file1.ts ===
+
+declare class E {
+>E : E
+
+    public bar;
+>bar : any
+}
+namespace F { var y; }
+>F : typeof F
+>y : any
+
+=== tests/cases/compiler/ambientClassDeclarationExtends_file2.ts ===
+
+declare class F extends E { }
+>F : F
+>E : E
+
+var f: E = new F();
+>f : E
+>E : E
+>new F() : F
+>F : typeof F
+
diff --git a/tests/baselines/reference/argumentsObjectIterator01_ES5.js b/tests/baselines/reference/argumentsObjectIterator01_ES5.js
index bc51d6f5582..8378528dbf4 100644
--- a/tests/baselines/reference/argumentsObjectIterator01_ES5.js
+++ b/tests/baselines/reference/argumentsObjectIterator01_ES5.js
@@ -11,8 +11,8 @@ function doubleAndReturnAsArray(x: number, y: number, z: number): [number, numbe
 //// [argumentsObjectIterator01_ES5.js]
 function doubleAndReturnAsArray(x, y, z) {
     var result = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        var arg = arguments[_i];
+    for (var _i = 0, arguments_1 = arguments; _i < arguments_1.length; _i++) {
+        var arg = arguments_1[_i];
         result.push(arg + arg);
     }
     return result;
diff --git a/tests/baselines/reference/assignmentLHSIsValue.errors.txt b/tests/baselines/reference/assignmentLHSIsValue.errors.txt
index cf747b44b3e..bf253df5e70 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.errors.txt
+++ b/tests/baselines/reference/assignmentLHSIsValue.errors.txt
@@ -13,6 +13,7 @@ tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(2
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(30,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(31,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(32,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(35,3): error TS7028: Unused label.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(35,9): error TS1128: Declaration or statement expected.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(38,2): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(38,6): error TS2364: Invalid left-hand side of assignment expression.
@@ -38,7 +39,7 @@ tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(6
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(70,1): error TS2364: Invalid left-hand side of assignment expression.
 
 
-==== tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts (38 errors) ====
+==== tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts (39 errors) ====
     // expected error for all the LHS of assignments
     var value;
     
@@ -104,6 +105,8 @@ tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(7
     
     // object literals
     { a: 0} = value;
+      ~
+!!! error TS7028: Unused label.
             ~
 !!! error TS1128: Declaration or statement expected.
     
diff --git a/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt b/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
index 2476eaec6e3..08e59e69b9f 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
+++ b/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,11): error TS2304: Cannot find name 'async'.
 tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,17): error TS1005: ',' expected.
 tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,20): error TS1005: '=' expected.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,24): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,24): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(4,11): error TS2304: Cannot find name 'await'.
 
 
@@ -15,7 +15,7 @@ tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
                        ~
 !!! error TS1005: '=' expected.
                            ~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
        // Legal to use 'await' in a type context.
        var v: await;
               ~~~~~
diff --git a/tests/baselines/reference/asyncFunctionDeclaration12_es6.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration12_es6.errors.txt
index 978492f0744..43df8e21659 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration12_es6.errors.txt
+++ b/tests/baselines/reference/asyncFunctionDeclaration12_es6.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts(1,24): error TS1005: '(' expected.
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts(1,29): error TS1005: '=' expected.
-tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts(1,33): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts(1,33): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts(1,47): error TS1005: '=>' expected.
 
 
@@ -11,6 +11,6 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1
                                 ~
 !!! error TS1005: '=' expected.
                                     ~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
                                                   ~
 !!! error TS1005: '=>' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt
index 8c029eaaaf4..bc1ef24127a 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,16): error TS1055: Type '{}' is not a valid async function return type.
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,16): error TS1055: Type 'any' is not a valid async function return type.
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,16): error TS1055: Type 'number' is not a valid async function return type.
-tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,16): error TS1055: Type 'PromiseLike<void>' is not a valid async function return type.
+tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,16): error TS1055: Type 'PromiseLike' is not a valid async function return type.
 tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,16): error TS1055: Type 'typeof Thenable' is not a valid async function return type.
   Type 'Thenable' is not assignable to type 'PromiseLike<any>'.
     Types of property 'then' are incompatible.
@@ -28,7 +28,7 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1
 !!! error TS1055: Type 'number' is not a valid async function return type.
     async function fn5(): PromiseLike<void> { } // error
                    ~~~
-!!! error TS1055: Type 'PromiseLike<void>' is not a valid async function return type.
+!!! error TS1055: Type 'PromiseLike' is not a valid async function return type.
     async function fn6(): Thenable { } // error
                    ~~~
 !!! error TS1055: Type 'typeof Thenable' is not a valid async function return type.
diff --git a/tests/baselines/reference/asyncGetter_es6.errors.txt b/tests/baselines/reference/asyncGetter_es6.errors.txt
index 5f5a9f6b1d7..f6deea16d06 100644
--- a/tests/baselines/reference/asyncGetter_es6.errors.txt
+++ b/tests/baselines/reference/asyncGetter_es6.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/async/es6/asyncGetter_es6.ts(2,3): error TS1042: 'async' modifier cannot be used here.
-tests/cases/conformance/async/es6/asyncGetter_es6.ts(2,13): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/async/es6/asyncGetter_es6.ts(2,13): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/async/es6/asyncGetter_es6.ts (2 errors) ====
@@ -8,6 +8,6 @@ tests/cases/conformance/async/es6/asyncGetter_es6.ts(2,13): error TS2378: A 'get
       ~~~~~
 !!! error TS1042: 'async' modifier cannot be used here.
                 ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
       }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.js b/tests/baselines/reference/bestCommonTypeReturnStatement.js
index f4ab98ed1c6..6d6f73bc0cf 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.js
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.js
@@ -1,4 +1,5 @@
 //// [bestCommonTypeReturnStatement.ts]
+
 interface IPromise<T> {
     then(successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any): IPromise<any>;
 }
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.symbols b/tests/baselines/reference/bestCommonTypeReturnStatement.symbols
index 43e04ef037d..14e770ae255 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.symbols
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.symbols
@@ -1,34 +1,35 @@
 === tests/cases/compiler/bestCommonTypeReturnStatement.ts ===
+
 interface IPromise<T> {
 >IPromise : Symbol(IPromise, Decl(bestCommonTypeReturnStatement.ts, 0, 0))
->T : Symbol(T, Decl(bestCommonTypeReturnStatement.ts, 0, 19))
+>T : Symbol(T, Decl(bestCommonTypeReturnStatement.ts, 1, 19))
 
     then(successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any): IPromise<any>;
->then : Symbol(then, Decl(bestCommonTypeReturnStatement.ts, 0, 23))
->successCallback : Symbol(successCallback, Decl(bestCommonTypeReturnStatement.ts, 1, 9))
->promiseValue : Symbol(promiseValue, Decl(bestCommonTypeReturnStatement.ts, 1, 27))
->T : Symbol(T, Decl(bestCommonTypeReturnStatement.ts, 0, 19))
->errorCallback : Symbol(errorCallback, Decl(bestCommonTypeReturnStatement.ts, 1, 51))
->reason : Symbol(reason, Decl(bestCommonTypeReturnStatement.ts, 1, 69))
+>then : Symbol(then, Decl(bestCommonTypeReturnStatement.ts, 1, 23))
+>successCallback : Symbol(successCallback, Decl(bestCommonTypeReturnStatement.ts, 2, 9))
+>promiseValue : Symbol(promiseValue, Decl(bestCommonTypeReturnStatement.ts, 2, 27))
+>T : Symbol(T, Decl(bestCommonTypeReturnStatement.ts, 1, 19))
+>errorCallback : Symbol(errorCallback, Decl(bestCommonTypeReturnStatement.ts, 2, 51))
+>reason : Symbol(reason, Decl(bestCommonTypeReturnStatement.ts, 2, 69))
 >IPromise : Symbol(IPromise, Decl(bestCommonTypeReturnStatement.ts, 0, 0))
 }
 
 function f() {
->f : Symbol(f, Decl(bestCommonTypeReturnStatement.ts, 2, 1))
+>f : Symbol(f, Decl(bestCommonTypeReturnStatement.ts, 3, 1))
 
     if (true) return b();
->b : Symbol(b, Decl(bestCommonTypeReturnStatement.ts, 7, 1))
+>b : Symbol(b, Decl(bestCommonTypeReturnStatement.ts, 8, 1))
 
     return d();
->d : Symbol(d, Decl(bestCommonTypeReturnStatement.ts, 10, 45))
+>d : Symbol(d, Decl(bestCommonTypeReturnStatement.ts, 11, 45))
 }
 
 
 function b(): IPromise<void> { return null; }
->b : Symbol(b, Decl(bestCommonTypeReturnStatement.ts, 7, 1))
+>b : Symbol(b, Decl(bestCommonTypeReturnStatement.ts, 8, 1))
 >IPromise : Symbol(IPromise, Decl(bestCommonTypeReturnStatement.ts, 0, 0))
 
 function d(): IPromise<any> { return null; }
->d : Symbol(d, Decl(bestCommonTypeReturnStatement.ts, 10, 45))
+>d : Symbol(d, Decl(bestCommonTypeReturnStatement.ts, 11, 45))
 >IPromise : Symbol(IPromise, Decl(bestCommonTypeReturnStatement.ts, 0, 0))
 
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.types b/tests/baselines/reference/bestCommonTypeReturnStatement.types
index 28974f064a5..31f72ab93b4 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.types
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/bestCommonTypeReturnStatement.ts ===
+
 interface IPromise<T> {
 >IPromise : IPromise<T>
 >T : T
diff --git a/tests/baselines/reference/bindingPatternInParameter01.errors.txt b/tests/baselines/reference/bindingPatternInParameter01.errors.txt
new file mode 100644
index 00000000000..bee1f47141e
--- /dev/null
+++ b/tests/baselines/reference/bindingPatternInParameter01.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/bindingPatternInParameter01.ts(4,3): error TS2304: Cannot find name 'console'.
+
+
+==== tests/cases/compiler/bindingPatternInParameter01.ts (1 errors) ====
+    const nestedArray = [[[1, 2]], [[3, 4]]];
+    
+    nestedArray.forEach(([[a, b]]) => {
+      console.log(a, b);
+      ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+    });
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/bindingPatternInParameter01.js b/tests/baselines/reference/bindingPatternInParameter01.js
new file mode 100644
index 00000000000..27b3a59e81e
--- /dev/null
+++ b/tests/baselines/reference/bindingPatternInParameter01.js
@@ -0,0 +1,14 @@
+//// [bindingPatternInParameter01.ts]
+const nestedArray = [[[1, 2]], [[3, 4]]];
+
+nestedArray.forEach(([[a, b]]) => {
+  console.log(a, b);
+});
+
+
+//// [bindingPatternInParameter01.js]
+var nestedArray = [[[1, 2]], [[3, 4]]];
+nestedArray.forEach(function (_a) {
+    var _b = _a[0], a = _b[0], b = _b[1];
+    console.log(a, b);
+});
diff --git a/tests/baselines/reference/breakTarget3.js b/tests/baselines/reference/breakTarget3.js
index 0fa6cd2d298..b36eeb3902b 100644
--- a/tests/baselines/reference/breakTarget3.js
+++ b/tests/baselines/reference/breakTarget3.js
@@ -1,4 +1,5 @@
 //// [breakTarget3.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/breakTarget3.symbols b/tests/baselines/reference/breakTarget3.symbols
index 580706bbd4a..a0b17435504 100644
--- a/tests/baselines/reference/breakTarget3.symbols
+++ b/tests/baselines/reference/breakTarget3.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/breakTarget3.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  break target1;
diff --git a/tests/baselines/reference/breakTarget3.types b/tests/baselines/reference/breakTarget3.types
index 785bf00ef6e..e4b5f8a1c61 100644
--- a/tests/baselines/reference/breakTarget3.types
+++ b/tests/baselines/reference/breakTarget3.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/breakTarget3.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/breakTarget4.js b/tests/baselines/reference/breakTarget4.js
index 4586301d71b..0c91e44ecbd 100644
--- a/tests/baselines/reference/breakTarget4.js
+++ b/tests/baselines/reference/breakTarget4.js
@@ -1,4 +1,5 @@
 //// [breakTarget4.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/breakTarget4.symbols b/tests/baselines/reference/breakTarget4.symbols
index aba35ddcfdf..d4edcb17e1a 100644
--- a/tests/baselines/reference/breakTarget4.symbols
+++ b/tests/baselines/reference/breakTarget4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/breakTarget4.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  break target2;
diff --git a/tests/baselines/reference/breakTarget4.types b/tests/baselines/reference/breakTarget4.types
index eb4c14f6386..8b6ccf600ad 100644
--- a/tests/baselines/reference/breakTarget4.types
+++ b/tests/baselines/reference/breakTarget4.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/breakTarget4.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/breakTarget5.errors.txt b/tests/baselines/reference/breakTarget5.errors.txt
index a54a415b990..d92f29d67ee 100644
--- a/tests/baselines/reference/breakTarget5.errors.txt
+++ b/tests/baselines/reference/breakTarget5.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/breakTarget5.ts(5,7): error TS1107: Jump target cannot cross function boundary.
+tests/cases/compiler/breakTarget5.ts(6,7): error TS1107: Jump target cannot cross function boundary.
 
 
 ==== tests/cases/compiler/breakTarget5.ts (1 errors) ====
+    
     target:
     while (true) {
       function f() {
diff --git a/tests/baselines/reference/breakTarget5.js b/tests/baselines/reference/breakTarget5.js
index 197e4e147bd..9f6b063a8c4 100644
--- a/tests/baselines/reference/breakTarget5.js
+++ b/tests/baselines/reference/breakTarget5.js
@@ -1,4 +1,5 @@
 //// [breakTarget5.ts]
+
 target:
 while (true) {
   function f() {
diff --git a/tests/baselines/reference/callSignatureFunctionOverload.types b/tests/baselines/reference/callSignatureFunctionOverload.types
index b9788e5b143..d5897c01494 100644
--- a/tests/baselines/reference/callSignatureFunctionOverload.types
+++ b/tests/baselines/reference/callSignatureFunctionOverload.types
@@ -1,33 +1,33 @@
 === tests/cases/compiler/callSignatureFunctionOverload.ts ===
 var foo: {
->foo : { (name: string): string; (name: 'order'): string; (name: 'content'): string; (name: 'done'): string; }
+>foo : { (name: string): string; (name: "order"): string; (name: "content"): string; (name: "done"): string; }
 
     (name: string): string;
 >name : string
 
     (name: 'order'): string;
->name : 'order'
+>name : "order"
 
     (name: 'content'): string;
->name : 'content'
+>name : "content"
 
     (name: 'done'): string;
->name : 'done'
+>name : "done"
 }
 
 var foo2: {
->foo2 : { (name: string): string; (name: 'order'): string; (name: 'order'): string; (name: 'done'): string; }
+>foo2 : { (name: string): string; (name: "order"): string; (name: "order"): string; (name: "done"): string; }
 
     (name: string): string;
 >name : string
 
     (name: 'order'): string;
->name : 'order'
+>name : "order"
 
     (name: 'order'): string;
->name : 'order'
+>name : "order"
 
     (name: 'done'): string;
->name : 'done'
+>name : "done"
 }
 
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js
index 0e78aac2b1b..73270c240cb 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js
@@ -1,4 +1,5 @@
 //// [callSignatureWithoutReturnTypeAnnotationInference.ts]
+
 // Call signatures without a return type should infer one from the function body (if present)
 
 // Simple types
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols
index 1c5a6786ab7..faba4e427ec 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols
@@ -1,55 +1,56 @@
 === tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts ===
+
 // Call signatures without a return type should infer one from the function body (if present)
 
 // Simple types
 function foo(x) {
 >foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 0, 0))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 3, 13))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 4, 13))
 
     return 1;
 }
 var r = foo(1);
->r : Symbol(r, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 6, 3))
+>r : Symbol(r, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 7, 3))
 >foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 0, 0))
 
 function foo2(x) {
->foo2 : Symbol(foo2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 6, 15))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 8, 14))
+>foo2 : Symbol(foo2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 7, 15))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 9, 14))
 
     return foo(x);
 >foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 0, 0))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 8, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 9, 14))
 }
 var r2 = foo2(1);
->r2 : Symbol(r2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 11, 3))
->foo2 : Symbol(foo2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 6, 15))
+>r2 : Symbol(r2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 12, 3))
+>foo2 : Symbol(foo2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 7, 15))
 
 function foo3() {
->foo3 : Symbol(foo3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 11, 17))
+>foo3 : Symbol(foo3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 12, 17))
 
     return foo3();
->foo3 : Symbol(foo3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 11, 17))
+>foo3 : Symbol(foo3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 12, 17))
 }
 var r3 = foo3();
->r3 : Symbol(r3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 16, 3))
->foo3 : Symbol(foo3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 11, 17))
+>r3 : Symbol(r3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 17, 3))
+>foo3 : Symbol(foo3, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 12, 17))
 
 function foo4<T>(x: T) {
->foo4 : Symbol(foo4, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 16, 16))
->T : Symbol(T, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 18, 14))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 18, 17))
->T : Symbol(T, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 18, 14))
+>foo4 : Symbol(foo4, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 17, 16))
+>T : Symbol(T, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 19, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 19, 17))
+>T : Symbol(T, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 19, 14))
 
     return x;
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 18, 17))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 19, 17))
 }
 var r4 = foo4(1);
->r4 : Symbol(r4, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 21, 3))
->foo4 : Symbol(foo4, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 16, 16))
+>r4 : Symbol(r4, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 22, 3))
+>foo4 : Symbol(foo4, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 17, 16))
 
 function foo5(x) {
->foo5 : Symbol(foo5, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 21, 17))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 23, 14))
+>foo5 : Symbol(foo5, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 22, 17))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 24, 14))
 
     if (true) {
         return 1;
@@ -58,17 +59,17 @@ function foo5(x) {
     }
 }
 var r5 = foo5(1);
->r5 : Symbol(r5, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 30, 3))
->foo5 : Symbol(foo5, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 21, 17))
+>r5 : Symbol(r5, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 31, 3))
+>foo5 : Symbol(foo5, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 22, 17))
 
 function foo6(x) {
->foo6 : Symbol(foo6, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 30, 17))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 32, 14))
+>foo6 : Symbol(foo6, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 31, 17))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 33, 14))
 
     try {
     }
     catch (e) {
->e : Symbol(e, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 35, 11))
+>e : Symbol(e, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 36, 11))
 
         return [];
     }
@@ -77,179 +78,179 @@ function foo6(x) {
     }
 }
 var r6 = foo6(1);
->r6 : Symbol(r6, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 42, 3))
->foo6 : Symbol(foo6, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 30, 17))
+>r6 : Symbol(r6, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 43, 3))
+>foo6 : Symbol(foo6, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 31, 17))
 
 function foo7(x) {
->foo7 : Symbol(foo7, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 42, 17))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 44, 14))
+>foo7 : Symbol(foo7, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 43, 17))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 45, 14))
 
     return typeof x;
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 44, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 45, 14))
 }
 var r7 = foo7(1);
->r7 : Symbol(r7, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 47, 3))
->foo7 : Symbol(foo7, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 42, 17))
+>r7 : Symbol(r7, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 48, 3))
+>foo7 : Symbol(foo7, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 43, 17))
 
 // object types
 function foo8(x: number) {
->foo8 : Symbol(foo8, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 47, 17))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 50, 14))
+>foo8 : Symbol(foo8, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 48, 17))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 51, 14))
 
     return { x: x };
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 51, 12))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 50, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 52, 12))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 51, 14))
 }
 var r8 = foo8(1);
->r8 : Symbol(r8, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 53, 3))
->foo8 : Symbol(foo8, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 47, 17))
+>r8 : Symbol(r8, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 54, 3))
+>foo8 : Symbol(foo8, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 48, 17))
 
 interface I {
->I : Symbol(I, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 53, 17))
+>I : Symbol(I, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 54, 17))
 
     foo: string;
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 55, 13))
+>foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 56, 13))
 }
 function foo9(x: number) {
->foo9 : Symbol(foo9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 57, 1))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 58, 14))
+>foo9 : Symbol(foo9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 58, 1))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 59, 14))
 
     var i: I;
->i : Symbol(i, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 59, 7))
->I : Symbol(I, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 53, 17))
+>i : Symbol(i, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 60, 7))
+>I : Symbol(I, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 54, 17))
 
     return i;    
->i : Symbol(i, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 59, 7))
+>i : Symbol(i, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 60, 7))
 }
 var r9 = foo9(1);
->r9 : Symbol(r9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 62, 3))
->foo9 : Symbol(foo9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 57, 1))
+>r9 : Symbol(r9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 63, 3))
+>foo9 : Symbol(foo9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 58, 1))
 
 class C {
->C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 62, 17))
+>C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 63, 17))
 
     foo: string;
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 64, 9))
+>foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 65, 9))
 }
 function foo10(x: number) {
->foo10 : Symbol(foo10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 66, 1))
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 67, 15))
+>foo10 : Symbol(foo10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 67, 1))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 68, 15))
 
     var c: C;
->c : Symbol(c, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 68, 7))
->C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 62, 17))
+>c : Symbol(c, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 69, 7))
+>C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 63, 17))
 
     return c;
->c : Symbol(c, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 68, 7))
+>c : Symbol(c, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 69, 7))
 }
 var r10 = foo10(1);
->r10 : Symbol(r10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 71, 3))
->foo10 : Symbol(foo10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 66, 1))
+>r10 : Symbol(r10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 72, 3))
+>foo10 : Symbol(foo10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 67, 1))
 
 module M {
->M : Symbol(M, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 71, 19))
+>M : Symbol(M, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 72, 19))
 
     export var x = 1;
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 74, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 75, 14))
 
     export class C { foo: string }
->C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 74, 21))
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 75, 20))
+>C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 75, 21))
+>foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 76, 20))
 }
 function foo11() {
->foo11 : Symbol(foo11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 76, 1))
+>foo11 : Symbol(foo11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 77, 1))
 
     return M;
->M : Symbol(M, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 71, 19))
+>M : Symbol(M, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 72, 19))
 }
 var r11 = foo11();
->r11 : Symbol(r11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 80, 3))
->foo11 : Symbol(foo11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 76, 1))
+>r11 : Symbol(r11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 81, 3))
+>foo11 : Symbol(foo11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 77, 1))
 
 // merged declarations
 interface I2 {
->I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 80, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 85, 1))
+>I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 81, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 86, 1))
 
     x: number;
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 83, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 84, 14))
 }
 interface I2 {
->I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 80, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 85, 1))
+>I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 81, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 86, 1))
 
     y: number;
->y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 86, 14))
+>y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 87, 14))
 }
 function foo12() {
->foo12 : Symbol(foo12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 88, 1))
+>foo12 : Symbol(foo12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 89, 1))
 
     var i2: I2;
->i2 : Symbol(i2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 90, 7))
->I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 80, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 85, 1))
+>i2 : Symbol(i2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 91, 7))
+>I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 81, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 86, 1))
 
     return i2;
->i2 : Symbol(i2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 90, 7))
+>i2 : Symbol(i2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 91, 7))
 }
 var r12 = foo12();
->r12 : Symbol(r12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 3))
->foo12 : Symbol(foo12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 88, 1))
+>r12 : Symbol(r12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 94, 3))
+>foo12 : Symbol(foo12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 89, 1))
 
 function m1() { return 1; }
->m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 95, 27))
+>m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 94, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 27))
 
 module m1 { export var y = 2; }
->m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 95, 27))
->y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 22))
+>m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 94, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 27))
+>y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 97, 22))
 
 function foo13() {
->foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 31))
+>foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 97, 31))
 
     return m1;
->m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 95, 27))
+>m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 94, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 27))
 }
 var r13 = foo13();
->r13 : Symbol(r13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 3))
->foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 31))
+>r13 : Symbol(r13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 101, 3))
+>foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 97, 31))
 
 class c1 {
->c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 1))
+>c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 101, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 106, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 102, 10))
+>foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 103, 10))
 
     constructor(x) { }
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 104, 16))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 16))
 }
 module c1 {
->c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 1))
+>c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 101, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 106, 1))
 
     export var x = 1;
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 107, 14))
+>x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 108, 14))
 }
 function foo14() {
->foo14 : Symbol(foo14, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 108, 1))
+>foo14 : Symbol(foo14, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 109, 1))
 
     return c1;
->c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 1))
+>c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 101, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 106, 1))
 }
 var r14 = foo14();
->r14 : Symbol(r14, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 3))
->foo14 : Symbol(foo14, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 108, 1))
+>r14 : Symbol(r14, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 113, 3))
+>foo14 : Symbol(foo14, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 109, 1))
 
 enum e1 { A }
->e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 13))
->A : Symbol(e1.A, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 9))
+>e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 113, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 13))
+>A : Symbol(e1.A, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 9))
 
 module e1 { export var y = 1; }
->e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 13))
->y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 22))
+>e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 113, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 13))
+>y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 116, 22))
 
 function foo15() {
->foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 31))
+>foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 116, 31))
 
     return e1;
->e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 13))
+>e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 113, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 13))
 }
 var r15 = foo15();
->r15 : Symbol(r15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 119, 3))
->foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 31))
+>r15 : Symbol(r15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 120, 3))
+>foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 116, 31))
 
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 760451eb9c1..689ac62c35b 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts ===
+
 // Call signatures without a return type should infer one from the function body (if present)
 
 // Simple types
diff --git a/tests/baselines/reference/capturedLetConstInLoop1.js b/tests/baselines/reference/capturedLetConstInLoop1.js
new file mode 100644
index 00000000000..633b78af510
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop1.js
@@ -0,0 +1,272 @@
+//// [capturedLetConstInLoop1.ts]
+//==== let
+for (let x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+//=========const
+for (const x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+//// [capturedLetConstInLoop1.js]
+//==== let
+var _loop_1 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var x in {}) {
+    _loop_1(x);
+}
+var _loop_2 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var x = _a[_i];
+    _loop_2(x);
+}
+var _loop_3 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var x = 0; x < 1; ++x) {
+    _loop_3(x);
+}
+var _loop_4 = function() {
+    var x = void 0;
+    (function () { return x; });
+    (function () { return x; });
+};
+while (1 === 1) {
+    _loop_4();
+}
+var _loop_5 = function() {
+    var x = void 0;
+    (function () { return x; });
+    (function () { return x; });
+};
+do {
+    _loop_5();
+} while (1 === 1);
+var _loop_6 = function(y) {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var y = 0; y < 1; ++y) {
+    _loop_6(y);
+}
+var _loop_7 = function(x, y) {
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+for (var x = 0, y = 1; x < 1; ++x) {
+    _loop_7(x, y);
+}
+var _loop_8 = function() {
+    var x = void 0, y = void 0;
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+while (1 === 1) {
+    _loop_8();
+}
+var _loop_9 = function() {
+    var x = void 0, y = void 0;
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+do {
+    _loop_9();
+} while (1 === 1);
+var _loop_10 = function(y) {
+    var x = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+for (var y = 0; y < 1; ++y) {
+    _loop_10(y);
+}
+//=========const
+var _loop_11 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var x in {}) {
+    _loop_11(x);
+}
+var _loop_12 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    var x = _c[_b];
+    _loop_12(x);
+}
+var _loop_13 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var x = 0; x < 1;) {
+    _loop_13(x);
+}
+var _loop_14 = function() {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+};
+while (1 === 1) {
+    _loop_14();
+}
+var _loop_15 = function() {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+};
+do {
+    _loop_15();
+} while (1 === 1);
+var _loop_16 = function(y) {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+};
+for (var y = 0; y < 1;) {
+    _loop_16(y);
+}
+var _loop_17 = function(x, y) {
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+for (var x = 0, y = 1; x < 1;) {
+    _loop_17(x, y);
+}
+var _loop_18 = function() {
+    var x = 1, y = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+while (1 === 1) {
+    _loop_18();
+}
+var _loop_19 = function() {
+    var x = 1, y = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+do {
+    _loop_19();
+} while (1 === 1);
+var _loop_20 = function(y) {
+    var x = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+};
+for (var y = 0; y < 1;) {
+    _loop_20(y);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop1.symbols b/tests/baselines/reference/capturedLetConstInLoop1.symbols
new file mode 100644
index 00000000000..51e2d4c4112
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop1.symbols
@@ -0,0 +1,260 @@
+=== tests/cases/compiler/capturedLetConstInLoop1.ts ===
+//==== let
+for (let x in {}) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 1, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 1, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 1, 8))
+}
+
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 6, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 6, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 6, 8))
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 11, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 11, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 11, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 11, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 11, 8))
+}
+
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 17, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 17, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 17, 7))
+}
+
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 23, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 23, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 23, 7))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 28, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 28, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 28, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 29, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 29, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 29, 7))
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 34, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 34, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 34, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 34, 8))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 34, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 34, 15))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 34, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 34, 15))
+}
+
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 40, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 40, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 40, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 40, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 40, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 40, 10))
+}
+
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 46, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 46, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 46, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 46, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 46, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 46, 10))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 51, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 51, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 51, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 52, 7))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 51, 8))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 51, 8))
+}
+
+//=========const
+for (const x in {}) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 58, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 58, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 58, 10))
+}
+
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 63, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 63, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 63, 10))
+}
+
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 68, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 68, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 68, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 68, 10))
+}
+
+while (1 === 1) {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 74, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 74, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 74, 9))
+}
+
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 80, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 80, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 80, 9))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 85, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 85, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 86, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 86, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 86, 9))
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 91, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 91, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 91, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 91, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 91, 17))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 91, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 91, 17))
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 97, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 97, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 97, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 97, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 97, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 97, 16))
+}
+
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 103, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 103, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 103, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 103, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 103, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 103, 16))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 108, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 108, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 109, 9))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 109, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 108, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1.ts, 109, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1.ts, 108, 10))
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop1.types b/tests/baselines/reference/capturedLetConstInLoop1.types
new file mode 100644
index 00000000000..c68f2422f43
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop1.types
@@ -0,0 +1,428 @@
+=== tests/cases/compiler/capturedLetConstInLoop1.ts ===
+//==== let
+for (let x in {}) {
+>x : any
+>{} : {}
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+do {
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+}
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+//=========const
+for (const x in {}) {
+>x : any
+>{} : {}
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop1_ES6.js b/tests/baselines/reference/capturedLetConstInLoop1_ES6.js
new file mode 100644
index 00000000000..0a68f8e1cf6
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop1_ES6.js
@@ -0,0 +1,210 @@
+//// [capturedLetConstInLoop1_ES6.ts]
+//==== let
+for (let x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+//=========const
+for (const x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+//// [capturedLetConstInLoop1_ES6.js]
+//==== let
+for (let x in {}) {
+    (function () { return x; });
+    (() => x);
+}
+for (let x of []) {
+    (function () { return x; });
+    (() => x);
+}
+for (let x = 0; x < 1; ++x) {
+    (function () { return x; });
+    (() => x);
+}
+while (1 === 1) {
+    let x;
+    (function () { return x; });
+    (() => x);
+}
+do {
+    let x;
+    (function () { return x; });
+    (() => x);
+} while (1 === 1);
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function () { return x; });
+    (() => x);
+}
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function () { return x + y; });
+    (() => x + y);
+}
+while (1 === 1) {
+    let x, y;
+    (function () { return x + y; });
+    (() => x + y);
+}
+do {
+    let x, y;
+    (function () { return x + y; });
+    (() => x + y);
+} while (1 === 1);
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function () { return x + y; });
+    (() => x + y);
+}
+//=========const
+for (const x in {}) {
+    (function () { return x; });
+    (() => x);
+}
+for (const x of []) {
+    (function () { return x; });
+    (() => x);
+}
+for (const x = 0; x < 1;) {
+    (function () { return x; });
+    (() => x);
+}
+while (1 === 1) {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+}
+do {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+} while (1 === 1);
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+}
+for (const x = 0, y = 1; x < 1;) {
+    (function () { return x + y; });
+    (() => x + y);
+}
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function () { return x + y; });
+    (() => x + y);
+}
+do {
+    const x = 1, y = 1;
+    (function () { return x + y; });
+    (() => x + y);
+} while (1 === 1);
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function () { return x + y; });
+    (() => x + y);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop1_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop1_ES6.symbols
new file mode 100644
index 00000000000..f275ad26db2
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop1_ES6.symbols
@@ -0,0 +1,260 @@
+=== tests/cases/compiler/capturedLetConstInLoop1_ES6.ts ===
+//==== let
+for (let x in {}) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 1, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 1, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 1, 8))
+}
+
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 6, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 6, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 6, 8))
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 11, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 11, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 11, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 11, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 11, 8))
+}
+
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 17, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 17, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 17, 7))
+}
+
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 23, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 23, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 23, 7))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 28, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 28, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 28, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 29, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 29, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 29, 7))
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 34, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 34, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 34, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 34, 8))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 34, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 34, 15))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 34, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 34, 15))
+}
+
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 40, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 40, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 40, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 40, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 40, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 40, 10))
+}
+
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 46, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 46, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 46, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 46, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 46, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 46, 10))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 51, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 51, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 51, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 52, 7))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 51, 8))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 51, 8))
+}
+
+//=========const
+for (const x in {}) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 58, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 58, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 58, 10))
+}
+
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 63, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 63, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 63, 10))
+}
+
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 68, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 68, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 68, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 68, 10))
+}
+
+while (1 === 1) {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 74, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 74, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 74, 9))
+}
+
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 80, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 80, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 80, 9))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 85, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 85, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 86, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 86, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 86, 9))
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 91, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 91, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 91, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 91, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 91, 17))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 91, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 91, 17))
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 97, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 97, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 97, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 97, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 97, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 97, 16))
+}
+
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 103, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 103, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 103, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 103, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 103, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 103, 16))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 108, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 108, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 109, 9))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 109, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 108, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop1_ES6.ts, 109, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop1_ES6.ts, 108, 10))
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop1_ES6.types b/tests/baselines/reference/capturedLetConstInLoop1_ES6.types
new file mode 100644
index 00000000000..5e25e1f930d
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop1_ES6.types
@@ -0,0 +1,428 @@
+=== tests/cases/compiler/capturedLetConstInLoop1_ES6.ts ===
+//==== let
+for (let x in {}) {
+>x : any
+>{} : {}
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+do {
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+}
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+//=========const
+for (const x in {}) {
+>x : any
+>{} : {}
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop2.js b/tests/baselines/reference/capturedLetConstInLoop2.js
new file mode 100644
index 00000000000..b9fbcf46f57
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop2.js
@@ -0,0 +1,413 @@
+//// [capturedLetConstInLoop2.ts]
+
+
+// ========let
+function foo0(x) {
+    for (let x of []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3(x) {
+    do {
+        let x;
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        let a = arguments.length;
+        let x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+///=======const
+function foo0_c(x) {
+    for (const x of []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        const a = arguments.length;
+        const x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y =1 ;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+//// [capturedLetConstInLoop2.js]
+// ========let
+function foo0(x) {
+    var _loop_1 = function(x_1) {
+        var a = arguments_1.length;
+        (function () { return x_1 + a; });
+        (function () { return x_1 + a; });
+    };
+    var arguments_1 = arguments;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x_1 = _a[_i];
+        _loop_1(x_1);
+    }
+}
+function foo0_1(x) {
+    var _loop_2 = function(x_2) {
+        var a = arguments_2.length;
+        (function () { return x_2 + a; });
+        (function () { return x_2 + a; });
+    };
+    var arguments_2 = arguments;
+    for (var x_2 in []) {
+        _loop_2(x_2);
+    }
+}
+function foo1(x) {
+    var _loop_3 = function(x_3) {
+        var a = arguments_3.length;
+        (function () { return x_3 + a; });
+        (function () { return x_3 + a; });
+    };
+    var arguments_3 = arguments;
+    for (var x_3 = 0; x_3 < 1; ++x_3) {
+        _loop_3(x_3);
+    }
+}
+function foo2(x) {
+    var _loop_4 = function() {
+        var a = arguments_4.length;
+        (function () { return x + a; });
+        (function () { return x + a; });
+    };
+    var arguments_4 = arguments;
+    while (1 === 1) {
+        _loop_4();
+    }
+}
+function foo3(x) {
+    var _loop_5 = function() {
+        var x_4 = void 0;
+        var a = arguments_5.length;
+        (function () { return x_4 + a; });
+        (function () { return x_4 + a; });
+    };
+    var arguments_5 = arguments;
+    do {
+        _loop_5();
+    } while (1 === 1);
+}
+function foo4(x) {
+    var _loop_6 = function(y) {
+        var a = arguments_6.length;
+        var x_5 = 1;
+        (function () { return x_5 + a; });
+        (function () { return x_5 + a; });
+    };
+    var arguments_6 = arguments;
+    for (var y = 0; y < 1; ++y) {
+        _loop_6(y);
+    }
+}
+function foo5(x) {
+    var _loop_7 = function(x_6, y) {
+        var a = arguments_7.length;
+        (function () { return x_6 + y + a; });
+        (function () { return x_6 + y + a; });
+    };
+    var arguments_7 = arguments;
+    for (var x_6 = 0, y = 1; x_6 < 1; ++x_6) {
+        _loop_7(x_6, y);
+    }
+}
+function foo6(x) {
+    var _loop_8 = function() {
+        var x_7 = void 0, y = void 0;
+        var a = arguments_8.length;
+        (function () { return x_7 + y + a; });
+        (function () { return x_7 + y + a; });
+    };
+    var arguments_8 = arguments;
+    while (1 === 1) {
+        _loop_8();
+    }
+}
+function foo7(x) {
+    var _loop_9 = function() {
+        var x_8 = void 0, y = void 0;
+        var a = arguments_9.length;
+        (function () { return x_8 + y + a; });
+        (function () { return x_8 + y + a; });
+    };
+    var arguments_9 = arguments;
+    do {
+        _loop_9();
+    } while (1 === 1);
+}
+function foo8(x) {
+    var _loop_10 = function(y) {
+        var x_9 = 1;
+        var a = arguments_10.length;
+        (function () { return x_9 + y + a; });
+        (function () { return x_9 + y + a; });
+    };
+    var arguments_10 = arguments;
+    for (var y = 0; y < 1; ++y) {
+        _loop_10(y);
+    }
+}
+///=======const
+function foo0_c(x) {
+    var _loop_11 = function(x_10) {
+        var a = arguments_11.length;
+        (function () { return x_10 + a; });
+        (function () { return x_10 + a; });
+    };
+    var arguments_11 = arguments;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x_10 = _a[_i];
+        _loop_11(x_10);
+    }
+}
+function foo0_1_c(x) {
+    var _loop_12 = function(x_11) {
+        var a = arguments_12.length;
+        (function () { return x_11 + a; });
+        (function () { return x_11 + a; });
+    };
+    var arguments_12 = arguments;
+    for (var x_11 in []) {
+        _loop_12(x_11);
+    }
+}
+function foo1_c(x) {
+    var _loop_13 = function(x_12) {
+        var a = arguments_13.length;
+        (function () { return x_12 + a; });
+        (function () { return x_12 + a; });
+    };
+    var arguments_13 = arguments;
+    for (var x_12 = 0; x_12 < 1;) {
+        _loop_13(x_12);
+    }
+}
+function foo2_c(x) {
+    var _loop_14 = function() {
+        var a = arguments_14.length;
+        (function () { return x + a; });
+        (function () { return x + a; });
+    };
+    var arguments_14 = arguments;
+    while (1 === 1) {
+        _loop_14();
+    }
+}
+function foo3_c(x) {
+    var _loop_15 = function() {
+        var x_13 = 1;
+        var a = arguments_15.length;
+        (function () { return x_13 + a; });
+        (function () { return x_13 + a; });
+    };
+    var arguments_15 = arguments;
+    do {
+        _loop_15();
+    } while (1 === 1);
+}
+function foo4_c(x) {
+    var _loop_16 = function(y) {
+        var a = arguments_16.length;
+        var x_14 = 1;
+        (function () { return x_14 + a; });
+        (function () { return x_14 + a; });
+    };
+    var arguments_16 = arguments;
+    for (var y = 0; y < 1;) {
+        _loop_16(y);
+    }
+}
+function foo5_c(x) {
+    var _loop_17 = function(x_15, y) {
+        var a = arguments_17.length;
+        (function () { return x_15 + y + a; });
+        (function () { return x_15 + y + a; });
+    };
+    var arguments_17 = arguments;
+    for (var x_15 = 0, y = 1; x_15 < 1;) {
+        _loop_17(x_15, y);
+    }
+}
+function foo6_c(x) {
+    var _loop_18 = function() {
+        var x_16 = 1, y = 1;
+        var a = arguments_18.length;
+        (function () { return x_16 + y + a; });
+        (function () { return x_16 + y + a; });
+    };
+    var arguments_18 = arguments;
+    while (1 === 1) {
+        _loop_18();
+    }
+}
+function foo7_c(x) {
+    var _loop_19 = function() {
+        var x_17 = 1, y = 1;
+        var a = arguments_19.length;
+        (function () { return x_17 + y + a; });
+        (function () { return x_17 + y + a; });
+    };
+    var arguments_19 = arguments;
+    do {
+        _loop_19();
+    } while (1 === 1);
+}
+function foo8_c(x) {
+    var _loop_20 = function(y) {
+        var x_18 = 1;
+        var a = arguments_20.length;
+        (function () { return x_18 + y + a; });
+        (function () { return x_18 + y + a; });
+    };
+    var arguments_20 = arguments;
+    for (var y = 0; y < 1;) {
+        _loop_20(y);
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop2.symbols b/tests/baselines/reference/capturedLetConstInLoop2.symbols
new file mode 100644
index 00000000000..8fb2de72999
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop2.symbols
@@ -0,0 +1,519 @@
+=== tests/cases/compiler/capturedLetConstInLoop2.ts ===
+
+
+// ========let
+function foo0(x) {
+>foo0 : Symbol(foo0, Decl(capturedLetConstInLoop2.ts, 0, 0))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 3, 14))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 4, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 5, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 4, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 5, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 4, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 5, 11))
+    }
+}
+
+function foo0_1(x) {
+>foo0_1 : Symbol(foo0_1, Decl(capturedLetConstInLoop2.ts, 9, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 11, 16))
+
+    for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 12, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 13, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 12, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 13, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 12, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 13, 11))
+    }
+}
+
+function foo1(x) {
+>foo1 : Symbol(foo1, Decl(capturedLetConstInLoop2.ts, 17, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 19, 14))
+
+    for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 20, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 20, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 20, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 21, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 20, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 21, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 20, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 21, 11))
+    }
+}
+
+function foo2(x) {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop2.ts, 25, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 27, 14))
+
+    while (1 === 1) {
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 29, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 27, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 29, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 27, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 29, 11))
+    }
+}
+
+function foo3(x) {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop2.ts, 33, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 35, 14))
+
+    do {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 37, 11))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 38, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 37, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 38, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 37, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 38, 11))
+
+    } while (1 === 1)
+}
+
+function foo4(x) {
+>foo4 : Symbol(foo4, Decl(capturedLetConstInLoop2.ts, 42, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 44, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 45, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 45, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 45, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 46, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 47, 11))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 47, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 46, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 47, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 46, 11))
+    }
+}
+
+function foo5(x) {
+>foo5 : Symbol(foo5, Decl(capturedLetConstInLoop2.ts, 51, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 53, 14))
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 54, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 54, 19))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 54, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 54, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 55, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 54, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 54, 19))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 55, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 54, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 54, 19))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 55, 11))
+    }
+}
+
+
+function foo6(x) {
+>foo6 : Symbol(foo6, Decl(capturedLetConstInLoop2.ts, 59, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 62, 14))
+
+    while (1 === 1) {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 64, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 64, 14))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 65, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 64, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 64, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 65, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 64, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 64, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 65, 11))
+    }
+}
+
+function foo7(x) {
+>foo7 : Symbol(foo7, Decl(capturedLetConstInLoop2.ts, 69, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 71, 14))
+
+    do {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 73, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 73, 14))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 74, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 73, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 73, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 74, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 73, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 73, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 74, 11))
+
+    } while (1 === 1)
+}
+
+
+function foo8(x) {
+>foo8 : Symbol(foo8, Decl(capturedLetConstInLoop2.ts, 78, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 81, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 82, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 82, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 82, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 83, 11))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 84, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 83, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 82, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 84, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 83, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 82, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 84, 11))
+    }
+}
+///=======const
+function foo0_c(x) {
+>foo0_c : Symbol(foo0_c, Decl(capturedLetConstInLoop2.ts, 88, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 90, 16))
+
+    for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 91, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 92, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 91, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 92, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 91, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 92, 13))
+    }
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : Symbol(foo0_1_c, Decl(capturedLetConstInLoop2.ts, 96, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 98, 18))
+
+    for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 99, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 100, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 99, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 100, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 99, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 100, 13))
+    }
+}
+
+function foo1_c(x) {
+>foo1_c : Symbol(foo1_c, Decl(capturedLetConstInLoop2.ts, 104, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 106, 16))
+
+    for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 107, 14))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 107, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 108, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 107, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 108, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 107, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 108, 13))
+    }
+}
+
+function foo2_c(x) {
+>foo2_c : Symbol(foo2_c, Decl(capturedLetConstInLoop2.ts, 112, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 114, 16))
+
+    while (1 === 1) {
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 116, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 114, 16))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 116, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 114, 16))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 116, 13))
+    }
+}
+
+function foo3_c(x) {
+>foo3_c : Symbol(foo3_c, Decl(capturedLetConstInLoop2.ts, 120, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 122, 16))
+
+    do {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 124, 13))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 125, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 124, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 125, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 124, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 125, 13))
+
+    } while (1 === 1)
+}
+
+function foo4_c(x) {
+>foo4_c : Symbol(foo4_c, Decl(capturedLetConstInLoop2.ts, 129, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 131, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 132, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 132, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 133, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 134, 13))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 134, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 133, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 134, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 133, 13))
+    }
+}
+
+function foo5_c(x) {
+>foo5_c : Symbol(foo5_c, Decl(capturedLetConstInLoop2.ts, 138, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 140, 16))
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 141, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 141, 21))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 141, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 142, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 141, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 141, 21))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 142, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 141, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 141, 21))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 142, 13))
+    }
+}
+
+
+function foo6_c(x) {
+>foo6_c : Symbol(foo6_c, Decl(capturedLetConstInLoop2.ts, 146, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 149, 16))
+
+    while (1 === 1) {
+        const x = 1, y =1 ;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 151, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 151, 20))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 152, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 151, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 151, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 152, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 151, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 151, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 152, 13))
+    }
+}
+
+function foo7_c(x) {
+>foo7_c : Symbol(foo7_c, Decl(capturedLetConstInLoop2.ts, 156, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 158, 16))
+
+    do {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 160, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 160, 20))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 161, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 160, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 160, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 161, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 160, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 160, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 161, 13))
+
+    } while (1 === 1)
+}
+
+
+function foo8_c(x) {
+>foo8_c : Symbol(foo8_c, Decl(capturedLetConstInLoop2.ts, 165, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 168, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 169, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 169, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 170, 13))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 171, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 170, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 169, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 171, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2.ts, 170, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2.ts, 169, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2.ts, 171, 13))
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop2.types b/tests/baselines/reference/capturedLetConstInLoop2.types
new file mode 100644
index 00000000000..5108fc399ee
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop2.types
@@ -0,0 +1,726 @@
+=== tests/cases/compiler/capturedLetConstInLoop2.ts ===
+
+
+// ========let
+function foo0(x) {
+>foo0 : (x: any) => void
+>x : any
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo0_1(x) {
+>foo0_1 : (x: any) => void
+>x : any
+
+    for (let x in []) {
+>x : any
+>[] : undefined[]
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo1(x) {
+>foo1 : (x: any) => void
+>x : any
+
+    for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo2(x) {
+>foo2 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo3(x) {
+>foo3 : (x: any) => void
+>x : any
+
+    do {
+        let x;
+>x : any
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+function foo4(x) {
+>foo4 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo5(x) {
+>foo5 : (x: any) => void
+>x : any
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+
+
+function foo6(x) {
+>foo6 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x, y;
+>x : any
+>y : any
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => any
+>function() { return x + y + a } : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => any
+>() => x + y + a : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+    }
+}
+
+function foo7(x) {
+>foo7 : (x: any) => void
+>x : any
+
+    do {
+        let x, y;
+>x : any
+>y : any
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => any
+>function() { return x + y + a } : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => any
+>() => x + y + a : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+
+function foo8(x) {
+>foo8 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+///=======const
+function foo0_c(x) {
+>foo0_c : (x: any) => void
+>x : any
+
+    for (const x of []) {
+>x : any
+>[] : undefined[]
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : (x: any) => void
+>x : any
+
+    for (const x in []) {
+>x : any
+>[] : undefined[]
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo1_c(x) {
+>foo1_c : (x: any) => void
+>x : any
+
+    for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo2_c(x) {
+>foo2_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo3_c(x) {
+>foo3_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1;
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+function foo4_c(x) {
+>foo4_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo5_c(x) {
+>foo5_c : (x: any) => void
+>x : any
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+
+
+function foo6_c(x) {
+>foo6_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1, y =1 ;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+
+function foo7_c(x) {
+>foo7_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+
+function foo8_c(x) {
+>foo8_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop2_ES6.js b/tests/baselines/reference/capturedLetConstInLoop2_ES6.js
new file mode 100644
index 00000000000..aac040d4d29
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop2_ES6.js
@@ -0,0 +1,330 @@
+//// [capturedLetConstInLoop2_ES6.ts]
+
+// ========let
+function foo0(x) {
+    for (let x of []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3(x) {
+    do {
+        let x;
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        let a = arguments.length;
+        let x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+///=======const
+function foo0_c(x) {
+    for (const x of []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        const a = arguments.length;
+        const x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y =1 ;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+//// [capturedLetConstInLoop2_ES6.js]
+// ========let
+function foo0(x) {
+    for (let x of []) {
+        let a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo0_1(x) {
+    for (let x in []) {
+        let a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        let a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo2(x) {
+    while (1 === 1) {
+        let a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo3(x) {
+    do {
+        let x;
+        let a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    } while (1 === 1);
+}
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        let a = arguments.length;
+        let x = 1;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        let a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    }
+}
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        let a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    }
+}
+function foo7(x) {
+    do {
+        let x, y;
+        let a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    } while (1 === 1);
+}
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        let a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    }
+}
+///=======const
+function foo0_c(x) {
+    for (const x of []) {
+        const a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo0_1_c(x) {
+    for (const x in []) {
+        const a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        const a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo2_c(x) {
+    while (1 === 1) {
+        const a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo3_c(x) {
+    do {
+        const x = 1;
+        const a = arguments.length;
+        (function () { return x + a; });
+        (() => x + a);
+    } while (1 === 1);
+}
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        const a = arguments.length;
+        const x = 1;
+        (function () { return x + a; });
+        (() => x + a);
+    }
+}
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        const a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    }
+}
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        const a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    }
+}
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        const a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    } while (1 === 1);
+}
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        const a = arguments.length;
+        (function () { return x + y + a; });
+        (() => x + y + a);
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop2_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop2_ES6.symbols
new file mode 100644
index 00000000000..32812c89370
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop2_ES6.symbols
@@ -0,0 +1,518 @@
+=== tests/cases/compiler/capturedLetConstInLoop2_ES6.ts ===
+
+// ========let
+function foo0(x) {
+>foo0 : Symbol(foo0, Decl(capturedLetConstInLoop2_ES6.ts, 0, 0))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 2, 14))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 3, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 4, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 3, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 4, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 3, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 4, 11))
+    }
+}
+
+function foo0_1(x) {
+>foo0_1 : Symbol(foo0_1, Decl(capturedLetConstInLoop2_ES6.ts, 8, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 10, 16))
+
+    for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 11, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 12, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 11, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 12, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 11, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 12, 11))
+    }
+}
+
+function foo1(x) {
+>foo1 : Symbol(foo1, Decl(capturedLetConstInLoop2_ES6.ts, 16, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 18, 14))
+
+    for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 19, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 19, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 19, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 20, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 19, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 20, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 19, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 20, 11))
+    }
+}
+
+function foo2(x) {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop2_ES6.ts, 24, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 26, 14))
+
+    while (1 === 1) {
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 28, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 26, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 28, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 26, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 28, 11))
+    }
+}
+
+function foo3(x) {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop2_ES6.ts, 32, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 34, 14))
+
+    do {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 36, 11))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 37, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 36, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 37, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 36, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 37, 11))
+
+    } while (1 === 1)
+}
+
+function foo4(x) {
+>foo4 : Symbol(foo4, Decl(capturedLetConstInLoop2_ES6.ts, 41, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 43, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 44, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 44, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 44, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 45, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 46, 11))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 46, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 45, 11))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 46, 11))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 45, 11))
+    }
+}
+
+function foo5(x) {
+>foo5 : Symbol(foo5, Decl(capturedLetConstInLoop2_ES6.ts, 50, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 52, 14))
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 53, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 53, 19))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 53, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 53, 12))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 54, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 53, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 53, 19))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 54, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 53, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 53, 19))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 54, 11))
+    }
+}
+
+
+function foo6(x) {
+>foo6 : Symbol(foo6, Decl(capturedLetConstInLoop2_ES6.ts, 58, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 61, 14))
+
+    while (1 === 1) {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 63, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 63, 14))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 64, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 63, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 63, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 64, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 63, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 63, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 64, 11))
+    }
+}
+
+function foo7(x) {
+>foo7 : Symbol(foo7, Decl(capturedLetConstInLoop2_ES6.ts, 68, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 70, 14))
+
+    do {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 72, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 72, 14))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 73, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 72, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 72, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 73, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 72, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 72, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 73, 11))
+
+    } while (1 === 1)
+}
+
+
+function foo8(x) {
+>foo8 : Symbol(foo8, Decl(capturedLetConstInLoop2_ES6.ts, 77, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 80, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 81, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 81, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 81, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 82, 11))
+
+        let a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 83, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 82, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 81, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 83, 11))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 82, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 81, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 83, 11))
+    }
+}
+///=======const
+function foo0_c(x) {
+>foo0_c : Symbol(foo0_c, Decl(capturedLetConstInLoop2_ES6.ts, 87, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 89, 16))
+
+    for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 90, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 91, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 90, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 91, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 90, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 91, 13))
+    }
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : Symbol(foo0_1_c, Decl(capturedLetConstInLoop2_ES6.ts, 95, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 97, 18))
+
+    for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 98, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 99, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 98, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 99, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 98, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 99, 13))
+    }
+}
+
+function foo1_c(x) {
+>foo1_c : Symbol(foo1_c, Decl(capturedLetConstInLoop2_ES6.ts, 103, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 105, 16))
+
+    for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 106, 14))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 106, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 107, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 106, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 107, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 106, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 107, 13))
+    }
+}
+
+function foo2_c(x) {
+>foo2_c : Symbol(foo2_c, Decl(capturedLetConstInLoop2_ES6.ts, 111, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 113, 16))
+
+    while (1 === 1) {
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 115, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 113, 16))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 115, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 113, 16))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 115, 13))
+    }
+}
+
+function foo3_c(x) {
+>foo3_c : Symbol(foo3_c, Decl(capturedLetConstInLoop2_ES6.ts, 119, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 121, 16))
+
+    do {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 123, 13))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 124, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 123, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 124, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 123, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 124, 13))
+
+    } while (1 === 1)
+}
+
+function foo4_c(x) {
+>foo4_c : Symbol(foo4_c, Decl(capturedLetConstInLoop2_ES6.ts, 128, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 130, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 131, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 131, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 132, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 133, 13))
+
+        (function() { return x + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 133, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 132, 13))
+
+        (() => x + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 133, 13))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 132, 13))
+    }
+}
+
+function foo5_c(x) {
+>foo5_c : Symbol(foo5_c, Decl(capturedLetConstInLoop2_ES6.ts, 137, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 139, 16))
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 140, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 140, 21))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 140, 14))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 141, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 140, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 140, 21))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 141, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 140, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 140, 21))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 141, 13))
+    }
+}
+
+
+function foo6_c(x) {
+>foo6_c : Symbol(foo6_c, Decl(capturedLetConstInLoop2_ES6.ts, 145, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 148, 16))
+
+    while (1 === 1) {
+        const x = 1, y =1 ;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 150, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 150, 20))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 151, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 150, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 150, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 151, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 150, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 150, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 151, 13))
+    }
+}
+
+function foo7_c(x) {
+>foo7_c : Symbol(foo7_c, Decl(capturedLetConstInLoop2_ES6.ts, 155, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 157, 16))
+
+    do {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 159, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 159, 20))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 160, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 159, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 159, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 160, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 159, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 159, 20))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 160, 13))
+
+    } while (1 === 1)
+}
+
+
+function foo8_c(x) {
+>foo8_c : Symbol(foo8_c, Decl(capturedLetConstInLoop2_ES6.ts, 164, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 167, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 168, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 168, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 169, 13))
+
+        const a = arguments.length;
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 170, 13))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return x + y + a });
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 169, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 168, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 170, 13))
+
+        (() => x + y + a);
+>x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 169, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop2_ES6.ts, 168, 14))
+>a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 170, 13))
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop2_ES6.types b/tests/baselines/reference/capturedLetConstInLoop2_ES6.types
new file mode 100644
index 00000000000..9fea265da44
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop2_ES6.types
@@ -0,0 +1,725 @@
+=== tests/cases/compiler/capturedLetConstInLoop2_ES6.ts ===
+
+// ========let
+function foo0(x) {
+>foo0 : (x: any) => void
+>x : any
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo0_1(x) {
+>foo0_1 : (x: any) => void
+>x : any
+
+    for (let x in []) {
+>x : any
+>[] : undefined[]
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo1(x) {
+>foo1 : (x: any) => void
+>x : any
+
+    for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo2(x) {
+>foo2 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo3(x) {
+>foo3 : (x: any) => void
+>x : any
+
+    do {
+        let x;
+>x : any
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+function foo4(x) {
+>foo4 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo5(x) {
+>foo5 : (x: any) => void
+>x : any
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+
+
+function foo6(x) {
+>foo6 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x, y;
+>x : any
+>y : any
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => any
+>function() { return x + y + a } : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => any
+>() => x + y + a : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+    }
+}
+
+function foo7(x) {
+>foo7 : (x: any) => void
+>x : any
+
+    do {
+        let x, y;
+>x : any
+>y : any
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => any
+>function() { return x + y + a } : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => any
+>() => x + y + a : () => any
+>x + y + a : any
+>x + y : any
+>x : any
+>y : any
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+
+function foo8(x) {
+>foo8 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        let a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+///=======const
+function foo0_c(x) {
+>foo0_c : (x: any) => void
+>x : any
+
+    for (const x of []) {
+>x : any
+>[] : undefined[]
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : (x: any) => void
+>x : any
+
+    for (const x in []) {
+>x : any
+>[] : undefined[]
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo1_c(x) {
+>foo1_c : (x: any) => void
+>x : any
+
+    for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo2_c(x) {
+>foo2_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => any
+>function() { return x + a } : () => any
+>x + a : any
+>x : any
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => any
+>() => x + a : () => any
+>x + a : any
+>x : any
+>a : number
+    }
+}
+
+function foo3_c(x) {
+>foo3_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1;
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+function foo4_c(x) {
+>foo4_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + a });
+>(function() { return x + a }) : () => number
+>function() { return x + a } : () => number
+>x + a : number
+>x : number
+>a : number
+
+        (() => x + a);
+>(() => x + a) : () => number
+>() => x + a : () => number
+>x + a : number
+>x : number
+>a : number
+    }
+}
+
+function foo5_c(x) {
+>foo5_c : (x: any) => void
+>x : any
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+
+
+function foo6_c(x) {
+>foo6_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1, y =1 ;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
+
+function foo7_c(x) {
+>foo7_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+}
+
+
+function foo8_c(x) {
+>foo8_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        const a = arguments.length;
+>a : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return x + y + a });
+>(function() { return x + y + a }) : () => number
+>function() { return x + y + a } : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+
+        (() => x + y + a);
+>(() => x + y + a) : () => number
+>() => x + y + a : () => number
+>x + y + a : number
+>x + y : number
+>x : number
+>y : number
+>a : number
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.js b/tests/baselines/reference/capturedLetConstInLoop3.js
new file mode 100644
index 00000000000..b38c12967dd
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop3.js
@@ -0,0 +1,473 @@
+//// [capturedLetConstInLoop3.ts]
+///=========let
+declare function use(a: any);
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+//===const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        const x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+//// [capturedLetConstInLoop3.js]
+function foo0(x) {
+    var _loop_1 = function(x_1) {
+        v = x_1;
+        (function () { return x_1 + v; });
+        (function () { return x_1 + v; });
+    };
+    var v;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x_1 = _a[_i];
+        _loop_1(x_1);
+    }
+    use(v);
+}
+function foo0_1(x) {
+    var _loop_2 = function(x_2) {
+        v = x_2;
+        (function () { return x_2 + v; });
+        (function () { return x_2 + v; });
+    };
+    var v;
+    for (var x_2 in []) {
+        _loop_2(x_2);
+    }
+    use(v);
+}
+function foo1(x) {
+    var _loop_3 = function(x_3) {
+        v = x_3;
+        (function () { return x_3 + v; });
+        (function () { return x_3 + v; });
+    };
+    var v;
+    for (var x_3 = 0; x_3 < 1; ++x_3) {
+        _loop_3(x_3);
+    }
+    use(v);
+}
+function foo2(x) {
+    var _loop_4 = function() {
+        var x_4 = 1;
+        v = x_4;
+        (function () { return x_4 + v; });
+        (function () { return x_4 + v; });
+    };
+    var v;
+    while (1 === 1) {
+        _loop_4();
+    }
+    use(v);
+}
+function foo3(x) {
+    var _loop_5 = function() {
+        var x_5 = void 0;
+        (function () { return x_5 + v; });
+        (function () { return x_5 + v; });
+    };
+    var v;
+    do {
+        _loop_5();
+    } while (1 === 1);
+    use(v);
+}
+function foo4(x) {
+    var _loop_6 = function(y) {
+        v = y;
+        var x_6 = 1;
+        (function () { return x_6 + v; });
+        (function () { return x_6 + v; });
+    };
+    var v;
+    for (var y = 0; y < 1; ++y) {
+        _loop_6(y);
+    }
+    use(v);
+}
+function foo5(x) {
+    var _loop_7 = function(x_7, y) {
+        v = x_7;
+        (function () { return x_7 + y + v; });
+        (function () { return x_7 + y + v; });
+    };
+    var v;
+    for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) {
+        _loop_7(x_7, y);
+    }
+    use(v);
+}
+function foo6(x) {
+    var _loop_8 = function() {
+        var x_8 = void 0, y = void 0;
+        v = x_8;
+        (function () { return x_8 + y + v; });
+        (function () { return x_8 + y + v; });
+    };
+    var v;
+    while (1 === 1) {
+        _loop_8();
+    }
+    use(v);
+}
+function foo7(x) {
+    var _loop_9 = function() {
+        var x_9 = void 0, y = void 0;
+        v = x_9;
+        (function () { return x_9 + y + v; });
+        (function () { return x_9 + y + v; });
+    };
+    var v;
+    do {
+        _loop_9();
+    } while (1 === 1);
+    use(v);
+}
+function foo8(x) {
+    var _loop_10 = function(y) {
+        var x_10 = 1;
+        v = x_10;
+        (function () { return x_10 + y + v; });
+        (function () { return x_10 + y + v; });
+    };
+    var v;
+    for (var y = 0; y < 1; ++y) {
+        _loop_10(y);
+    }
+    use(v);
+}
+//===const
+function foo0_c(x) {
+    var _loop_11 = function(x_11) {
+        v = x_11;
+        (function () { return x_11 + v; });
+        (function () { return x_11 + v; });
+    };
+    var v;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x_11 = _a[_i];
+        _loop_11(x_11);
+    }
+    use(v);
+}
+function foo0_1_c(x) {
+    var _loop_12 = function(x_12) {
+        v = x_12;
+        (function () { return x_12 + v; });
+        (function () { return x_12 + v; });
+    };
+    var v;
+    for (var x_12 in []) {
+        _loop_12(x_12);
+    }
+    use(v);
+}
+function foo1_c(x) {
+    var _loop_13 = function(x_13) {
+        v = x_13;
+        (function () { return x_13 + v; });
+        (function () { return x_13 + v; });
+    };
+    var v;
+    for (var x_13 = 0; x_13 < 1;) {
+        _loop_13(x_13);
+    }
+    use(v);
+}
+function foo2_c(x) {
+    var _loop_14 = function() {
+        var x_14 = 1;
+        v = x_14;
+        (function () { return x_14 + v; });
+        (function () { return x_14 + v; });
+    };
+    var v;
+    while (1 === 1) {
+        _loop_14();
+    }
+    use(v);
+}
+function foo3_c(x) {
+    var _loop_15 = function() {
+        var x_15 = 1;
+        (function () { return x_15 + v; });
+        (function () { return x_15 + v; });
+    };
+    var v;
+    do {
+        _loop_15();
+    } while (1 === 1);
+    use(v);
+}
+function foo4_c(x) {
+    var _loop_16 = function(y) {
+        v = y;
+        var x_16 = 1;
+        (function () { return x_16 + v; });
+        (function () { return x_16 + v; });
+    };
+    var v;
+    for (var y = 0; y < 1;) {
+        _loop_16(y);
+    }
+    use(v);
+}
+function foo5_c(x) {
+    var _loop_17 = function(x_17, y) {
+        v = x_17;
+        (function () { return x_17 + y + v; });
+        (function () { return x_17 + y + v; });
+    };
+    var v;
+    for (var x_17 = 0, y = 1; x_17 < 1;) {
+        _loop_17(x_17, y);
+    }
+    use(v);
+}
+function foo6_c(x) {
+    var _loop_18 = function() {
+        var x_18 = 1, y = 1;
+        v = x_18;
+        (function () { return x_18 + y + v; });
+        (function () { return x_18 + y + v; });
+    };
+    var v;
+    while (1 === 1) {
+        _loop_18();
+    }
+    use(v);
+}
+function foo7_c(x) {
+    var _loop_19 = function() {
+        var x_19 = 1, y = 1;
+        v = x_19;
+        (function () { return x_19 + y + v; });
+        (function () { return x_19 + y + v; });
+    };
+    var v;
+    do {
+        _loop_19();
+    } while (1 === 1);
+    use(v);
+}
+function foo8_c(x) {
+    var _loop_20 = function(y) {
+        var x_20 = 1;
+        v = x_20;
+        (function () { return x_20 + y + v; });
+        (function () { return x_20 + y + v; });
+    };
+    var v;
+    for (var y = 0; y < 1;) {
+        _loop_20(y);
+    }
+    use(v);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.symbols b/tests/baselines/reference/capturedLetConstInLoop3.symbols
new file mode 100644
index 00000000000..f80992139a1
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop3.symbols
@@ -0,0 +1,565 @@
+=== tests/cases/compiler/capturedLetConstInLoop3.ts ===
+///=========let
+declare function use(a: any);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>a : Symbol(a, Decl(capturedLetConstInLoop3.ts, 1, 21))
+
+function foo0(x) {
+>foo0 : Symbol(foo0, Decl(capturedLetConstInLoop3.ts, 1, 29))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 2, 14))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 3, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 4, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 3, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 3, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 4, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 3, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 4, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 4, 11))
+}
+
+function foo0_1(x) {
+>foo0_1 : Symbol(foo0_1, Decl(capturedLetConstInLoop3.ts, 10, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 12, 16))
+
+    for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 13, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 14, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 13, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 13, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 14, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 13, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 14, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 14, 11))
+}
+
+function foo1(x) {
+>foo1 : Symbol(foo1, Decl(capturedLetConstInLoop3.ts, 20, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 22, 14))
+
+    for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 23, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 23, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 23, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 24, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 23, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 23, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 24, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 23, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 24, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 24, 11))
+}
+
+function foo2(x) {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop3.ts, 30, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 32, 14))
+
+    while (1 === 1) {
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 34, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 35, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 34, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 34, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 35, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 34, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 35, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 35, 11))
+}
+
+function foo3(x) {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop3.ts, 41, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 43, 14))
+
+    do {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 45, 11))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 46, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 45, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 46, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 45, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 46, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 46, 11))
+}
+
+function foo4(x) {
+>foo4 : Symbol(foo4, Decl(capturedLetConstInLoop3.ts, 52, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 54, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 55, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 55, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 55, 12))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 56, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 55, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 57, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 57, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 56, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 57, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 56, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 56, 11))
+}
+
+function foo5(x) {
+>foo5 : Symbol(foo5, Decl(capturedLetConstInLoop3.ts, 63, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 65, 14))
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 66, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 66, 19))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 66, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 66, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 67, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 66, 12))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 66, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 66, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 67, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 66, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 66, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 67, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 67, 11))
+}
+
+
+function foo6(x) {
+>foo6 : Symbol(foo6, Decl(capturedLetConstInLoop3.ts, 73, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 76, 14))
+
+    while (1 === 1) {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 78, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 78, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 79, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 78, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 78, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 78, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 79, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 78, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 78, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 79, 11))
+    }
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 79, 11))
+}
+
+function foo7(x) {
+>foo7 : Symbol(foo7, Decl(capturedLetConstInLoop3.ts, 85, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 87, 14))
+
+    do {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 89, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 89, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 90, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 89, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 89, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 89, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 90, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 89, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 89, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 90, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 90, 11))
+}
+
+
+function foo8(x) {
+>foo8 : Symbol(foo8, Decl(capturedLetConstInLoop3.ts, 96, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 99, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 100, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 100, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 100, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 101, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 102, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 101, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 101, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 100, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 102, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 101, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 100, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 102, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 102, 11))
+}
+//===const
+function foo0_c(x) {
+>foo0_c : Symbol(foo0_c, Decl(capturedLetConstInLoop3.ts, 108, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 110, 16))
+
+    for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 111, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 112, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 111, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 111, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 112, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 111, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 112, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 112, 11))
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : Symbol(foo0_1_c, Decl(capturedLetConstInLoop3.ts, 118, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 120, 18))
+
+    for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 121, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 122, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 121, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 121, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 122, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 121, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 122, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 122, 11))
+}
+
+function foo1_c(x) {
+>foo1_c : Symbol(foo1_c, Decl(capturedLetConstInLoop3.ts, 128, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 130, 16))
+
+    for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 131, 14))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 131, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 132, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 131, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 131, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 132, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 131, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 132, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 132, 11))
+}
+
+function foo2_c(x) {
+>foo2_c : Symbol(foo2_c, Decl(capturedLetConstInLoop3.ts, 138, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 140, 16))
+
+    while (1 === 1) {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 142, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 143, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 142, 13))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 142, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 143, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 142, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 143, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 143, 11))
+}
+
+function foo3_c(x) {
+>foo3_c : Symbol(foo3_c, Decl(capturedLetConstInLoop3.ts, 149, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 151, 16))
+
+    do {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 153, 13))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 154, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 153, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 154, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 153, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 154, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 154, 11))
+}
+
+function foo4_c(x) {
+>foo4_c : Symbol(foo4_c, Decl(capturedLetConstInLoop3.ts, 160, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 162, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 163, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 163, 14))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 164, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 163, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 165, 13))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 165, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 164, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 165, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 164, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 164, 11))
+}
+
+function foo5_c(x) {
+>foo5_c : Symbol(foo5_c, Decl(capturedLetConstInLoop3.ts, 171, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 173, 16))
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 174, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 174, 21))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 174, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 175, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 174, 14))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 174, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 174, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 175, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 174, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 174, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 175, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 175, 11))
+}
+
+
+function foo6_c(x) {
+>foo6_c : Symbol(foo6_c, Decl(capturedLetConstInLoop3.ts, 181, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 184, 16))
+
+    while (1 === 1) {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 186, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 186, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 187, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 186, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 186, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 186, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 187, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 186, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 186, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 187, 11))
+    }
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 187, 11))
+}
+
+function foo7_c(x) {
+>foo7_c : Symbol(foo7_c, Decl(capturedLetConstInLoop3.ts, 193, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 195, 16))
+
+    do {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 197, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 197, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 198, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 197, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 197, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 197, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 198, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 197, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 197, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 198, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 198, 11))
+}
+
+
+function foo8_c(x) {
+>foo8_c : Symbol(foo8_c, Decl(capturedLetConstInLoop3.ts, 204, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 207, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 208, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 208, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 209, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 210, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 209, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 209, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 208, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 210, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3.ts, 209, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3.ts, 208, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 210, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3.ts, 210, 11))
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.types b/tests/baselines/reference/capturedLetConstInLoop3.types
new file mode 100644
index 00000000000..51646f5a98b
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop3.types
@@ -0,0 +1,794 @@
+=== tests/cases/compiler/capturedLetConstInLoop3.ts ===
+///=========let
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+function foo0(x) {
+>foo0 : (x: any) => void
+>x : any
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo0_1(x) {
+>foo0_1 : (x: any) => void
+>x : any
+
+    for (let x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1(x) {
+>foo1 : (x: any) => void
+>x : any
+
+    for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2(x) {
+>foo2 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3(x) {
+>foo3 : (x: any) => void
+>x : any
+
+    do {
+        let x;
+>x : any
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4(x) {
+>foo4 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        var v = y;
+>v : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5(x) {
+>foo5 : (x: any) => void
+>x : any
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6(x) {
+>foo6 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+    }
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo7(x) {
+>foo7 : (x: any) => void
+>x : any
+
+    do {
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+
+function foo8(x) {
+>foo8 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+//===const
+function foo0_c(x) {
+>foo0_c : (x: any) => void
+>x : any
+
+    for (const x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : (x: any) => void
+>x : any
+
+    for (const x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1_c(x) {
+>foo1_c : (x: any) => void
+>x : any
+
+    for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2_c(x) {
+>foo2_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3_c(x) {
+>foo3_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1;
+>x : number
+>1 : number
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : number
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : number
+>v : any
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4_c(x) {
+>foo4_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        var v = y;
+>v : number
+>y : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5_c(x) {
+>foo5_c : (x: any) => void
+>x : any
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6_c(x) {
+>foo6_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo7_c(x) {
+>foo7_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo8_c(x) {
+>foo8_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop3_ES6.js b/tests/baselines/reference/capturedLetConstInLoop3_ES6.js
new file mode 100644
index 00000000000..f27713a52a8
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop3_ES6.js
@@ -0,0 +1,394 @@
+//// [capturedLetConstInLoop3_ES6.ts]
+
+///=========let
+declare function use(a: any);
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+//===const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        const x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+//// [capturedLetConstInLoop3_ES6.js]
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo0_1(x) {
+    for (let x in []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function () { return x + v; });
+        (() => x + v);
+    } while (1 === 1);
+    use(v);
+}
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    }
+    use(v);
+}
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    }
+    use(v);
+}
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    } while (1 === 1);
+    use(v);
+}
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    }
+    use(v);
+}
+//===const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo0_1_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function () { return x + v; });
+        (() => x + v);
+    } while (1 === 1);
+    use(v);
+}
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        const x = 1;
+        (function () { return x + v; });
+        (() => x + v);
+    }
+    use(v);
+}
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    }
+    use(v);
+}
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    }
+    use(v);
+}
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    } while (1 === 1);
+    use(v);
+}
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+    }
+    use(v);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop3_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop3_ES6.symbols
new file mode 100644
index 00000000000..b07a724cbbe
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop3_ES6.symbols
@@ -0,0 +1,566 @@
+=== tests/cases/compiler/capturedLetConstInLoop3_ES6.ts ===
+
+///=========let
+declare function use(a: any);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>a : Symbol(a, Decl(capturedLetConstInLoop3_ES6.ts, 2, 21))
+
+function foo0(x) {
+>foo0 : Symbol(foo0, Decl(capturedLetConstInLoop3_ES6.ts, 2, 29))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 3, 14))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 4, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 5, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 4, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 4, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 5, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 4, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 5, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 5, 11))
+}
+
+function foo0_1(x) {
+>foo0_1 : Symbol(foo0_1, Decl(capturedLetConstInLoop3_ES6.ts, 11, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 13, 16))
+
+    for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 14, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 15, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 14, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 14, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 15, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 14, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 15, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 15, 11))
+}
+
+function foo1(x) {
+>foo1 : Symbol(foo1, Decl(capturedLetConstInLoop3_ES6.ts, 21, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 23, 14))
+
+    for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 24, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 24, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 24, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 25, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 24, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 24, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 25, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 24, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 25, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 25, 11))
+}
+
+function foo2(x) {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop3_ES6.ts, 31, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 33, 14))
+
+    while (1 === 1) {
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 35, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 36, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 35, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 35, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 36, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 35, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 36, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 36, 11))
+}
+
+function foo3(x) {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop3_ES6.ts, 42, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 44, 14))
+
+    do {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 46, 11))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 47, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 46, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 47, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 46, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 47, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 47, 11))
+}
+
+function foo4(x) {
+>foo4 : Symbol(foo4, Decl(capturedLetConstInLoop3_ES6.ts, 53, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 55, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 56, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 56, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 56, 12))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 57, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 56, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 58, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 58, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 57, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 58, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 57, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 57, 11))
+}
+
+function foo5(x) {
+>foo5 : Symbol(foo5, Decl(capturedLetConstInLoop3_ES6.ts, 64, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 66, 14))
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 67, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 67, 19))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 67, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 67, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 68, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 67, 12))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 67, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 67, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 68, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 67, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 67, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 68, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 68, 11))
+}
+
+
+function foo6(x) {
+>foo6 : Symbol(foo6, Decl(capturedLetConstInLoop3_ES6.ts, 74, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 77, 14))
+
+    while (1 === 1) {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 79, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 79, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 80, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 79, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 79, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 79, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 80, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 79, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 79, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 80, 11))
+    }
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 80, 11))
+}
+
+function foo7(x) {
+>foo7 : Symbol(foo7, Decl(capturedLetConstInLoop3_ES6.ts, 86, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 88, 14))
+
+    do {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 90, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 90, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 91, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 90, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 90, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 90, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 91, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 90, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 90, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 91, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 91, 11))
+}
+
+
+function foo8(x) {
+>foo8 : Symbol(foo8, Decl(capturedLetConstInLoop3_ES6.ts, 97, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 100, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 101, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 101, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 101, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 102, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 103, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 102, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 102, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 101, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 103, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 102, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 101, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 103, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 103, 11))
+}
+//===const
+function foo0_c(x) {
+>foo0_c : Symbol(foo0_c, Decl(capturedLetConstInLoop3_ES6.ts, 109, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 111, 16))
+
+    for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 112, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 113, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 112, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 112, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 113, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 112, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 113, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 113, 11))
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : Symbol(foo0_1_c, Decl(capturedLetConstInLoop3_ES6.ts, 119, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 121, 18))
+
+    for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 122, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 123, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 122, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 122, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 123, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 122, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 123, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 123, 11))
+}
+
+function foo1_c(x) {
+>foo1_c : Symbol(foo1_c, Decl(capturedLetConstInLoop3_ES6.ts, 129, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 131, 16))
+
+    for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 132, 14))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 132, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 133, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 132, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 132, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 133, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 132, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 133, 11))
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 133, 11))
+}
+
+function foo2_c(x) {
+>foo2_c : Symbol(foo2_c, Decl(capturedLetConstInLoop3_ES6.ts, 139, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 141, 16))
+
+    while (1 === 1) {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 143, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 144, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 143, 13))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 143, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 144, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 143, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 144, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 144, 11))
+}
+
+function foo3_c(x) {
+>foo3_c : Symbol(foo3_c, Decl(capturedLetConstInLoop3_ES6.ts, 150, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 152, 16))
+
+    do {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 154, 13))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 155, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 154, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 155, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 154, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 155, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 155, 11))
+}
+
+function foo4_c(x) {
+>foo4_c : Symbol(foo4_c, Decl(capturedLetConstInLoop3_ES6.ts, 161, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 163, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 164, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 164, 14))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 165, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 164, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 166, 13))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 166, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 165, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 166, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 165, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 165, 11))
+}
+
+function foo5_c(x) {
+>foo5_c : Symbol(foo5_c, Decl(capturedLetConstInLoop3_ES6.ts, 172, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 174, 16))
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 175, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 175, 21))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 175, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 176, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 175, 14))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 175, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 175, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 176, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 175, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 175, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 176, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 176, 11))
+}
+
+
+function foo6_c(x) {
+>foo6_c : Symbol(foo6_c, Decl(capturedLetConstInLoop3_ES6.ts, 182, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 185, 16))
+
+    while (1 === 1) {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 187, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 187, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 188, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 187, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 187, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 187, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 188, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 187, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 187, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 188, 11))
+    }
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 188, 11))
+}
+
+function foo7_c(x) {
+>foo7_c : Symbol(foo7_c, Decl(capturedLetConstInLoop3_ES6.ts, 194, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 196, 16))
+
+    do {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 198, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 198, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 199, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 198, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 198, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 198, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 199, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 198, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 198, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 199, 11))
+
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 199, 11))
+}
+
+
+function foo8_c(x) {
+>foo8_c : Symbol(foo8_c, Decl(capturedLetConstInLoop3_ES6.ts, 205, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 208, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 209, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 209, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 210, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 211, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 210, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 210, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 209, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 211, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop3_ES6.ts, 210, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop3_ES6.ts, 209, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 211, 11))
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop3_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop3_ES6.ts, 211, 11))
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop3_ES6.types b/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
new file mode 100644
index 00000000000..cc4b57ff9ea
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
@@ -0,0 +1,795 @@
+=== tests/cases/compiler/capturedLetConstInLoop3_ES6.ts ===
+
+///=========let
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+function foo0(x) {
+>foo0 : (x: any) => void
+>x : any
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo0_1(x) {
+>foo0_1 : (x: any) => void
+>x : any
+
+    for (let x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1(x) {
+>foo1 : (x: any) => void
+>x : any
+
+    for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2(x) {
+>foo2 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3(x) {
+>foo3 : (x: any) => void
+>x : any
+
+    do {
+        let x;
+>x : any
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4(x) {
+>foo4 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        var v = y;
+>v : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5(x) {
+>foo5 : (x: any) => void
+>x : any
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6(x) {
+>foo6 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+    }
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo7(x) {
+>foo7 : (x: any) => void
+>x : any
+
+    do {
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+
+function foo8(x) {
+>foo8 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+//===const
+function foo0_c(x) {
+>foo0_c : (x: any) => void
+>x : any
+
+    for (const x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo0_1_c(x) {
+>foo0_1_c : (x: any) => void
+>x : any
+
+    for (const x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1_c(x) {
+>foo1_c : (x: any) => void
+>x : any
+
+    for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2_c(x) {
+>foo2_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3_c(x) {
+>foo3_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1;
+>x : number
+>1 : number
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : number
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : number
+>v : any
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4_c(x) {
+>foo4_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        var v = y;
+>v : number
+>y : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5_c(x) {
+>foo5_c : (x: any) => void
+>x : any
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6_c(x) {
+>foo6_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo7_c(x) {
+>foo7_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo8_c(x) {
+>foo8_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.js b/tests/baselines/reference/capturedLetConstInLoop4.js
new file mode 100644
index 00000000000..6257d1c697e
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4.js
@@ -0,0 +1,338 @@
+//// [capturedLetConstInLoop4.ts]
+
+//======let
+export function exportedFoo() {
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+}
+
+for (let x of []) {
+    var v0 = x;
+    (function() { return x + v0});
+    (() => x);    
+}
+
+for (let x in []) {
+    var v00 = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (let x = 0; x < 1; ++x) {
+    var v1 = x;
+    (function() { return x + v1});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    var v2 = x;
+    (function() { return x + v2});
+    (() => x);
+}
+
+do {
+    let x;
+    var v3 = x;
+    (function() { return x + v3});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v4 = x;
+    (function() { return x + v4});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    var v5 = x;
+    (function() { return x + y + v5});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    var v6 = x;
+    (function() { return x + y + v6});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    var v7 = x;
+    (function() { return x + y + v7});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v8 = x;
+    (function() { return x + y + v8});
+    (() => x + y);
+}
+
+//======const
+export function exportedFoo2() {
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+}
+
+for (const x of []) {
+    var v0_c = x;
+    (function() { return x + v0_c});
+    (() => x);    
+}
+
+for (const x in []) {
+    var v00_c = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (const x = 0; x < 1;) {
+    var v1_c = x;
+    (function() { return x + v1_c});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x =1;
+    var v2_c = x;
+    (function() { return x + v2_c});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    var v3_c = x;
+    (function() { return x + v3_c});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v4_c = x;
+    (function() { return x + v4_c});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    var v5_c = x;
+    (function() { return x + y + v5_c});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    var v6_c = x;
+    (function() { return x + y + v6_c});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    var v7_c = x;
+    (function() { return x + y + v7_c});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v8_c = x;
+    (function() { return x + y + v8_c});
+    (() => x + y);
+}
+
+
+//// [capturedLetConstInLoop4.js]
+System.register([], function(exports_1) {
+    var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c;
+    //======let
+    function exportedFoo() {
+        return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+    }
+    exports_1("exportedFoo", exportedFoo);
+    //======const
+    function exportedFoo2() {
+        return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+    }
+    exports_1("exportedFoo2", exportedFoo2);
+    return {
+        setters:[],
+        execute: function() {
+            var _loop_1 = function(x) {
+                v0 = x;
+                (function () { return x + v0; });
+                (function () { return x; });
+            };
+            for (var _i = 0, _a = []; _i < _a.length; _i++) {
+                var x = _a[_i];
+                _loop_1(x);
+            }
+            var _loop_2 = function(x) {
+                v00 = x;
+                (function () { return x + v00; });
+                (function () { return x; });
+            };
+            for (var x in []) {
+                _loop_2(x);
+            }
+            var _loop_3 = function(x) {
+                v1 = x;
+                (function () { return x + v1; });
+                (function () { return x; });
+            };
+            for (var x = 0; x < 1; ++x) {
+                _loop_3(x);
+            }
+            var _loop_4 = function() {
+                var x = void 0;
+                v2 = x;
+                (function () { return x + v2; });
+                (function () { return x; });
+            };
+            while (1 === 1) {
+                _loop_4();
+            }
+            var _loop_5 = function() {
+                var x = void 0;
+                v3 = x;
+                (function () { return x + v3; });
+                (function () { return x; });
+            };
+            do {
+                _loop_5();
+            } while (1 === 1);
+            var _loop_6 = function(y) {
+                var x = 1;
+                v4 = x;
+                (function () { return x + v4; });
+                (function () { return x; });
+            };
+            for (var y = 0; y < 1; ++y) {
+                _loop_6(y);
+            }
+            var _loop_7 = function(x, y) {
+                v5 = x;
+                (function () { return x + y + v5; });
+                (function () { return x + y; });
+            };
+            for (var x = 0, y = 1; x < 1; ++x) {
+                _loop_7(x, y);
+            }
+            var _loop_8 = function() {
+                var x = void 0, y = void 0;
+                v6 = x;
+                (function () { return x + y + v6; });
+                (function () { return x + y; });
+            };
+            while (1 === 1) {
+                _loop_8();
+            }
+            var _loop_9 = function() {
+                var x = void 0, y = void 0;
+                v7 = x;
+                (function () { return x + y + v7; });
+                (function () { return x + y; });
+            };
+            do {
+                _loop_9();
+            } while (1 === 1);
+            var _loop_10 = function(y) {
+                var x = 1;
+                v8 = x;
+                (function () { return x + y + v8; });
+                (function () { return x + y; });
+            };
+            for (var y = 0; y < 1; ++y) {
+                _loop_10(y);
+            }
+            var _loop_11 = function(x) {
+                v0_c = x;
+                (function () { return x + v0_c; });
+                (function () { return x; });
+            };
+            for (var _b = 0, _c = []; _b < _c.length; _b++) {
+                var x = _c[_b];
+                _loop_11(x);
+            }
+            var _loop_12 = function(x) {
+                v00_c = x;
+                (function () { return x + v00; });
+                (function () { return x; });
+            };
+            for (var x in []) {
+                _loop_12(x);
+            }
+            var _loop_13 = function(x) {
+                v1_c = x;
+                (function () { return x + v1_c; });
+                (function () { return x; });
+            };
+            for (var x = 0; x < 1;) {
+                _loop_13(x);
+            }
+            var _loop_14 = function() {
+                var x = 1;
+                v2_c = x;
+                (function () { return x + v2_c; });
+                (function () { return x; });
+            };
+            while (1 === 1) {
+                _loop_14();
+            }
+            var _loop_15 = function() {
+                var x = 1;
+                v3_c = x;
+                (function () { return x + v3_c; });
+                (function () { return x; });
+            };
+            do {
+                _loop_15();
+            } while (1 === 1);
+            var _loop_16 = function(y) {
+                var x = 1;
+                v4_c = x;
+                (function () { return x + v4_c; });
+                (function () { return x; });
+            };
+            for (var y = 0; y < 1;) {
+                _loop_16(y);
+            }
+            var _loop_17 = function(x, y) {
+                v5_c = x;
+                (function () { return x + y + v5_c; });
+                (function () { return x + y; });
+            };
+            for (var x = 0, y = 1; x < 1;) {
+                _loop_17(x, y);
+            }
+            var _loop_18 = function() {
+                var x = 1, y = 1;
+                v6_c = x;
+                (function () { return x + y + v6_c; });
+                (function () { return x + y; });
+            };
+            while (1 === 1) {
+                _loop_18();
+            }
+            var _loop_19 = function() {
+                var x = 1, y = 1;
+                v7_c = x;
+                (function () { return x + y + v7_c; });
+                (function () { return x + y; });
+            };
+            do {
+                _loop_19();
+            } while (1 === 1);
+            var _loop_20 = function(y) {
+                var x = 1;
+                v8_c = x;
+                (function () { return x + y + v8_c; });
+                (function () { return x + y; });
+            };
+            for (var y = 0; y < 1;) {
+                _loop_20(y);
+            }
+        }
+    }
+});
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.symbols b/tests/baselines/reference/capturedLetConstInLoop4.symbols
new file mode 100644
index 00000000000..19e78bbf2b4
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4.symbols
@@ -0,0 +1,394 @@
+=== tests/cases/compiler/capturedLetConstInLoop4.ts ===
+
+//======let
+export function exportedFoo() {
+>exportedFoo : Symbol(exportedFoo, Decl(capturedLetConstInLoop4.ts, 0, 0))
+
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+>v0 : Symbol(v0, Decl(capturedLetConstInLoop4.ts, 7, 7))
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4.ts, 13, 7))
+>v1 : Symbol(v1, Decl(capturedLetConstInLoop4.ts, 19, 7))
+>v2 : Symbol(v2, Decl(capturedLetConstInLoop4.ts, 26, 7))
+>v3 : Symbol(v3, Decl(capturedLetConstInLoop4.ts, 33, 7))
+>v4 : Symbol(v4, Decl(capturedLetConstInLoop4.ts, 40, 7))
+>v5 : Symbol(v5, Decl(capturedLetConstInLoop4.ts, 46, 7))
+>v6 : Symbol(v6, Decl(capturedLetConstInLoop4.ts, 53, 7))
+>v7 : Symbol(v7, Decl(capturedLetConstInLoop4.ts, 60, 7))
+>v8 : Symbol(v8, Decl(capturedLetConstInLoop4.ts, 67, 7))
+}
+
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 6, 8))
+
+    var v0 = x;
+>v0 : Symbol(v0, Decl(capturedLetConstInLoop4.ts, 7, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 6, 8))
+
+    (function() { return x + v0});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 6, 8))
+>v0 : Symbol(v0, Decl(capturedLetConstInLoop4.ts, 7, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 6, 8))
+}
+
+for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 12, 8))
+
+    var v00 = x;
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4.ts, 13, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 12, 8))
+
+    (function() { return x + v00});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 12, 8))
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4.ts, 13, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 12, 8))
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 18, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 18, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 18, 8))
+
+    var v1 = x;
+>v1 : Symbol(v1, Decl(capturedLetConstInLoop4.ts, 19, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 18, 8))
+
+    (function() { return x + v1});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 18, 8))
+>v1 : Symbol(v1, Decl(capturedLetConstInLoop4.ts, 19, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 18, 8))
+}
+
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 25, 7))
+
+    var v2 = x;
+>v2 : Symbol(v2, Decl(capturedLetConstInLoop4.ts, 26, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 25, 7))
+
+    (function() { return x + v2});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 25, 7))
+>v2 : Symbol(v2, Decl(capturedLetConstInLoop4.ts, 26, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 25, 7))
+}
+
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 32, 7))
+
+    var v3 = x;
+>v3 : Symbol(v3, Decl(capturedLetConstInLoop4.ts, 33, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 32, 7))
+
+    (function() { return x + v3});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 32, 7))
+>v3 : Symbol(v3, Decl(capturedLetConstInLoop4.ts, 33, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 32, 7))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 38, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 38, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 38, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 39, 7))
+
+    var v4 = x;
+>v4 : Symbol(v4, Decl(capturedLetConstInLoop4.ts, 40, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 39, 7))
+
+    (function() { return x + v4});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 39, 7))
+>v4 : Symbol(v4, Decl(capturedLetConstInLoop4.ts, 40, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 39, 7))
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 45, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 45, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 45, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 45, 8))
+
+    var v5 = x;
+>v5 : Symbol(v5, Decl(capturedLetConstInLoop4.ts, 46, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 45, 8))
+
+    (function() { return x + y + v5});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 45, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 45, 15))
+>v5 : Symbol(v5, Decl(capturedLetConstInLoop4.ts, 46, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 45, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 45, 15))
+}
+
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 52, 10))
+
+    var v6 = x;
+>v6 : Symbol(v6, Decl(capturedLetConstInLoop4.ts, 53, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 52, 7))
+
+    (function() { return x + y + v6});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 52, 10))
+>v6 : Symbol(v6, Decl(capturedLetConstInLoop4.ts, 53, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 52, 10))
+}
+
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 59, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 59, 10))
+
+    var v7 = x;
+>v7 : Symbol(v7, Decl(capturedLetConstInLoop4.ts, 60, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 59, 7))
+
+    (function() { return x + y + v7});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 59, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 59, 10))
+>v7 : Symbol(v7, Decl(capturedLetConstInLoop4.ts, 60, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 59, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 59, 10))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 65, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 65, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 65, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 66, 7))
+
+    var v8 = x;
+>v8 : Symbol(v8, Decl(capturedLetConstInLoop4.ts, 67, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 66, 7))
+
+    (function() { return x + y + v8});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 66, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 65, 8))
+>v8 : Symbol(v8, Decl(capturedLetConstInLoop4.ts, 67, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 66, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 65, 8))
+}
+
+//======const
+export function exportedFoo2() {
+>exportedFoo2 : Symbol(exportedFoo2, Decl(capturedLetConstInLoop4.ts, 70, 1))
+
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+>v0_c : Symbol(v0_c, Decl(capturedLetConstInLoop4.ts, 78, 7))
+>v00_c : Symbol(v00_c, Decl(capturedLetConstInLoop4.ts, 84, 7))
+>v1_c : Symbol(v1_c, Decl(capturedLetConstInLoop4.ts, 90, 7))
+>v2_c : Symbol(v2_c, Decl(capturedLetConstInLoop4.ts, 97, 7))
+>v3_c : Symbol(v3_c, Decl(capturedLetConstInLoop4.ts, 104, 7))
+>v4_c : Symbol(v4_c, Decl(capturedLetConstInLoop4.ts, 111, 7))
+>v5_c : Symbol(v5_c, Decl(capturedLetConstInLoop4.ts, 117, 7))
+>v6_c : Symbol(v6_c, Decl(capturedLetConstInLoop4.ts, 124, 7))
+>v7_c : Symbol(v7_c, Decl(capturedLetConstInLoop4.ts, 131, 7))
+>v8_c : Symbol(v8_c, Decl(capturedLetConstInLoop4.ts, 138, 7))
+}
+
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 77, 10))
+
+    var v0_c = x;
+>v0_c : Symbol(v0_c, Decl(capturedLetConstInLoop4.ts, 78, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 77, 10))
+
+    (function() { return x + v0_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 77, 10))
+>v0_c : Symbol(v0_c, Decl(capturedLetConstInLoop4.ts, 78, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 77, 10))
+}
+
+for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 83, 10))
+
+    var v00_c = x;
+>v00_c : Symbol(v00_c, Decl(capturedLetConstInLoop4.ts, 84, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 83, 10))
+
+    (function() { return x + v00});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 83, 10))
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4.ts, 13, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 83, 10))
+}
+
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 89, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 89, 10))
+
+    var v1_c = x;
+>v1_c : Symbol(v1_c, Decl(capturedLetConstInLoop4.ts, 90, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 89, 10))
+
+    (function() { return x + v1_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 89, 10))
+>v1_c : Symbol(v1_c, Decl(capturedLetConstInLoop4.ts, 90, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 89, 10))
+}
+
+while (1 === 1) {
+    const x =1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 96, 9))
+
+    var v2_c = x;
+>v2_c : Symbol(v2_c, Decl(capturedLetConstInLoop4.ts, 97, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 96, 9))
+
+    (function() { return x + v2_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 96, 9))
+>v2_c : Symbol(v2_c, Decl(capturedLetConstInLoop4.ts, 97, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 96, 9))
+}
+
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 103, 9))
+
+    var v3_c = x;
+>v3_c : Symbol(v3_c, Decl(capturedLetConstInLoop4.ts, 104, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 103, 9))
+
+    (function() { return x + v3_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 103, 9))
+>v3_c : Symbol(v3_c, Decl(capturedLetConstInLoop4.ts, 104, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 103, 9))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 109, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 109, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 110, 9))
+
+    var v4_c = x;
+>v4_c : Symbol(v4_c, Decl(capturedLetConstInLoop4.ts, 111, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 110, 9))
+
+    (function() { return x + v4_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 110, 9))
+>v4_c : Symbol(v4_c, Decl(capturedLetConstInLoop4.ts, 111, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 110, 9))
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 116, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 116, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 116, 10))
+
+    var v5_c = x;
+>v5_c : Symbol(v5_c, Decl(capturedLetConstInLoop4.ts, 117, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 116, 10))
+
+    (function() { return x + y + v5_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 116, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 116, 17))
+>v5_c : Symbol(v5_c, Decl(capturedLetConstInLoop4.ts, 117, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 116, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 116, 17))
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 123, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 123, 16))
+
+    var v6_c = x;
+>v6_c : Symbol(v6_c, Decl(capturedLetConstInLoop4.ts, 124, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 123, 9))
+
+    (function() { return x + y + v6_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 123, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 123, 16))
+>v6_c : Symbol(v6_c, Decl(capturedLetConstInLoop4.ts, 124, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 123, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 123, 16))
+}
+
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 130, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 130, 16))
+
+    var v7_c = x;
+>v7_c : Symbol(v7_c, Decl(capturedLetConstInLoop4.ts, 131, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 130, 9))
+
+    (function() { return x + y + v7_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 130, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 130, 16))
+>v7_c : Symbol(v7_c, Decl(capturedLetConstInLoop4.ts, 131, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 130, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 130, 16))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 136, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 136, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 137, 9))
+
+    var v8_c = x;
+>v8_c : Symbol(v8_c, Decl(capturedLetConstInLoop4.ts, 138, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 137, 9))
+
+    (function() { return x + y + v8_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 137, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 136, 10))
+>v8_c : Symbol(v8_c, Decl(capturedLetConstInLoop4.ts, 138, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4.ts, 137, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4.ts, 136, 10))
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.types b/tests/baselines/reference/capturedLetConstInLoop4.types
new file mode 100644
index 00000000000..f19e5d109b8
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4.types
@@ -0,0 +1,600 @@
+=== tests/cases/compiler/capturedLetConstInLoop4.ts ===
+
+//======let
+export function exportedFoo() {
+>exportedFoo : () => any
+
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8 : any
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 : any
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 : any
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 : any
+>v0 + v00 + v1 + v2 + v3 + v4 : any
+>v0 + v00 + v1 + v2 + v3 : any
+>v0 + v00 + v1 + v2 : any
+>v0 + v00 + v1 : any
+>v0 + v00 : any
+>v0 : any
+>v00 : any
+>v1 : number
+>v2 : any
+>v3 : any
+>v4 : number
+>v5 : number
+>v6 : any
+>v7 : any
+>v8 : number
+}
+
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    var v0 = x;
+>v0 : any
+>x : any
+
+    (function() { return x + v0});
+>(function() { return x + v0}) : () => any
+>function() { return x + v0} : () => any
+>x + v0 : any
+>x : any
+>v0 : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    var v00 = x;
+>v00 : any
+>x : any
+
+    (function() { return x + v00});
+>(function() { return x + v00}) : () => any
+>function() { return x + v00} : () => any
+>x + v00 : any
+>x : any
+>v00 : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    var v1 = x;
+>v1 : number
+>x : number
+
+    (function() { return x + v1});
+>(function() { return x + v1}) : () => number
+>function() { return x + v1} : () => number
+>x + v1 : number
+>x : number
+>v1 : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    var v2 = x;
+>v2 : any
+>x : any
+
+    (function() { return x + v2});
+>(function() { return x + v2}) : () => any
+>function() { return x + v2} : () => any
+>x + v2 : any
+>x : any
+>v2 : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+do {
+    let x;
+>x : any
+
+    var v3 = x;
+>v3 : any
+>x : any
+
+    (function() { return x + v3});
+>(function() { return x + v3}) : () => any
+>function() { return x + v3} : () => any
+>x + v3 : any
+>x : any
+>v3 : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    var v4 = x;
+>v4 : number
+>x : number
+
+    (function() { return x + v4});
+>(function() { return x + v4}) : () => number
+>function() { return x + v4} : () => number
+>x + v4 : number
+>x : number
+>v4 : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    var v5 = x;
+>v5 : number
+>x : number
+
+    (function() { return x + y + v5});
+>(function() { return x + y + v5}) : () => number
+>function() { return x + y + v5} : () => number
+>x + y + v5 : number
+>x + y : number
+>x : number
+>y : number
+>v5 : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    var v6 = x;
+>v6 : any
+>x : any
+
+    (function() { return x + y + v6});
+>(function() { return x + y + v6}) : () => any
+>function() { return x + y + v6} : () => any
+>x + y + v6 : any
+>x + y : any
+>x : any
+>y : any
+>v6 : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+}
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    var v7 = x;
+>v7 : any
+>x : any
+
+    (function() { return x + y + v7});
+>(function() { return x + y + v7}) : () => any
+>function() { return x + y + v7} : () => any
+>x + y + v7 : any
+>x + y : any
+>x : any
+>y : any
+>v7 : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    var v8 = x;
+>v8 : number
+>x : number
+
+    (function() { return x + y + v8});
+>(function() { return x + y + v8}) : () => number
+>function() { return x + y + v8} : () => number
+>x + y + v8 : number
+>x + y : number
+>x : number
+>y : number
+>v8 : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+//======const
+export function exportedFoo2() {
+>exportedFoo2 : () => any
+
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c : any
+>v0_c + v00_c + v1_c + v2_c : any
+>v0_c + v00_c + v1_c : any
+>v0_c + v00_c : any
+>v0_c : any
+>v00_c : any
+>v1_c : number
+>v2_c : number
+>v3_c : number
+>v4_c : number
+>v5_c : number
+>v6_c : number
+>v7_c : number
+>v8_c : number
+}
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    var v0_c = x;
+>v0_c : any
+>x : any
+
+    (function() { return x + v0_c});
+>(function() { return x + v0_c}) : () => any
+>function() { return x + v0_c} : () => any
+>x + v0_c : any
+>x : any
+>v0_c : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    var v00_c = x;
+>v00_c : any
+>x : any
+
+    (function() { return x + v00});
+>(function() { return x + v00}) : () => any
+>function() { return x + v00} : () => any
+>x + v00 : any
+>x : any
+>v00 : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    var v1_c = x;
+>v1_c : number
+>x : number
+
+    (function() { return x + v1_c});
+>(function() { return x + v1_c}) : () => number
+>function() { return x + v1_c} : () => number
+>x + v1_c : number
+>x : number
+>v1_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x =1;
+>x : number
+>1 : number
+
+    var v2_c = x;
+>v2_c : number
+>x : number
+
+    (function() { return x + v2_c});
+>(function() { return x + v2_c}) : () => number
+>function() { return x + v2_c} : () => number
+>x + v2_c : number
+>x : number
+>v2_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    var v3_c = x;
+>v3_c : number
+>x : number
+
+    (function() { return x + v3_c});
+>(function() { return x + v3_c}) : () => number
+>function() { return x + v3_c} : () => number
+>x + v3_c : number
+>x : number
+>v3_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    var v4_c = x;
+>v4_c : number
+>x : number
+
+    (function() { return x + v4_c});
+>(function() { return x + v4_c}) : () => number
+>function() { return x + v4_c} : () => number
+>x + v4_c : number
+>x : number
+>v4_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    var v5_c = x;
+>v5_c : number
+>x : number
+
+    (function() { return x + y + v5_c});
+>(function() { return x + y + v5_c}) : () => number
+>function() { return x + y + v5_c} : () => number
+>x + y + v5_c : number
+>x + y : number
+>x : number
+>y : number
+>v5_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    var v6_c = x;
+>v6_c : number
+>x : number
+
+    (function() { return x + y + v6_c});
+>(function() { return x + y + v6_c}) : () => number
+>function() { return x + y + v6_c} : () => number
+>x + y + v6_c : number
+>x + y : number
+>x : number
+>y : number
+>v6_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    var v7_c = x;
+>v7_c : number
+>x : number
+
+    (function() { return x + y + v7_c});
+>(function() { return x + y + v7_c}) : () => number
+>function() { return x + y + v7_c} : () => number
+>x + y + v7_c : number
+>x + y : number
+>x : number
+>y : number
+>v7_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    var v8_c = x;
+>v8_c : number
+>x : number
+
+    (function() { return x + y + v8_c});
+>(function() { return x + y + v8_c}) : () => number
+>function() { return x + y + v8_c} : () => number
+>x + y + v8_c : number
+>x + y : number
+>x : number
+>y : number
+>v8_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop4_ES6.js b/tests/baselines/reference/capturedLetConstInLoop4_ES6.js
new file mode 100644
index 00000000000..83b0af1f23c
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4_ES6.js
@@ -0,0 +1,266 @@
+//// [capturedLetConstInLoop4_ES6.ts]
+
+//======let
+export function exportedFoo() {
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+}
+
+for (let x of []) {
+    var v0 = x;
+    (function() { return x + v0});
+    (() => x);    
+}
+
+for (let x in []) {
+    var v00 = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (let x = 0; x < 1; ++x) {
+    var v1 = x;
+    (function() { return x + v1});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    var v2 = x;
+    (function() { return x + v2});
+    (() => x);
+}
+
+do {
+    let x;
+    var v3 = x;
+    (function() { return x + v3});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v4 = x;
+    (function() { return x + v4});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    var v5 = x;
+    (function() { return x + y + v5});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    var v6 = x;
+    (function() { return x + y + v6});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    var v7 = x;
+    (function() { return x + y + v7});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v8 = x;
+    (function() { return x + y + v8});
+    (() => x + y);
+}
+
+//======const
+export function exportedFoo2() {
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+}
+
+for (const x of []) {
+    var v0_c = x;
+    (function() { return x + v0_c});
+    (() => x);    
+}
+
+for (const x in []) {
+    var v00_c = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (const x = 0; x < 1;) {
+    var v1_c = x;
+    (function() { return x + v1_c});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x =1;
+    var v2_c = x;
+    (function() { return x + v2_c});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    var v3_c = x;
+    (function() { return x + v3_c});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v4_c = x;
+    (function() { return x + v4_c});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    var v5_c = x;
+    (function() { return x + y + v5_c});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    var v6_c = x;
+    (function() { return x + y + v6_c});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    var v7_c = x;
+    (function() { return x + y + v7_c});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v8_c = x;
+    (function() { return x + y + v8_c});
+    (() => x + y);
+}
+
+
+//// [capturedLetConstInLoop4_ES6.js]
+//======let
+export function exportedFoo() {
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+}
+for (let x of []) {
+    var v0 = x;
+    (function () { return x + v0; });
+    (() => x);
+}
+for (let x in []) {
+    var v00 = x;
+    (function () { return x + v00; });
+    (() => x);
+}
+for (let x = 0; x < 1; ++x) {
+    var v1 = x;
+    (function () { return x + v1; });
+    (() => x);
+}
+while (1 === 1) {
+    let x;
+    var v2 = x;
+    (function () { return x + v2; });
+    (() => x);
+}
+do {
+    let x;
+    var v3 = x;
+    (function () { return x + v3; });
+    (() => x);
+} while (1 === 1);
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v4 = x;
+    (function () { return x + v4; });
+    (() => x);
+}
+for (let x = 0, y = 1; x < 1; ++x) {
+    var v5 = x;
+    (function () { return x + y + v5; });
+    (() => x + y);
+}
+while (1 === 1) {
+    let x, y;
+    var v6 = x;
+    (function () { return x + y + v6; });
+    (() => x + y);
+}
+do {
+    let x, y;
+    var v7 = x;
+    (function () { return x + y + v7; });
+    (() => x + y);
+} while (1 === 1);
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v8 = x;
+    (function () { return x + y + v8; });
+    (() => x + y);
+}
+//======const
+export function exportedFoo2() {
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+}
+for (const x of []) {
+    var v0_c = x;
+    (function () { return x + v0_c; });
+    (() => x);
+}
+for (const x in []) {
+    var v00_c = x;
+    (function () { return x + v00; });
+    (() => x);
+}
+for (const x = 0; x < 1;) {
+    var v1_c = x;
+    (function () { return x + v1_c; });
+    (() => x);
+}
+while (1 === 1) {
+    const x = 1;
+    var v2_c = x;
+    (function () { return x + v2_c; });
+    (() => x);
+}
+do {
+    const x = 1;
+    var v3_c = x;
+    (function () { return x + v3_c; });
+    (() => x);
+} while (1 === 1);
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v4_c = x;
+    (function () { return x + v4_c; });
+    (() => x);
+}
+for (const x = 0, y = 1; x < 1;) {
+    var v5_c = x;
+    (function () { return x + y + v5_c; });
+    (() => x + y);
+}
+while (1 === 1) {
+    const x = 1, y = 1;
+    var v6_c = x;
+    (function () { return x + y + v6_c; });
+    (() => x + y);
+}
+do {
+    const x = 1, y = 1;
+    var v7_c = x;
+    (function () { return x + y + v7_c; });
+    (() => x + y);
+} while (1 === 1);
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v8_c = x;
+    (function () { return x + y + v8_c; });
+    (() => x + y);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop4_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop4_ES6.symbols
new file mode 100644
index 00000000000..cc5a2ad54bc
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4_ES6.symbols
@@ -0,0 +1,394 @@
+=== tests/cases/compiler/capturedLetConstInLoop4_ES6.ts ===
+
+//======let
+export function exportedFoo() {
+>exportedFoo : Symbol(exportedFoo, Decl(capturedLetConstInLoop4_ES6.ts, 0, 0))
+
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+>v0 : Symbol(v0, Decl(capturedLetConstInLoop4_ES6.ts, 7, 7))
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4_ES6.ts, 13, 7))
+>v1 : Symbol(v1, Decl(capturedLetConstInLoop4_ES6.ts, 19, 7))
+>v2 : Symbol(v2, Decl(capturedLetConstInLoop4_ES6.ts, 26, 7))
+>v3 : Symbol(v3, Decl(capturedLetConstInLoop4_ES6.ts, 33, 7))
+>v4 : Symbol(v4, Decl(capturedLetConstInLoop4_ES6.ts, 40, 7))
+>v5 : Symbol(v5, Decl(capturedLetConstInLoop4_ES6.ts, 46, 7))
+>v6 : Symbol(v6, Decl(capturedLetConstInLoop4_ES6.ts, 53, 7))
+>v7 : Symbol(v7, Decl(capturedLetConstInLoop4_ES6.ts, 60, 7))
+>v8 : Symbol(v8, Decl(capturedLetConstInLoop4_ES6.ts, 67, 7))
+}
+
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 6, 8))
+
+    var v0 = x;
+>v0 : Symbol(v0, Decl(capturedLetConstInLoop4_ES6.ts, 7, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 6, 8))
+
+    (function() { return x + v0});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 6, 8))
+>v0 : Symbol(v0, Decl(capturedLetConstInLoop4_ES6.ts, 7, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 6, 8))
+}
+
+for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 12, 8))
+
+    var v00 = x;
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4_ES6.ts, 13, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 12, 8))
+
+    (function() { return x + v00});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 12, 8))
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4_ES6.ts, 13, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 12, 8))
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 18, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 18, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 18, 8))
+
+    var v1 = x;
+>v1 : Symbol(v1, Decl(capturedLetConstInLoop4_ES6.ts, 19, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 18, 8))
+
+    (function() { return x + v1});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 18, 8))
+>v1 : Symbol(v1, Decl(capturedLetConstInLoop4_ES6.ts, 19, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 18, 8))
+}
+
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 25, 7))
+
+    var v2 = x;
+>v2 : Symbol(v2, Decl(capturedLetConstInLoop4_ES6.ts, 26, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 25, 7))
+
+    (function() { return x + v2});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 25, 7))
+>v2 : Symbol(v2, Decl(capturedLetConstInLoop4_ES6.ts, 26, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 25, 7))
+}
+
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 32, 7))
+
+    var v3 = x;
+>v3 : Symbol(v3, Decl(capturedLetConstInLoop4_ES6.ts, 33, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 32, 7))
+
+    (function() { return x + v3});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 32, 7))
+>v3 : Symbol(v3, Decl(capturedLetConstInLoop4_ES6.ts, 33, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 32, 7))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 38, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 38, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 38, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 39, 7))
+
+    var v4 = x;
+>v4 : Symbol(v4, Decl(capturedLetConstInLoop4_ES6.ts, 40, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 39, 7))
+
+    (function() { return x + v4});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 39, 7))
+>v4 : Symbol(v4, Decl(capturedLetConstInLoop4_ES6.ts, 40, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 39, 7))
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 45, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 45, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 45, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 45, 8))
+
+    var v5 = x;
+>v5 : Symbol(v5, Decl(capturedLetConstInLoop4_ES6.ts, 46, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 45, 8))
+
+    (function() { return x + y + v5});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 45, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 45, 15))
+>v5 : Symbol(v5, Decl(capturedLetConstInLoop4_ES6.ts, 46, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 45, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 45, 15))
+}
+
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 52, 10))
+
+    var v6 = x;
+>v6 : Symbol(v6, Decl(capturedLetConstInLoop4_ES6.ts, 53, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 52, 7))
+
+    (function() { return x + y + v6});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 52, 10))
+>v6 : Symbol(v6, Decl(capturedLetConstInLoop4_ES6.ts, 53, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 52, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 52, 10))
+}
+
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 59, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 59, 10))
+
+    var v7 = x;
+>v7 : Symbol(v7, Decl(capturedLetConstInLoop4_ES6.ts, 60, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 59, 7))
+
+    (function() { return x + y + v7});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 59, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 59, 10))
+>v7 : Symbol(v7, Decl(capturedLetConstInLoop4_ES6.ts, 60, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 59, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 59, 10))
+
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 65, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 65, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 65, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 66, 7))
+
+    var v8 = x;
+>v8 : Symbol(v8, Decl(capturedLetConstInLoop4_ES6.ts, 67, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 66, 7))
+
+    (function() { return x + y + v8});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 66, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 65, 8))
+>v8 : Symbol(v8, Decl(capturedLetConstInLoop4_ES6.ts, 67, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 66, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 65, 8))
+}
+
+//======const
+export function exportedFoo2() {
+>exportedFoo2 : Symbol(exportedFoo2, Decl(capturedLetConstInLoop4_ES6.ts, 70, 1))
+
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+>v0_c : Symbol(v0_c, Decl(capturedLetConstInLoop4_ES6.ts, 78, 7))
+>v00_c : Symbol(v00_c, Decl(capturedLetConstInLoop4_ES6.ts, 84, 7))
+>v1_c : Symbol(v1_c, Decl(capturedLetConstInLoop4_ES6.ts, 90, 7))
+>v2_c : Symbol(v2_c, Decl(capturedLetConstInLoop4_ES6.ts, 97, 7))
+>v3_c : Symbol(v3_c, Decl(capturedLetConstInLoop4_ES6.ts, 104, 7))
+>v4_c : Symbol(v4_c, Decl(capturedLetConstInLoop4_ES6.ts, 111, 7))
+>v5_c : Symbol(v5_c, Decl(capturedLetConstInLoop4_ES6.ts, 117, 7))
+>v6_c : Symbol(v6_c, Decl(capturedLetConstInLoop4_ES6.ts, 124, 7))
+>v7_c : Symbol(v7_c, Decl(capturedLetConstInLoop4_ES6.ts, 131, 7))
+>v8_c : Symbol(v8_c, Decl(capturedLetConstInLoop4_ES6.ts, 138, 7))
+}
+
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 77, 10))
+
+    var v0_c = x;
+>v0_c : Symbol(v0_c, Decl(capturedLetConstInLoop4_ES6.ts, 78, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 77, 10))
+
+    (function() { return x + v0_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 77, 10))
+>v0_c : Symbol(v0_c, Decl(capturedLetConstInLoop4_ES6.ts, 78, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 77, 10))
+}
+
+for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 83, 10))
+
+    var v00_c = x;
+>v00_c : Symbol(v00_c, Decl(capturedLetConstInLoop4_ES6.ts, 84, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 83, 10))
+
+    (function() { return x + v00});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 83, 10))
+>v00 : Symbol(v00, Decl(capturedLetConstInLoop4_ES6.ts, 13, 7))
+
+    (() => x);    
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 83, 10))
+}
+
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 89, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 89, 10))
+
+    var v1_c = x;
+>v1_c : Symbol(v1_c, Decl(capturedLetConstInLoop4_ES6.ts, 90, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 89, 10))
+
+    (function() { return x + v1_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 89, 10))
+>v1_c : Symbol(v1_c, Decl(capturedLetConstInLoop4_ES6.ts, 90, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 89, 10))
+}
+
+while (1 === 1) {
+    const x =1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 96, 9))
+
+    var v2_c = x;
+>v2_c : Symbol(v2_c, Decl(capturedLetConstInLoop4_ES6.ts, 97, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 96, 9))
+
+    (function() { return x + v2_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 96, 9))
+>v2_c : Symbol(v2_c, Decl(capturedLetConstInLoop4_ES6.ts, 97, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 96, 9))
+}
+
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 103, 9))
+
+    var v3_c = x;
+>v3_c : Symbol(v3_c, Decl(capturedLetConstInLoop4_ES6.ts, 104, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 103, 9))
+
+    (function() { return x + v3_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 103, 9))
+>v3_c : Symbol(v3_c, Decl(capturedLetConstInLoop4_ES6.ts, 104, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 103, 9))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 109, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 109, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 110, 9))
+
+    var v4_c = x;
+>v4_c : Symbol(v4_c, Decl(capturedLetConstInLoop4_ES6.ts, 111, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 110, 9))
+
+    (function() { return x + v4_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 110, 9))
+>v4_c : Symbol(v4_c, Decl(capturedLetConstInLoop4_ES6.ts, 111, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 110, 9))
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 116, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 116, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 116, 10))
+
+    var v5_c = x;
+>v5_c : Symbol(v5_c, Decl(capturedLetConstInLoop4_ES6.ts, 117, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 116, 10))
+
+    (function() { return x + y + v5_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 116, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 116, 17))
+>v5_c : Symbol(v5_c, Decl(capturedLetConstInLoop4_ES6.ts, 117, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 116, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 116, 17))
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 123, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 123, 16))
+
+    var v6_c = x;
+>v6_c : Symbol(v6_c, Decl(capturedLetConstInLoop4_ES6.ts, 124, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 123, 9))
+
+    (function() { return x + y + v6_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 123, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 123, 16))
+>v6_c : Symbol(v6_c, Decl(capturedLetConstInLoop4_ES6.ts, 124, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 123, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 123, 16))
+}
+
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 130, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 130, 16))
+
+    var v7_c = x;
+>v7_c : Symbol(v7_c, Decl(capturedLetConstInLoop4_ES6.ts, 131, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 130, 9))
+
+    (function() { return x + y + v7_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 130, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 130, 16))
+>v7_c : Symbol(v7_c, Decl(capturedLetConstInLoop4_ES6.ts, 131, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 130, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 130, 16))
+
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 136, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 136, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 137, 9))
+
+    var v8_c = x;
+>v8_c : Symbol(v8_c, Decl(capturedLetConstInLoop4_ES6.ts, 138, 7))
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 137, 9))
+
+    (function() { return x + y + v8_c});
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 137, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 136, 10))
+>v8_c : Symbol(v8_c, Decl(capturedLetConstInLoop4_ES6.ts, 138, 7))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop4_ES6.ts, 137, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop4_ES6.ts, 136, 10))
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop4_ES6.types b/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
new file mode 100644
index 00000000000..fd5f6dadf62
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
@@ -0,0 +1,600 @@
+=== tests/cases/compiler/capturedLetConstInLoop4_ES6.ts ===
+
+//======let
+export function exportedFoo() {
+>exportedFoo : () => any
+
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8 : any
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 : any
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 : any
+>v0 + v00 + v1 + v2 + v3 + v4 + v5 : any
+>v0 + v00 + v1 + v2 + v3 + v4 : any
+>v0 + v00 + v1 + v2 + v3 : any
+>v0 + v00 + v1 + v2 : any
+>v0 + v00 + v1 : any
+>v0 + v00 : any
+>v0 : any
+>v00 : any
+>v1 : number
+>v2 : any
+>v3 : any
+>v4 : number
+>v5 : number
+>v6 : any
+>v7 : any
+>v8 : number
+}
+
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    var v0 = x;
+>v0 : any
+>x : any
+
+    (function() { return x + v0});
+>(function() { return x + v0}) : () => any
+>function() { return x + v0} : () => any
+>x + v0 : any
+>x : any
+>v0 : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    var v00 = x;
+>v00 : any
+>x : any
+
+    (function() { return x + v00});
+>(function() { return x + v00}) : () => any
+>function() { return x + v00} : () => any
+>x + v00 : any
+>x : any
+>v00 : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    var v1 = x;
+>v1 : number
+>x : number
+
+    (function() { return x + v1});
+>(function() { return x + v1}) : () => number
+>function() { return x + v1} : () => number
+>x + v1 : number
+>x : number
+>v1 : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    var v2 = x;
+>v2 : any
+>x : any
+
+    (function() { return x + v2});
+>(function() { return x + v2}) : () => any
+>function() { return x + v2} : () => any
+>x + v2 : any
+>x : any
+>v2 : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+do {
+    let x;
+>x : any
+
+    var v3 = x;
+>v3 : any
+>x : any
+
+    (function() { return x + v3});
+>(function() { return x + v3}) : () => any
+>function() { return x + v3} : () => any
+>x + v3 : any
+>x : any
+>v3 : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    var v4 = x;
+>v4 : number
+>x : number
+
+    (function() { return x + v4});
+>(function() { return x + v4}) : () => number
+>function() { return x + v4} : () => number
+>x + v4 : number
+>x : number
+>v4 : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    var v5 = x;
+>v5 : number
+>x : number
+
+    (function() { return x + y + v5});
+>(function() { return x + y + v5}) : () => number
+>function() { return x + y + v5} : () => number
+>x + y + v5 : number
+>x + y : number
+>x : number
+>y : number
+>v5 : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    var v6 = x;
+>v6 : any
+>x : any
+
+    (function() { return x + y + v6});
+>(function() { return x + y + v6}) : () => any
+>function() { return x + y + v6} : () => any
+>x + y + v6 : any
+>x + y : any
+>x : any
+>y : any
+>v6 : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+}
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    var v7 = x;
+>v7 : any
+>x : any
+
+    (function() { return x + y + v7});
+>(function() { return x + y + v7}) : () => any
+>function() { return x + y + v7} : () => any
+>x + y + v7 : any
+>x + y : any
+>x : any
+>y : any
+>v7 : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    var v8 = x;
+>v8 : number
+>x : number
+
+    (function() { return x + y + v8});
+>(function() { return x + y + v8}) : () => number
+>function() { return x + y + v8} : () => number
+>x + y + v8 : number
+>x + y : number
+>x : number
+>y : number
+>v8 : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+//======const
+export function exportedFoo2() {
+>exportedFoo2 : () => any
+
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c + v4_c : any
+>v0_c + v00_c + v1_c + v2_c + v3_c : any
+>v0_c + v00_c + v1_c + v2_c : any
+>v0_c + v00_c + v1_c : any
+>v0_c + v00_c : any
+>v0_c : any
+>v00_c : any
+>v1_c : number
+>v2_c : number
+>v3_c : number
+>v4_c : number
+>v5_c : number
+>v6_c : number
+>v7_c : number
+>v8_c : number
+}
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    var v0_c = x;
+>v0_c : any
+>x : any
+
+    (function() { return x + v0_c});
+>(function() { return x + v0_c}) : () => any
+>function() { return x + v0_c} : () => any
+>x + v0_c : any
+>x : any
+>v0_c : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    var v00_c = x;
+>v00_c : any
+>x : any
+
+    (function() { return x + v00});
+>(function() { return x + v00}) : () => any
+>function() { return x + v00} : () => any
+>x + v00 : any
+>x : any
+>v00 : any
+
+    (() => x);    
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+}
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    var v1_c = x;
+>v1_c : number
+>x : number
+
+    (function() { return x + v1_c});
+>(function() { return x + v1_c}) : () => number
+>function() { return x + v1_c} : () => number
+>x + v1_c : number
+>x : number
+>v1_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x =1;
+>x : number
+>1 : number
+
+    var v2_c = x;
+>v2_c : number
+>x : number
+
+    (function() { return x + v2_c});
+>(function() { return x + v2_c}) : () => number
+>function() { return x + v2_c} : () => number
+>x + v2_c : number
+>x : number
+>v2_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    var v3_c = x;
+>v3_c : number
+>x : number
+
+    (function() { return x + v3_c});
+>(function() { return x + v3_c}) : () => number
+>function() { return x + v3_c} : () => number
+>x + v3_c : number
+>x : number
+>v3_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    var v4_c = x;
+>v4_c : number
+>x : number
+
+    (function() { return x + v4_c});
+>(function() { return x + v4_c}) : () => number
+>function() { return x + v4_c} : () => number
+>x + v4_c : number
+>x : number
+>v4_c : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    var v5_c = x;
+>v5_c : number
+>x : number
+
+    (function() { return x + y + v5_c});
+>(function() { return x + y + v5_c}) : () => number
+>function() { return x + y + v5_c} : () => number
+>x + y + v5_c : number
+>x + y : number
+>x : number
+>y : number
+>v5_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    var v6_c = x;
+>v6_c : number
+>x : number
+
+    (function() { return x + y + v6_c});
+>(function() { return x + y + v6_c}) : () => number
+>function() { return x + y + v6_c} : () => number
+>x + y + v6_c : number
+>x + y : number
+>x : number
+>y : number
+>v6_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    var v7_c = x;
+>v7_c : number
+>x : number
+
+    (function() { return x + y + v7_c});
+>(function() { return x + y + v7_c}) : () => number
+>function() { return x + y + v7_c} : () => number
+>x + y + v7_c : number
+>x + y : number
+>x : number
+>y : number
+>v7_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    var v8_c = x;
+>v8_c : number
+>x : number
+
+    (function() { return x + y + v8_c});
+>(function() { return x + y + v8_c}) : () => number
+>function() { return x + y + v8_c} : () => number
+>x + y + v8_c : number
+>x + y : number
+>x : number
+>y : number
+>v8_c : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop5.js b/tests/baselines/reference/capturedLetConstInLoop5.js
new file mode 100644
index 00000000000..d7d177a19b9
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop5.js
@@ -0,0 +1,617 @@
+//// [capturedLetConstInLoop5.ts]
+declare function use(a: any);
+
+//====let
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    };
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+//====const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+//// [capturedLetConstInLoop5.js]
+//====let
+function foo0(x) {
+    var _loop_1 = function(x_1) {
+        v = x_1;
+        (function () { return x_1 + v; });
+        (function () { return x_1 + v; });
+        if (x_1 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x_1 = _a[_i];
+        var state_1 = _loop_1(x_1);
+        if (typeof state_1 === "object") return state_1.value
+    }
+    use(v);
+}
+function foo00(x) {
+    var _loop_2 = function(x_2) {
+        v = x_2;
+        (function () { return x_2 + v; });
+        (function () { return x_2 + v; });
+        if (x_2 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var x_2 in []) {
+        var state_2 = _loop_2(x_2);
+        if (typeof state_2 === "object") return state_2.value
+    }
+    use(v);
+}
+function foo1(x) {
+    var _loop_3 = function(x_3) {
+        v = x_3;
+        (function () { return x_3 + v; });
+        (function () { return x_3 + v; });
+        if (x_3 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var x_3 = 0; x_3 < 1; ++x_3) {
+        var state_3 = _loop_3(x_3);
+        if (typeof state_3 === "object") return state_3.value
+    }
+    use(v);
+}
+function foo2(x) {
+    var _loop_4 = function() {
+        var x_4 = 1;
+        v = x_4;
+        (function () { return x_4 + v; });
+        (function () { return x_4 + v; });
+        if (x_4 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    while (1 === 1) {
+        var state_4 = _loop_4();
+        if (typeof state_4 === "object") return state_4.value
+    }
+    use(v);
+}
+function foo3(x) {
+    var _loop_5 = function() {
+        var x_5 = void 0;
+        (function () { return x_5 + v; });
+        (function () { return x_5 + v; });
+        if (x_5 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    do {
+        var state_5 = _loop_5();
+        if (typeof state_5 === "object") return state_5.value
+    } while (1 === 1);
+    use(v);
+}
+function foo4(x) {
+    var _loop_6 = function(y) {
+        v = y;
+        var x_6 = 1;
+        (function () { return x_6 + v; });
+        (function () { return x_6 + v; });
+        if (x_6 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var y = 0; y < 1; ++y) {
+        var state_6 = _loop_6(y);
+        if (typeof state_6 === "object") return state_6.value
+    }
+    use(v);
+}
+function foo5(x) {
+    var _loop_7 = function(x_7, y) {
+        v = x_7;
+        (function () { return x_7 + y + v; });
+        (function () { return x_7 + y + v; });
+        if (x_7 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) {
+        var state_7 = _loop_7(x_7, y);
+        if (typeof state_7 === "object") return state_7.value
+    }
+    use(v);
+}
+function foo6(x) {
+    var _loop_8 = function() {
+        var x_8 = void 0, y = void 0;
+        v = x_8;
+        (function () { return x_8 + y + v; });
+        (function () { return x_8 + y + v; });
+        if (x_8 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    while (1 === 1) {
+        var state_8 = _loop_8();
+        if (typeof state_8 === "object") return state_8.value
+    }
+    ;
+    use(v);
+}
+function foo7(x) {
+    var _loop_9 = function() {
+        var x_9 = void 0, y = void 0;
+        v = x_9;
+        (function () { return x_9 + y + v; });
+        (function () { return x_9 + y + v; });
+        if (x_9 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    do {
+        var state_9 = _loop_9();
+        if (typeof state_9 === "object") return state_9.value
+    } while (1 === 1);
+    use(v);
+}
+function foo8(x) {
+    var _loop_10 = function(y) {
+        var x_10 = 1;
+        v = x_10;
+        (function () { return x_10 + y + v; });
+        (function () { return x_10 + y + v; });
+        if (x_10 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var y = 0; y < 1; ++y) {
+        var state_10 = _loop_10(y);
+        if (typeof state_10 === "object") return state_10.value
+    }
+    use(v);
+}
+//====const
+function foo0_c(x) {
+    var _loop_11 = function(x_11) {
+        v = x_11;
+        (function () { return x_11 + v; });
+        (function () { return x_11 + v; });
+        if (x_11 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x_11 = _a[_i];
+        var state_11 = _loop_11(x_11);
+        if (typeof state_11 === "object") return state_11.value
+    }
+    use(v);
+}
+function foo00_c(x) {
+    var _loop_12 = function(x_12) {
+        v = x_12;
+        (function () { return x_12 + v; });
+        (function () { return x_12 + v; });
+        if (x_12 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var x_12 in []) {
+        var state_12 = _loop_12(x_12);
+        if (typeof state_12 === "object") return state_12.value
+    }
+    use(v);
+}
+function foo1_c(x) {
+    var _loop_13 = function(x_13) {
+        v = x_13;
+        (function () { return x_13 + v; });
+        (function () { return x_13 + v; });
+        if (x_13 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var x_13 = 0; x_13 < 1;) {
+        var state_13 = _loop_13(x_13);
+        if (typeof state_13 === "object") return state_13.value
+    }
+    use(v);
+}
+function foo2_c(x) {
+    var _loop_14 = function() {
+        var x_14 = 1;
+        v = x_14;
+        (function () { return x_14 + v; });
+        (function () { return x_14 + v; });
+        if (x_14 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    while (1 === 1) {
+        var state_14 = _loop_14();
+        if (typeof state_14 === "object") return state_14.value
+    }
+    use(v);
+}
+function foo3_c(x) {
+    var _loop_15 = function() {
+        var x_15 = 1;
+        (function () { return x_15 + v; });
+        (function () { return x_15 + v; });
+        if (x_15 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    do {
+        var state_15 = _loop_15();
+        if (typeof state_15 === "object") return state_15.value
+    } while (1 === 1);
+    use(v);
+}
+function foo4_c(x) {
+    var _loop_16 = function(y) {
+        v = y;
+        var x_16 = 1;
+        (function () { return x_16 + v; });
+        (function () { return x_16 + v; });
+        if (x_16 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var y = 0; y < 1;) {
+        var state_16 = _loop_16(y);
+        if (typeof state_16 === "object") return state_16.value
+    }
+    use(v);
+}
+function foo5_c(x) {
+    var _loop_17 = function(x_17, y) {
+        v = x_17;
+        (function () { return x_17 + y + v; });
+        (function () { return x_17 + y + v; });
+        if (x_17 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var x_17 = 0, y = 1; x_17 < 1;) {
+        var state_17 = _loop_17(x_17, y);
+        if (typeof state_17 === "object") return state_17.value
+    }
+    use(v);
+}
+function foo6_c(x) {
+    var _loop_18 = function() {
+        var x_18 = 1, y = 1;
+        v = x_18;
+        (function () { return x_18 + y + v; });
+        (function () { return x_18 + y + v; });
+        if (x_18 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    while (1 === 1) {
+        var state_18 = _loop_18();
+        if (typeof state_18 === "object") return state_18.value
+    }
+    use(v);
+}
+function foo7_c(x) {
+    var _loop_19 = function() {
+        var x_19 = 1, y = 1;
+        v = x_19;
+        (function () { return x_19 + y + v; });
+        (function () { return x_19 + y + v; });
+        if (x_19 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    do {
+        var state_19 = _loop_19();
+        if (typeof state_19 === "object") return state_19.value
+    } while (1 === 1);
+    use(v);
+}
+function foo8_c(x) {
+    var _loop_20 = function(y) {
+        var x_20 = 1;
+        v = x_20;
+        (function () { return x_20 + y + v; });
+        (function () { return x_20 + y + v; });
+        if (x_20 == 1) {
+            return { value: void 0 };
+        }
+    };
+    var v;
+    for (var y = 0; y < 1;) {
+        var state_20 = _loop_20(y);
+        if (typeof state_20 === "object") return state_20.value
+    }
+    use(v);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop5.symbols b/tests/baselines/reference/capturedLetConstInLoop5.symbols
new file mode 100644
index 00000000000..2d514e8c88c
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop5.symbols
@@ -0,0 +1,682 @@
+=== tests/cases/compiler/capturedLetConstInLoop5.ts ===
+declare function use(a: any);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>a : Symbol(a, Decl(capturedLetConstInLoop5.ts, 0, 21))
+
+//====let
+function foo0(x) {
+>foo0 : Symbol(foo0, Decl(capturedLetConstInLoop5.ts, 0, 29))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 3, 14))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 4, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 5, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 4, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 4, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 5, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 4, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 5, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 4, 12))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 5, 11))
+}
+
+function foo00(x) {
+>foo00 : Symbol(foo00, Decl(capturedLetConstInLoop5.ts, 14, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 16, 15))
+
+    for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 17, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 18, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 17, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 17, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 18, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 17, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 18, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 17, 12))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 18, 11))
+}
+
+function foo1(x) {
+>foo1 : Symbol(foo1, Decl(capturedLetConstInLoop5.ts, 27, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 29, 14))
+
+    for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 31, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 31, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 31, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 30, 12))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 31, 11))
+}
+
+function foo2(x) {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop5.ts, 40, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 42, 14))
+
+    while (1 === 1) {
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 44, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 45, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 44, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 44, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 45, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 44, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 45, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 44, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 45, 11))
+}
+
+function foo3(x) {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop5.ts, 54, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 56, 14))
+
+    do {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 58, 11))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 59, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 58, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 59, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 58, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 59, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 58, 11))
+
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 59, 11))
+}
+
+function foo4(x) {
+>foo4 : Symbol(foo4, Decl(capturedLetConstInLoop5.ts, 68, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 70, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 71, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 71, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 71, 12))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 72, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 71, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 73, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 73, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 72, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 73, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 72, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 73, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 72, 11))
+}
+
+function foo5(x) {
+>foo5 : Symbol(foo5, Decl(capturedLetConstInLoop5.ts, 82, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 84, 14))
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 85, 19))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 86, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 85, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 86, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 85, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 86, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 85, 12))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 86, 11))
+}
+
+
+function foo6(x) {
+>foo6 : Symbol(foo6, Decl(capturedLetConstInLoop5.ts, 95, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 98, 14))
+
+    while (1 === 1) {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 100, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 100, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 101, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 100, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 100, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 100, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 101, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 100, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 100, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 101, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 100, 11))
+
+            return;
+        }
+    };
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 101, 11))
+}
+
+function foo7(x) {
+>foo7 : Symbol(foo7, Decl(capturedLetConstInLoop5.ts, 110, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 112, 14))
+
+    do {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 114, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 114, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 115, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 114, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 114, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 114, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 115, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 114, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 114, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 115, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 114, 11))
+
+            return;
+        }
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 115, 11))
+}
+
+
+function foo8(x) {
+>foo8 : Symbol(foo8, Decl(capturedLetConstInLoop5.ts, 124, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 127, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 128, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 128, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 128, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 129, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 130, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 129, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 129, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 128, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 130, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 129, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 128, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 130, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 129, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 130, 11))
+}
+
+//====const
+function foo0_c(x) {
+>foo0_c : Symbol(foo0_c, Decl(capturedLetConstInLoop5.ts, 139, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 142, 16))
+
+    for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 143, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 144, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 143, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 143, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 144, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 143, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 144, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 143, 14))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 144, 11))
+}
+
+function foo00_c(x) {
+>foo00_c : Symbol(foo00_c, Decl(capturedLetConstInLoop5.ts, 153, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 155, 17))
+
+    for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 156, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 157, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 156, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 156, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 157, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 156, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 157, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 156, 14))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 157, 11))
+}
+
+function foo1_c(x) {
+>foo1_c : Symbol(foo1_c, Decl(capturedLetConstInLoop5.ts, 166, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 168, 16))
+
+    for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 169, 14))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 169, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 170, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 169, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 169, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 170, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 169, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 170, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 169, 14))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 170, 11))
+}
+
+function foo2_c(x) {
+>foo2_c : Symbol(foo2_c, Decl(capturedLetConstInLoop5.ts, 179, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 181, 16))
+
+    while (1 === 1) {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 183, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 184, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 183, 13))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 183, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 184, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 183, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 184, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 183, 13))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 184, 11))
+}
+
+function foo3_c(x) {
+>foo3_c : Symbol(foo3_c, Decl(capturedLetConstInLoop5.ts, 193, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 195, 16))
+
+    do {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 197, 13))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 198, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 197, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 198, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 197, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 198, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 197, 13))
+
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 198, 11))
+}
+
+function foo4_c(x) {
+>foo4_c : Symbol(foo4_c, Decl(capturedLetConstInLoop5.ts, 207, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 209, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 210, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 210, 14))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 211, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 210, 14))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 212, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 212, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 211, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 212, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 211, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 212, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 211, 11))
+}
+
+function foo5_c(x) {
+>foo5_c : Symbol(foo5_c, Decl(capturedLetConstInLoop5.ts, 221, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 223, 16))
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 224, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 224, 21))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 224, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 225, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 224, 14))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 224, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 224, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 225, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 224, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 224, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 225, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 224, 14))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 225, 11))
+}
+
+
+function foo6_c(x) {
+>foo6_c : Symbol(foo6_c, Decl(capturedLetConstInLoop5.ts, 234, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 237, 16))
+
+    while (1 === 1) {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 239, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 239, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 240, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 239, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 239, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 239, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 240, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 239, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 239, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 240, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 239, 13))
+
+            return;
+        }
+    }
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 240, 11))
+}
+
+function foo7_c(x) {
+>foo7_c : Symbol(foo7_c, Decl(capturedLetConstInLoop5.ts, 249, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 251, 16))
+
+    do {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 253, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 253, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 254, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 253, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 253, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 253, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 254, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 253, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 253, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 254, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 253, 13))
+
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 254, 11))
+}
+
+
+function foo8_c(x) {
+>foo8_c : Symbol(foo8_c, Decl(capturedLetConstInLoop5.ts, 263, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 266, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 267, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 267, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 268, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 269, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 268, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 268, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 267, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 269, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 268, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5.ts, 267, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 269, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5.ts, 268, 13))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5.ts, 269, 11))
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop5.types b/tests/baselines/reference/capturedLetConstInLoop5.types
new file mode 100644
index 00000000000..3654ffe5820
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop5.types
@@ -0,0 +1,951 @@
+=== tests/cases/compiler/capturedLetConstInLoop5.ts ===
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+//====let
+function foo0(x) {
+>foo0 : (x: any) => void
+>x : any
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo00(x) {
+>foo00 : (x: any) => void
+>x : any
+
+    for (let x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1(x) {
+>foo1 : (x: any) => void
+>x : any
+
+    for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2(x) {
+>foo2 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3(x) {
+>foo3 : (x: any) => void
+>x : any
+
+    do {
+        let x;
+>x : any
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4(x) {
+>foo4 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        var v = y;
+>v : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5(x) {
+>foo5 : (x: any) => void
+>x : any
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6(x) {
+>foo6 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    };
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo7(x) {
+>foo7 : (x: any) => void
+>x : any
+
+    do {
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+
+function foo8(x) {
+>foo8 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+//====const
+function foo0_c(x) {
+>foo0_c : (x: any) => void
+>x : any
+
+    for (const x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo00_c(x) {
+>foo00_c : (x: any) => void
+>x : any
+
+    for (const x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1_c(x) {
+>foo1_c : (x: any) => void
+>x : any
+
+    for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2_c(x) {
+>foo2_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3_c(x) {
+>foo3_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1;
+>x : number
+>1 : number
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : number
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : number
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4_c(x) {
+>foo4_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        var v = y;
+>v : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5_c(x) {
+>foo5_c : (x: any) => void
+>x : any
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6_c(x) {
+>foo6_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo7_c(x) {
+>foo7_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo8_c(x) {
+>foo8_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop5_ES6.js b/tests/baselines/reference/capturedLetConstInLoop5_ES6.js
new file mode 100644
index 00000000000..e5996bb3053
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop5_ES6.js
@@ -0,0 +1,518 @@
+//// [capturedLetConstInLoop5_ES6.ts]
+
+declare function use(a: any);
+
+//====let
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    };
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+//====const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+//// [capturedLetConstInLoop5_ES6.js]
+//====let
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo00(x) {
+    for (let x in []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    use(v);
+}
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    ;
+    use(v);
+}
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    use(v);
+}
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+//====const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo00_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    use(v);
+}
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        let x = 1;
+        (function () { return x + v; });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    use(v);
+}
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function () { return x + y + v; });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    use(v);
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop5_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop5_ES6.symbols
new file mode 100644
index 00000000000..b3d338ad60e
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop5_ES6.symbols
@@ -0,0 +1,683 @@
+=== tests/cases/compiler/capturedLetConstInLoop5_ES6.ts ===
+
+declare function use(a: any);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>a : Symbol(a, Decl(capturedLetConstInLoop5_ES6.ts, 1, 21))
+
+//====let
+function foo0(x) {
+>foo0 : Symbol(foo0, Decl(capturedLetConstInLoop5_ES6.ts, 1, 29))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 4, 14))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 5, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 6, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 5, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 5, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 6, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 5, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 6, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 5, 12))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 6, 11))
+}
+
+function foo00(x) {
+>foo00 : Symbol(foo00, Decl(capturedLetConstInLoop5_ES6.ts, 15, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 17, 15))
+
+    for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 18, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 19, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 18, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 18, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 19, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 18, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 19, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 18, 12))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 19, 11))
+}
+
+function foo1(x) {
+>foo1 : Symbol(foo1, Decl(capturedLetConstInLoop5_ES6.ts, 28, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 30, 14))
+
+    for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 32, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 32, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 32, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 31, 12))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 32, 11))
+}
+
+function foo2(x) {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop5_ES6.ts, 41, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 43, 14))
+
+    while (1 === 1) {
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 45, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 46, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 45, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 45, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 46, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 45, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 46, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 45, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 46, 11))
+}
+
+function foo3(x) {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop5_ES6.ts, 55, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 57, 14))
+
+    do {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 59, 11))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 60, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 59, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 60, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 59, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 60, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 59, 11))
+
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 60, 11))
+}
+
+function foo4(x) {
+>foo4 : Symbol(foo4, Decl(capturedLetConstInLoop5_ES6.ts, 69, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 71, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 72, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 72, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 72, 12))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 73, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 72, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 74, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 74, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 73, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 74, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 73, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 74, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 73, 11))
+}
+
+function foo5(x) {
+>foo5 : Symbol(foo5, Decl(capturedLetConstInLoop5_ES6.ts, 83, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 85, 14))
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 86, 19))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 87, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 86, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 87, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 86, 19))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 87, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 86, 12))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 87, 11))
+}
+
+
+function foo6(x) {
+>foo6 : Symbol(foo6, Decl(capturedLetConstInLoop5_ES6.ts, 96, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 99, 14))
+
+    while (1 === 1) {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 101, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 101, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 102, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 101, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 101, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 101, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 102, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 101, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 101, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 102, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 101, 11))
+
+            return;
+        }
+    };
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 102, 11))
+}
+
+function foo7(x) {
+>foo7 : Symbol(foo7, Decl(capturedLetConstInLoop5_ES6.ts, 111, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 113, 14))
+
+    do {
+        let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 115, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 115, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 116, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 115, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 115, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 115, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 116, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 115, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 115, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 116, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 115, 11))
+
+            return;
+        }
+    } while (1 === 1);
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 116, 11))
+}
+
+
+function foo8(x) {
+>foo8 : Symbol(foo8, Decl(capturedLetConstInLoop5_ES6.ts, 125, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 128, 14))
+
+    for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 129, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 129, 12))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 129, 12))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 130, 11))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 131, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 130, 11))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 130, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 129, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 131, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 130, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 129, 12))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 131, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 130, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 131, 11))
+}
+
+//====const
+function foo0_c(x) {
+>foo0_c : Symbol(foo0_c, Decl(capturedLetConstInLoop5_ES6.ts, 140, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 143, 16))
+
+    for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 144, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 145, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 144, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 144, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 145, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 144, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 145, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 144, 14))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 145, 11))
+}
+
+function foo00_c(x) {
+>foo00_c : Symbol(foo00_c, Decl(capturedLetConstInLoop5_ES6.ts, 154, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 156, 17))
+
+    for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 157, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 158, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 157, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 157, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 158, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 157, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 158, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 157, 14))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 158, 11))
+}
+
+function foo1_c(x) {
+>foo1_c : Symbol(foo1_c, Decl(capturedLetConstInLoop5_ES6.ts, 167, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 169, 16))
+
+    for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 170, 14))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 170, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 171, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 170, 14))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 170, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 171, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 170, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 171, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 170, 14))
+
+            return;
+        }
+    }
+
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 171, 11))
+}
+
+function foo2_c(x) {
+>foo2_c : Symbol(foo2_c, Decl(capturedLetConstInLoop5_ES6.ts, 180, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 182, 16))
+
+    while (1 === 1) {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 184, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 185, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 184, 13))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 184, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 185, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 184, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 185, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 184, 13))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 185, 11))
+}
+
+function foo3_c(x) {
+>foo3_c : Symbol(foo3_c, Decl(capturedLetConstInLoop5_ES6.ts, 194, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 196, 16))
+
+    do {
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 198, 13))
+
+        var v;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 199, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 198, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 199, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 198, 13))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 199, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 198, 13))
+
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 199, 11))
+}
+
+function foo4_c(x) {
+>foo4_c : Symbol(foo4_c, Decl(capturedLetConstInLoop5_ES6.ts, 208, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 210, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 211, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 211, 14))
+
+        var v = y;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 212, 11))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 211, 14))
+
+        let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 213, 11))
+
+        (function() { return x + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 213, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 212, 11))
+
+        (() => x + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 213, 11))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 212, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 213, 11))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 212, 11))
+}
+
+function foo5_c(x) {
+>foo5_c : Symbol(foo5_c, Decl(capturedLetConstInLoop5_ES6.ts, 222, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 224, 16))
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 225, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 225, 21))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 225, 14))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 226, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 225, 14))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 225, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 225, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 226, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 225, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 225, 21))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 226, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 225, 14))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 226, 11))
+}
+
+
+function foo6_c(x) {
+>foo6_c : Symbol(foo6_c, Decl(capturedLetConstInLoop5_ES6.ts, 235, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 238, 16))
+
+    while (1 === 1) {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 240, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 240, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 241, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 240, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 240, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 240, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 241, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 240, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 240, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 241, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 240, 13))
+
+            return;
+        }
+    }
+    
+    use(v)
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 241, 11))
+}
+
+function foo7_c(x) {
+>foo7_c : Symbol(foo7_c, Decl(capturedLetConstInLoop5_ES6.ts, 250, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 252, 16))
+
+    do {
+        const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 254, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 254, 20))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 255, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 254, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 254, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 254, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 255, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 254, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 254, 20))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 255, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 254, 13))
+
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 255, 11))
+}
+
+
+function foo8_c(x) {
+>foo8_c : Symbol(foo8_c, Decl(capturedLetConstInLoop5_ES6.ts, 264, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 267, 16))
+
+    for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 268, 14))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 268, 14))
+
+        const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 269, 13))
+
+        var v = x;
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 270, 11))
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 269, 13))
+
+        (function() { return x + y + v });
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 269, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 268, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 270, 11))
+
+        (() => x + y + v);
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 269, 13))
+>y : Symbol(y, Decl(capturedLetConstInLoop5_ES6.ts, 268, 14))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 270, 11))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop5_ES6.ts, 269, 13))
+
+            return;
+        }
+    }
+    
+    use(v);
+>use : Symbol(use, Decl(capturedLetConstInLoop5_ES6.ts, 0, 0))
+>v : Symbol(v, Decl(capturedLetConstInLoop5_ES6.ts, 270, 11))
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop5_ES6.types b/tests/baselines/reference/capturedLetConstInLoop5_ES6.types
new file mode 100644
index 00000000000..8db8ae25e9b
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop5_ES6.types
@@ -0,0 +1,952 @@
+=== tests/cases/compiler/capturedLetConstInLoop5_ES6.ts ===
+
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+//====let
+function foo0(x) {
+>foo0 : (x: any) => void
+>x : any
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo00(x) {
+>foo00 : (x: any) => void
+>x : any
+
+    for (let x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1(x) {
+>foo1 : (x: any) => void
+>x : any
+
+    for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2(x) {
+>foo2 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3(x) {
+>foo3 : (x: any) => void
+>x : any
+
+    do {
+        let x;
+>x : any
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4(x) {
+>foo4 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        var v = y;
+>v : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5(x) {
+>foo5 : (x: any) => void
+>x : any
+
+    for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6(x) {
+>foo6 : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    };
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo7(x) {
+>foo7 : (x: any) => void
+>x : any
+
+    do {
+        let x, y;
+>x : any
+>y : any
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => any
+>function() { return x + y + v } : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        (() => x + y + v);
+>(() => x + y + v) : () => any
+>() => x + y + v : () => any
+>x + y + v : any
+>x + y : any
+>x : any
+>y : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    } while (1 === 1);
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+
+function foo8(x) {
+>foo8 : (x: any) => void
+>x : any
+
+    for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+//====const
+function foo0_c(x) {
+>foo0_c : (x: any) => void
+>x : any
+
+    for (const x of []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo00_c(x) {
+>foo00_c : (x: any) => void
+>x : any
+
+    for (const x in []) {
+>x : any
+>[] : undefined[]
+
+        var v = x;
+>v : any
+>x : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : any
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : any
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo1_c(x) {
+>foo1_c : (x: any) => void
+>x : any
+
+    for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo2_c(x) {
+>foo2_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo3_c(x) {
+>foo3_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1;
+>x : number
+>1 : number
+
+        var v;
+>v : any
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => any
+>function() { return x + v } : () => any
+>x + v : any
+>x : number
+>v : any
+
+        (() => x + v);
+>(() => x + v) : () => any
+>() => x + v : () => any
+>x + v : any
+>x : number
+>v : any
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : any
+}
+
+function foo4_c(x) {
+>foo4_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        var v = y;
+>v : number
+>y : number
+
+        let x = 1;
+>x : number
+>1 : number
+
+        (function() { return x + v });
+>(function() { return x + v }) : () => number
+>function() { return x + v } : () => number
+>x + v : number
+>x : number
+>v : number
+
+        (() => x + v);
+>(() => x + v) : () => number
+>() => x + v : () => number
+>x + v : number
+>x : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo5_c(x) {
+>foo5_c : (x: any) => void
+>x : any
+
+    for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo6_c(x) {
+>foo6_c : (x: any) => void
+>x : any
+
+    while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v)
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+function foo7_c(x) {
+>foo7_c : (x: any) => void
+>x : any
+
+    do {
+        const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    } while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
+
+
+function foo8_c(x) {
+>foo8_c : (x: any) => void
+>x : any
+
+    for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+        const x = 1;
+>x : number
+>1 : number
+
+        var v = x;
+>v : number
+>x : number
+
+        (function() { return x + y + v });
+>(function() { return x + y + v }) : () => number
+>function() { return x + y + v } : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        (() => x + y + v);
+>(() => x + y + v) : () => number
+>() => x + y + v : () => number
+>x + y + v : number
+>x + y : number
+>x : number
+>y : number
+>v : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return;
+        }
+    }
+    
+    use(v);
+>use(v) : any
+>use : (a: any) => any
+>v : number
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop6.js b/tests/baselines/reference/capturedLetConstInLoop6.js
new file mode 100644
index 00000000000..187d9f10ad3
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop6.js
@@ -0,0 +1,557 @@
+//// [capturedLetConstInLoop6.ts]
+// ====let
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+
+//// [capturedLetConstInLoop6.js]
+// ====let
+var _loop_1 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var x = _a[_i];
+    var state_1 = _loop_1(x);
+    if (state_1 === "break") break;
+    if (state_1 === "continue") continue;
+}
+var _loop_2 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var x in []) {
+    var state_2 = _loop_2(x);
+    if (state_2 === "break") break;
+    if (state_2 === "continue") continue;
+}
+var _loop_3 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var x = 0; x < 1; ++x) {
+    var state_3 = _loop_3(x);
+    if (state_3 === "break") break;
+    if (state_3 === "continue") continue;
+}
+var _loop_4 = function() {
+    var x = void 0;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+while (1 === 1) {
+    var state_4 = _loop_4();
+    if (state_4 === "break") break;
+    if (state_4 === "continue") continue;
+}
+var _loop_5 = function() {
+    var x = void 0;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+do {
+    var state_5 = _loop_5();
+    if (state_5 === "break") break;
+    if (state_5 === "continue") continue;
+} while (1 === 1);
+var _loop_6 = function(y) {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var y = 0; y < 1; ++y) {
+    var state_6 = _loop_6(y);
+    if (state_6 === "break") break;
+    if (state_6 === "continue") continue;
+}
+var _loop_7 = function(x, y) {
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var x = 0, y = 1; x < 1; ++x) {
+    var state_7 = _loop_7(x, y);
+    if (state_7 === "break") break;
+    if (state_7 === "continue") continue;
+}
+var _loop_8 = function() {
+    var x = void 0, y = void 0;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+while (1 === 1) {
+    var state_8 = _loop_8();
+    if (state_8 === "break") break;
+    if (state_8 === "continue") continue;
+}
+var _loop_9 = function() {
+    var x = void 0, y = void 0;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+do {
+    var state_9 = _loop_9();
+    if (state_9 === "break") break;
+    if (state_9 === "continue") continue;
+} while (1 === 1);
+var _loop_10 = function(y) {
+    var x = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var y = 0; y < 1; ++y) {
+    var state_10 = _loop_10(y);
+    if (state_10 === "break") break;
+    if (state_10 === "continue") continue;
+}
+// ====const
+var _loop_11 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    var x = _c[_b];
+    var state_11 = _loop_11(x);
+    if (state_11 === "break") break;
+    if (state_11 === "continue") continue;
+}
+var _loop_12 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var x in []) {
+    var state_12 = _loop_12(x);
+    if (state_12 === "break") break;
+    if (state_12 === "continue") continue;
+}
+var _loop_13 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var x = 0; x < 1;) {
+    var state_13 = _loop_13(x);
+    if (state_13 === "break") break;
+    if (state_13 === "continue") continue;
+}
+var _loop_14 = function() {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+while (1 === 1) {
+    var state_14 = _loop_14();
+    if (state_14 === "break") break;
+    if (state_14 === "continue") continue;
+}
+var _loop_15 = function() {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+do {
+    var state_15 = _loop_15();
+    if (state_15 === "break") break;
+    if (state_15 === "continue") continue;
+} while (1 === 1);
+var _loop_16 = function(y) {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var y = 0; y < 1;) {
+    var state_16 = _loop_16(y);
+    if (state_16 === "break") break;
+    if (state_16 === "continue") continue;
+}
+var _loop_17 = function(x, y) {
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var x = 0, y = 1; x < 1;) {
+    var state_17 = _loop_17(x, y);
+    if (state_17 === "break") break;
+    if (state_17 === "continue") continue;
+}
+var _loop_18 = function() {
+    var x = 1, y = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+while (1 === 1) {
+    var state_18 = _loop_18();
+    if (state_18 === "break") break;
+    if (state_18 === "continue") continue;
+}
+var _loop_19 = function() {
+    var x = 1, y = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+do {
+    var state_19 = _loop_19();
+    if (state_19 === "break") break;
+    if (state_19 === "continue") continue;
+} while (1 === 1);
+var _loop_20 = function(y) {
+    var x = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+};
+for (var y = 0; y < 1;) {
+    var state_20 = _loop_20(y);
+    if (state_20 === "break") break;
+    if (state_20 === "continue") continue;
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop6.symbols b/tests/baselines/reference/capturedLetConstInLoop6.symbols
new file mode 100644
index 00000000000..8d8e6d6ce59
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop6.symbols
@@ -0,0 +1,481 @@
+=== tests/cases/compiler/capturedLetConstInLoop6.ts ===
+// ====let
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 1, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 1, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 1, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 1, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 1, 8))
+
+        continue;
+    }
+}
+
+for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 12, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 12, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 12, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 12, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 12, 8))
+
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 24, 8))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 36, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 36, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 36, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 36, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 36, 7))
+
+        continue;
+    }
+}
+
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 48, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 48, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 48, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 48, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 48, 7))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 59, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 59, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 59, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 60, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 60, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 60, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 60, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 60, 7))
+
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 71, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 71, 15))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 71, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 71, 8))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 83, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 83, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 83, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 83, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 83, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 83, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 83, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 83, 7))
+
+        continue;
+    }
+}
+
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 95, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 95, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 95, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 95, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 95, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 95, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 95, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 95, 7))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 106, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 106, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 106, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 107, 7))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 107, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 106, 8))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 107, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 106, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 107, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 107, 7))
+
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 120, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 120, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 120, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 120, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 120, 10))
+
+        continue;
+    }
+}
+
+for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 131, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 131, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 131, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 131, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 131, 10))
+
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 143, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 143, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 143, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 143, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 143, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 143, 10))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 155, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 155, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 155, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 155, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 155, 9))
+
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 167, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 167, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 167, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 167, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 167, 9))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 178, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 178, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 179, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 179, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 179, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 179, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 179, 9))
+
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 190, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 190, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 190, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 190, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 190, 17))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 190, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 190, 17))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 190, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 190, 10))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 202, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 202, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 202, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 202, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 202, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 202, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 202, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 202, 9))
+
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 214, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 214, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 214, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 214, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 214, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 214, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 214, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 214, 9))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 225, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 225, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 226, 9))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 226, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 225, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 226, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6.ts, 225, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 226, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6.ts, 226, 9))
+
+        continue;
+    }
+}
+
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop6.types b/tests/baselines/reference/capturedLetConstInLoop6.types
new file mode 100644
index 00000000000..6c31bdef31b
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop6.types
@@ -0,0 +1,729 @@
+=== tests/cases/compiler/capturedLetConstInLoop6.ts ===
+// ====let
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop6_ES6.js b/tests/baselines/reference/capturedLetConstInLoop6_ES6.js
new file mode 100644
index 00000000000..924f55b6915
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop6_ES6.js
@@ -0,0 +1,455 @@
+//// [capturedLetConstInLoop6_ES6.ts]
+// ====let
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+
+//// [capturedLetConstInLoop6_ES6.js]
+// ====let
+for (let x of []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+for (let x in []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+for (let x = 0; x < 1; ++x) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+while (1 === 1) {
+    let x;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+do {
+    let x;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1);
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+while (1 === 1) {
+    let x, y;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+do {
+    let x, y;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1);
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+// ====const
+for (const x of []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+for (const x in []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+for (const x = 0; x < 1;) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+while (1 === 1) {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+do {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1);
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+for (const x = 0, y = 1; x < 1;) {
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+do {
+    const x = 1, y = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1);
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop6_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop6_ES6.symbols
new file mode 100644
index 00000000000..acd557e4714
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop6_ES6.symbols
@@ -0,0 +1,481 @@
+=== tests/cases/compiler/capturedLetConstInLoop6_ES6.ts ===
+// ====let
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 1, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 1, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 1, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 1, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 1, 8))
+
+        continue;
+    }
+}
+
+for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 12, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 12, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 12, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 12, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 12, 8))
+
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 24, 8))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 36, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 36, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 36, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 36, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 36, 7))
+
+        continue;
+    }
+}
+
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 48, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 48, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 48, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 48, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 48, 7))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 59, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 59, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 59, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 60, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 60, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 60, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 60, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 60, 7))
+
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 71, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 71, 15))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 71, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 71, 8))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 83, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 83, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 83, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 83, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 83, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 83, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 83, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 83, 7))
+
+        continue;
+    }
+}
+
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 95, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 95, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 95, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 95, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 95, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 95, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 95, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 95, 7))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 106, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 106, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 106, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 107, 7))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 107, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 106, 8))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 107, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 106, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 107, 7))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 107, 7))
+
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 120, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 120, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 120, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 120, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 120, 10))
+
+        continue;
+    }
+}
+
+for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 131, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 131, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 131, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 131, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 131, 10))
+
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 143, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 143, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 143, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 143, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 143, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 143, 10))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 155, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 155, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 155, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 155, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 155, 9))
+
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 167, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 167, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 167, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 167, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 167, 9))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 178, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 178, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 179, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 179, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 179, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 179, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 179, 9))
+
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 190, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 190, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 190, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 190, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 190, 17))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 190, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 190, 17))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 190, 10))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 190, 10))
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 202, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 202, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 202, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 202, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 202, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 202, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 202, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 202, 9))
+
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 214, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 214, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 214, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 214, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 214, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 214, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 214, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 214, 9))
+
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 225, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 225, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 226, 9))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 226, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 225, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 226, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop6_ES6.ts, 225, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 226, 9))
+
+        break;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop6_ES6.ts, 226, 9))
+
+        continue;
+    }
+}
+
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop6_ES6.types b/tests/baselines/reference/capturedLetConstInLoop6_ES6.types
new file mode 100644
index 00000000000..87f21709120
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop6_ES6.types
@@ -0,0 +1,729 @@
+=== tests/cases/compiler/capturedLetConstInLoop6_ES6.ts ===
+// ====let
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+}
+
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop7.js b/tests/baselines/reference/capturedLetConstInLoop7.js
new file mode 100644
index 00000000000..ce6769d2b1a
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop7.js
@@ -0,0 +1,894 @@
+//// [capturedLetConstInLoop7.ts]
+//===let
+l0:
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0;
+    }
+}
+
+l00:
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00;
+    }
+}
+
+l1:
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1;
+    }
+}
+
+l2:
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2;
+    }
+}
+
+l3:
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3;
+    }
+} while (1 === 1)
+
+l4:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4;
+    }
+}
+
+l5:
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5;
+    }
+}
+
+l6:
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6;
+    }
+
+}
+
+l7:
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7;
+    }
+} while (1 === 1)
+
+l8:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8;
+    }
+}
+
+//===const
+l0_c:
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0_c;
+    }
+}
+
+l00_c:
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00_c;
+    }
+}
+
+l1_c:
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1_c;
+    }
+}
+
+l2_c:
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2_c;
+    }
+}
+
+l3_c:
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3_c;
+    }
+} while (1 === 1)
+
+l4_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4_c;
+    }
+}
+
+l5_c:
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5_c;
+    }
+}
+
+l6_c:
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6_c;
+    }
+
+}
+
+l7_c:
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7_c;
+    }
+} while (1 === 1)
+
+l8_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8_c;
+    }
+}
+
+//// [capturedLetConstInLoop7.js]
+//===let
+var _loop_1 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l0";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l0";
+    }
+};
+l0: for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var x = _a[_i];
+    var state_1 = _loop_1(x);
+    if (state_1 === "break") break;
+    if (state_1 === "continue") continue;
+    switch(state_1) {
+        case "break-l0": break l0;
+        case "continue-l0": continue l0;
+    }
+}
+var _loop_2 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l00";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l00";
+    }
+};
+l00: for (var x in []) {
+    var state_2 = _loop_2(x);
+    if (state_2 === "break") break;
+    if (state_2 === "continue") continue;
+    switch(state_2) {
+        case "break-l00": break l00;
+        case "continue-l00": continue l00;
+    }
+}
+var _loop_3 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l1";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l1";
+    }
+};
+l1: for (var x = 0; x < 1; ++x) {
+    var state_3 = _loop_3(x);
+    if (state_3 === "break") break;
+    if (state_3 === "continue") continue;
+    switch(state_3) {
+        case "break-l1": break l1;
+        case "continue-l1": continue l1;
+    }
+}
+var _loop_4 = function() {
+    var x = void 0;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l2";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l2";
+    }
+};
+l2: while (1 === 1) {
+    var state_4 = _loop_4();
+    if (state_4 === "break") break;
+    if (state_4 === "continue") continue;
+    switch(state_4) {
+        case "break-l2": break l2;
+        case "continue-l2": continue l2;
+    }
+}
+var _loop_5 = function() {
+    var x = void 0;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l3";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l3";
+    }
+};
+l3: do {
+    var state_5 = _loop_5();
+    if (state_5 === "break") break;
+    if (state_5 === "continue") continue;
+    switch(state_5) {
+        case "break-l3": break l3;
+        case "continue-l3": continue l3;
+    }
+} while (1 === 1);
+var _loop_6 = function(y) {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l4";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l4";
+    }
+};
+l4: for (var y = 0; y < 1; ++y) {
+    var state_6 = _loop_6(y);
+    if (state_6 === "break") break;
+    if (state_6 === "continue") continue;
+    switch(state_6) {
+        case "break-l4": break l4;
+        case "continue-l4": continue l4;
+    }
+}
+var _loop_7 = function(x, y) {
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l5";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l5";
+    }
+};
+l5: for (var x = 0, y = 1; x < 1; ++x) {
+    var state_7 = _loop_7(x, y);
+    if (state_7 === "break") break;
+    if (state_7 === "continue") continue;
+    switch(state_7) {
+        case "break-l5": break l5;
+        case "continue-l5": continue l5;
+    }
+}
+var _loop_8 = function() {
+    var x = void 0, y = void 0;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l6";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l6";
+    }
+};
+l6: while (1 === 1) {
+    var state_8 = _loop_8();
+    if (state_8 === "break") break;
+    if (state_8 === "continue") continue;
+    switch(state_8) {
+        case "break-l6": break l6;
+        case "continue-l6": continue l6;
+    }
+}
+var _loop_9 = function() {
+    var x = void 0, y = void 0;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l7";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l7";
+    }
+};
+l7: do {
+    var state_9 = _loop_9();
+    if (state_9 === "break") break;
+    if (state_9 === "continue") continue;
+    switch(state_9) {
+        case "break-l7": break l7;
+        case "continue-l7": continue l7;
+    }
+} while (1 === 1);
+var _loop_10 = function(y) {
+    var x = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l8";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l8";
+    }
+};
+l8: for (var y = 0; y < 1; ++y) {
+    var state_10 = _loop_10(y);
+    if (state_10 === "break") break;
+    if (state_10 === "continue") continue;
+    switch(state_10) {
+        case "break-l8": break l8;
+        case "continue-l8": continue l8;
+    }
+}
+//===const
+var _loop_11 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l0_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l0_c";
+    }
+};
+l0_c: for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    var x = _c[_b];
+    var state_11 = _loop_11(x);
+    if (state_11 === "break") break;
+    if (state_11 === "continue") continue;
+    switch(state_11) {
+        case "break-l0_c": break l0_c;
+        case "continue-l0_c": continue l0_c;
+    }
+}
+var _loop_12 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l00_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l00_c";
+    }
+};
+l00_c: for (var x in []) {
+    var state_12 = _loop_12(x);
+    if (state_12 === "break") break;
+    if (state_12 === "continue") continue;
+    switch(state_12) {
+        case "break-l00_c": break l00_c;
+        case "continue-l00_c": continue l00_c;
+    }
+}
+var _loop_13 = function(x) {
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l1_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l1_c";
+    }
+};
+l1_c: for (var x = 0; x < 1;) {
+    var state_13 = _loop_13(x);
+    if (state_13 === "break") break;
+    if (state_13 === "continue") continue;
+    switch(state_13) {
+        case "break-l1_c": break l1_c;
+        case "continue-l1_c": continue l1_c;
+    }
+}
+var _loop_14 = function() {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l2_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l2_c";
+    }
+};
+l2_c: while (1 === 1) {
+    var state_14 = _loop_14();
+    if (state_14 === "break") break;
+    if (state_14 === "continue") continue;
+    switch(state_14) {
+        case "break-l2_c": break l2_c;
+        case "continue-l2_c": continue l2_c;
+    }
+}
+var _loop_15 = function() {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l3_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l3_c";
+    }
+};
+l3_c: do {
+    var state_15 = _loop_15();
+    if (state_15 === "break") break;
+    if (state_15 === "continue") continue;
+    switch(state_15) {
+        case "break-l3_c": break l3_c;
+        case "continue-l3_c": continue l3_c;
+    }
+} while (1 === 1);
+var _loop_16 = function(y) {
+    var x = 1;
+    (function () { return x; });
+    (function () { return x; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l4_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l4_c";
+    }
+};
+l4_c: for (var y = 0; y < 1;) {
+    var state_16 = _loop_16(y);
+    if (state_16 === "break") break;
+    if (state_16 === "continue") continue;
+    switch(state_16) {
+        case "break-l4_c": break l4_c;
+        case "continue-l4_c": continue l4_c;
+    }
+}
+var _loop_17 = function(x, y) {
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l5_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l5_c";
+    }
+};
+l5_c: for (var x = 0, y = 1; x < 1;) {
+    var state_17 = _loop_17(x, y);
+    if (state_17 === "break") break;
+    if (state_17 === "continue") continue;
+    switch(state_17) {
+        case "break-l5_c": break l5_c;
+        case "continue-l5_c": continue l5_c;
+    }
+}
+var _loop_18 = function() {
+    var x = 1, y = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l6_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l6_c";
+    }
+};
+l6_c: while (1 === 1) {
+    var state_18 = _loop_18();
+    if (state_18 === "break") break;
+    if (state_18 === "continue") continue;
+    switch(state_18) {
+        case "break-l6_c": break l6_c;
+        case "continue-l6_c": continue l6_c;
+    }
+}
+var _loop_19 = function() {
+    var x = 1, y = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l7_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l7_c";
+    }
+};
+l7_c: do {
+    var state_19 = _loop_19();
+    if (state_19 === "break") break;
+    if (state_19 === "continue") continue;
+    switch(state_19) {
+        case "break-l7_c": break l7_c;
+        case "continue-l7_c": continue l7_c;
+    }
+} while (1 === 1);
+var _loop_20 = function(y) {
+    var x = 1;
+    (function () { return x + y; });
+    (function () { return x + y; });
+    if (x == 1) {
+        return "break";
+    }
+    if (x == 1) {
+        return "break-l8_c";
+    }
+    if (x == 2) {
+        return "continue";
+    }
+    if (x == 2) {
+        return "continue-l8_c";
+    }
+};
+l8_c: for (var y = 0; y < 1;) {
+    var state_20 = _loop_20(y);
+    if (state_20 === "break") break;
+    if (state_20 === "continue") continue;
+    switch(state_20) {
+        case "break-l8_c": break l8_c;
+        case "continue-l8_c": continue l8_c;
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop7.symbols b/tests/baselines/reference/capturedLetConstInLoop7.symbols
new file mode 100644
index 00000000000..2aa5ec2cd38
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop7.symbols
@@ -0,0 +1,698 @@
+=== tests/cases/compiler/capturedLetConstInLoop7.ts ===
+//===let
+l0:
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+        break l0;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 2, 8))
+
+        continue l0;
+    }
+}
+
+l00:
+for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+        break l00;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 20, 8))
+
+        continue l00;
+    }
+}
+
+l1:
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+        break l1;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 38, 8))
+
+        continue l1;
+    }
+}
+
+l2:
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+        break l2;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 57, 7))
+
+        continue l2;
+    }
+}
+
+l3:
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+        break l3;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 76, 7))
+
+        continue l3;
+    }
+} while (1 === 1)
+
+l4:
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 94, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 94, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 94, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+        break l4;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 95, 7))
+
+        continue l4;
+    }
+}
+
+l5:
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 113, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 113, 15))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 113, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+
+        break l5;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 113, 8))
+
+        continue l5;
+    }
+}
+
+l6:
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 132, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 132, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 132, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+
+        break l6;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 132, 7))
+
+        continue l6;
+    }
+
+}
+
+l7:
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 152, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 152, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 152, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+
+        break l7;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 152, 7))
+
+        continue l7;
+    }
+} while (1 === 1)
+
+l8:
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 170, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 170, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 170, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 170, 8))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 170, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+
+        break l8;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 171, 7))
+
+        continue l8;
+    }
+}
+
+//===const
+l0_c:
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+        break l0_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 190, 10))
+
+        continue l0_c;
+    }
+}
+
+l00_c:
+for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+        break l00_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 208, 10))
+
+        continue l00_c;
+    }
+}
+
+l1_c:
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+        break l1_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 226, 10))
+
+        continue l1_c;
+    }
+}
+
+l2_c:
+while (1 === 1) {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+        break l2_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 245, 9))
+
+        continue l2_c;
+    }
+}
+
+l3_c:
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+        break l3_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 264, 9))
+
+        continue l3_c;
+    }
+} while (1 === 1)
+
+l4_c:
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 282, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 282, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+        break l4_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 283, 9))
+
+        continue l4_c;
+    }
+}
+
+l5_c:
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 301, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 301, 17))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 301, 17))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+
+        break l5_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 301, 10))
+
+        continue l5_c;
+    }
+}
+
+l6_c:
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 320, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 320, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 320, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+
+        break l6_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 320, 9))
+
+        continue l6_c;
+    }
+
+}
+
+l7_c:
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 340, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 340, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 340, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+
+        break l7_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 340, 9))
+
+        continue l7_c;
+    }
+} while (1 === 1)
+
+l8_c:
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 358, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 358, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 358, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7.ts, 358, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+
+        break l8_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7.ts, 359, 9))
+
+        continue l8_c;
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop7.types b/tests/baselines/reference/capturedLetConstInLoop7.types
new file mode 100644
index 00000000000..280985eae0f
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop7.types
@@ -0,0 +1,1106 @@
+=== tests/cases/compiler/capturedLetConstInLoop7.ts ===
+//===let
+l0:
+>l0 : any
+
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l0;
+>l0 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l0;
+>l0 : any
+    }
+}
+
+l00:
+>l00 : any
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l00;
+>l00 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l00;
+>l00 : any
+    }
+}
+
+l1:
+>l1 : any
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l1;
+>l1 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l1;
+>l1 : any
+    }
+}
+
+l2:
+>l2 : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l2;
+>l2 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l2;
+>l2 : any
+    }
+}
+
+l3:
+>l3 : any
+
+do {
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l3;
+>l3 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l3;
+>l3 : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l4:
+>l4 : any
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l4;
+>l4 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l4;
+>l4 : any
+    }
+}
+
+l5:
+>l5 : any
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l5;
+>l5 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l5;
+>l5 : any
+    }
+}
+
+l6:
+>l6 : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l6;
+>l6 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l6;
+>l6 : any
+    }
+
+}
+
+l7:
+>l7 : any
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l7;
+>l7 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l7;
+>l7 : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l8:
+>l8 : any
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l8;
+>l8 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l8;
+>l8 : any
+    }
+}
+
+//===const
+l0_c:
+>l0_c : any
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l0_c;
+>l0_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l0_c;
+>l0_c : any
+    }
+}
+
+l00_c:
+>l00_c : any
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l00_c;
+>l00_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l00_c;
+>l00_c : any
+    }
+}
+
+l1_c:
+>l1_c : any
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l1_c;
+>l1_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l1_c;
+>l1_c : any
+    }
+}
+
+l2_c:
+>l2_c : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l2_c;
+>l2_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l2_c;
+>l2_c : any
+    }
+}
+
+l3_c:
+>l3_c : any
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l3_c;
+>l3_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l3_c;
+>l3_c : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l4_c:
+>l4_c : any
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l4_c;
+>l4_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l4_c;
+>l4_c : any
+    }
+}
+
+l5_c:
+>l5_c : any
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l5_c;
+>l5_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l5_c;
+>l5_c : any
+    }
+}
+
+l6_c:
+>l6_c : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l6_c;
+>l6_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l6_c;
+>l6_c : any
+    }
+
+}
+
+l7_c:
+>l7_c : any
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l7_c;
+>l7_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l7_c;
+>l7_c : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l8_c:
+>l8_c : any
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l8_c;
+>l8_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l8_c;
+>l8_c : any
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop7_ES6.js b/tests/baselines/reference/capturedLetConstInLoop7_ES6.js
new file mode 100644
index 00000000000..4a2db640081
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop7_ES6.js
@@ -0,0 +1,712 @@
+//// [capturedLetConstInLoop7_ES6.ts]
+//===let
+l0:
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0;
+    }
+}
+
+l00:
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00;
+    }
+}
+
+l1:
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1;
+    }
+}
+
+l2:
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2;
+    }
+}
+
+l3:
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3;
+    }
+} while (1 === 1)
+
+l4:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4;
+    }
+}
+
+l5:
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5;
+    }
+}
+
+l6:
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6;
+    }
+
+}
+
+l7:
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7;
+    }
+} while (1 === 1)
+
+l8:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8;
+    }
+}
+
+//===const
+l0_c:
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0_c;
+    }
+}
+
+l00_c:
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00_c;
+    }
+}
+
+l1_c:
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1_c;
+    }
+}
+
+l2_c:
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2_c;
+    }
+}
+
+l3_c:
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3_c;
+    }
+} while (1 === 1)
+
+l4_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4_c;
+    }
+}
+
+l5_c:
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5_c;
+    }
+}
+
+l6_c:
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6_c;
+    }
+
+}
+
+l7_c:
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7_c;
+    }
+} while (1 === 1)
+
+l8_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8_c;
+    }
+}
+
+//// [capturedLetConstInLoop7_ES6.js]
+//===let
+l0: for (let x of []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0;
+    }
+}
+l00: for (let x in []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00;
+    }
+}
+l1: for (let x = 0; x < 1; ++x) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1;
+    }
+}
+l2: while (1 === 1) {
+    let x;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2;
+    }
+}
+l3: do {
+    let x;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3;
+    }
+} while (1 === 1);
+l4: for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4;
+    }
+}
+l5: for (let x = 0, y = 1; x < 1; ++x) {
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5;
+    }
+}
+l6: while (1 === 1) {
+    let x, y;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6;
+    }
+}
+l7: do {
+    let x, y;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7;
+    }
+} while (1 === 1);
+l8: for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8;
+    }
+}
+//===const
+l0_c: for (const x of []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0_c;
+    }
+}
+l00_c: for (const x in []) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00_c;
+    }
+}
+l1_c: for (const x = 0; x < 1;) {
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1_c;
+    }
+}
+l2_c: while (1 === 1) {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2_c;
+    }
+}
+l3_c: do {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3_c;
+    }
+} while (1 === 1);
+l4_c: for (const y = 0; y < 1;) {
+    const x = 1;
+    (function () { return x; });
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4_c;
+    }
+}
+l5_c: for (const x = 0, y = 1; x < 1;) {
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5_c;
+    }
+}
+l6_c: while (1 === 1) {
+    const x = 1, y = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6_c;
+    }
+}
+l7_c: do {
+    const x = 1, y = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7_c;
+    }
+} while (1 === 1);
+l8_c: for (const y = 0; y < 1;) {
+    const x = 1;
+    (function () { return x + y; });
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8_c;
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop7_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop7_ES6.symbols
new file mode 100644
index 00000000000..51131f421ba
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop7_ES6.symbols
@@ -0,0 +1,698 @@
+=== tests/cases/compiler/capturedLetConstInLoop7_ES6.ts ===
+//===let
+l0:
+for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+        break l0;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 2, 8))
+
+        continue l0;
+    }
+}
+
+l00:
+for (let x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+        break l00;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 20, 8))
+
+        continue l00;
+    }
+}
+
+l1:
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+        break l1;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 38, 8))
+
+        continue l1;
+    }
+}
+
+l2:
+while (1 === 1) {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+        break l2;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 57, 7))
+
+        continue l2;
+    }
+}
+
+l3:
+do {
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+        break l3;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 76, 7))
+
+        continue l3;
+    }
+} while (1 === 1)
+
+l4:
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 94, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 94, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 94, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+        break l4;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 95, 7))
+
+        continue l4;
+    }
+}
+
+l5:
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 113, 15))
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 113, 15))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 113, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+
+        break l5;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 113, 8))
+
+        continue l5;
+    }
+}
+
+l6:
+while (1 === 1) {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 132, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 132, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 132, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+
+        break l6;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 132, 7))
+
+        continue l6;
+    }
+
+}
+
+l7:
+do {
+    let x, y;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 152, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 152, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 152, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+
+        break l7;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 152, 7))
+
+        continue l7;
+    }
+} while (1 === 1)
+
+l8:
+for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 170, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 170, 8))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 170, 8))
+
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 170, 8))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 170, 8))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+
+        break l8;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 171, 7))
+
+        continue l8;
+    }
+}
+
+//===const
+l0_c:
+for (const x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+        break l0_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 190, 10))
+
+        continue l0_c;
+    }
+}
+
+l00_c:
+for (const x in []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+        break l00_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 208, 10))
+
+        continue l00_c;
+    }
+}
+
+l1_c:
+for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+        break l1_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 226, 10))
+
+        continue l1_c;
+    }
+}
+
+l2_c:
+while (1 === 1) {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+        break l2_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 245, 9))
+
+        continue l2_c;
+    }
+}
+
+l3_c:
+do {
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+        break l3_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 264, 9))
+
+        continue l3_c;
+    }
+} while (1 === 1)
+
+l4_c:
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 282, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 282, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+    (function() { return x});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+    (() => x);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+        break l4_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 283, 9))
+
+        continue l4_c;
+    }
+}
+
+l5_c:
+for (const x = 0, y = 1; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 301, 17))
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 301, 17))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 301, 17))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+
+        break l5_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 301, 10))
+
+        continue l5_c;
+    }
+}
+
+l6_c:
+while (1 === 1) {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 320, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 320, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 320, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+
+        break l6_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 320, 9))
+
+        continue l6_c;
+    }
+
+}
+
+l7_c:
+do {
+    const x = 1, y = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 340, 16))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 340, 16))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 340, 16))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+
+        break l7_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 340, 9))
+
+        continue l7_c;
+    }
+} while (1 === 1)
+
+l8_c:
+for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 358, 10))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 358, 10))
+
+    const x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+
+    (function() { return x + y});
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 358, 10))
+
+    (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+>y : Symbol(y, Decl(capturedLetConstInLoop7_ES6.ts, 358, 10))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+
+        break;
+    }
+    if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+
+        break l8_c;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+
+        continue;
+    }
+    if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop7_ES6.ts, 359, 9))
+
+        continue l8_c;
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop7_ES6.types b/tests/baselines/reference/capturedLetConstInLoop7_ES6.types
new file mode 100644
index 00000000000..56573fb4927
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop7_ES6.types
@@ -0,0 +1,1106 @@
+=== tests/cases/compiler/capturedLetConstInLoop7_ES6.ts ===
+//===let
+l0:
+>l0 : any
+
+for (let x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l0;
+>l0 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l0;
+>l0 : any
+    }
+}
+
+l00:
+>l00 : any
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l00;
+>l00 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l00;
+>l00 : any
+    }
+}
+
+l1:
+>l1 : any
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l1;
+>l1 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l1;
+>l1 : any
+    }
+}
+
+l2:
+>l2 : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l2;
+>l2 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l2;
+>l2 : any
+    }
+}
+
+l3:
+>l3 : any
+
+do {
+    let x;
+>x : any
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l3;
+>l3 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l3;
+>l3 : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l4:
+>l4 : any
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l4;
+>l4 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l4;
+>l4 : any
+    }
+}
+
+l5:
+>l5 : any
+
+for (let x = 0, y = 1; x < 1; ++x) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l5;
+>l5 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l5;
+>l5 : any
+    }
+}
+
+l6:
+>l6 : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l6;
+>l6 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l6;
+>l6 : any
+    }
+
+}
+
+l7:
+>l7 : any
+
+do {
+    let x, y;
+>x : any
+>y : any
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => any
+>function() { return x + y} : () => any
+>x + y : any
+>x : any
+>y : any
+
+    (() => x + y);
+>(() => x + y) : () => any
+>() => x + y : () => any
+>x + y : any
+>x : any
+>y : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l7;
+>l7 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l7;
+>l7 : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l8:
+>l8 : any
+
+for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+    let x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l8;
+>l8 : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l8;
+>l8 : any
+    }
+}
+
+//===const
+l0_c:
+>l0_c : any
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l0_c;
+>l0_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l0_c;
+>l0_c : any
+    }
+}
+
+l00_c:
+>l00_c : any
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    (function() { return x});
+>(function() { return x}) : () => any
+>function() { return x} : () => any
+>x : any
+
+    (() => x);
+>(() => x) : () => any
+>() => x : () => any
+>x : any
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : any
+>1 : number
+
+        break l00_c;
+>l00_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : any
+>2 : number
+
+        continue l00_c;
+>l00_c : any
+    }
+}
+
+l1_c:
+>l1_c : any
+
+for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l1_c;
+>l1_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l1_c;
+>l1_c : any
+    }
+}
+
+l2_c:
+>l2_c : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l2_c;
+>l2_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l2_c;
+>l2_c : any
+    }
+}
+
+l3_c:
+>l3_c : any
+
+do {
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l3_c;
+>l3_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l3_c;
+>l3_c : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l4_c:
+>l4_c : any
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x});
+>(function() { return x}) : () => number
+>function() { return x} : () => number
+>x : number
+
+    (() => x);
+>(() => x) : () => number
+>() => x : () => number
+>x : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l4_c;
+>l4_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l4_c;
+>l4_c : any
+    }
+}
+
+l5_c:
+>l5_c : any
+
+for (const x = 0, y = 1; x < 1;) {
+>x : number
+>0 : number
+>y : number
+>1 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l5_c;
+>l5_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l5_c;
+>l5_c : any
+    }
+}
+
+l6_c:
+>l6_c : any
+
+while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l6_c;
+>l6_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l6_c;
+>l6_c : any
+    }
+
+}
+
+l7_c:
+>l7_c : any
+
+do {
+    const x = 1, y = 1;
+>x : number
+>1 : number
+>y : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l7_c;
+>l7_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l7_c;
+>l7_c : any
+    }
+} while (1 === 1)
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+l8_c:
+>l8_c : any
+
+for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+    const x = 1;
+>x : number
+>1 : number
+
+    (function() { return x + y});
+>(function() { return x + y}) : () => number
+>function() { return x + y} : () => number
+>x + y : number
+>x : number
+>y : number
+
+    (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break l8_c;
+>l8_c : any
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue;
+    }
+    if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+        continue l8_c;
+>l8_c : any
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop8.js b/tests/baselines/reference/capturedLetConstInLoop8.js
new file mode 100644
index 00000000000..b10beb7b44e
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop8.js
@@ -0,0 +1,293 @@
+//// [capturedLetConstInLoop8.ts]
+function foo() {
+    l0:
+    for (let z = 0; z < 1; ++z) {
+        l1:
+        for (let x = 0; x < 1; ++x) {
+            ll1:
+            for (let y = 0; y < 1; ++y) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+    l0:
+    for (const z = 0; z < 1;) {
+        l1:
+        for (const x = 0; x < 1;) {
+            ll1:
+            for (const y = 0; y < 1;) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+
+
+//// [capturedLetConstInLoop8.js]
+function foo() {
+    l0: for (var z = 0; z < 1; ++z) {
+        var _loop_1 = function(x) {
+            var _loop_2 = function(y) {
+                (function () { return x + y; });
+                (function () { return x + y; });
+                if (y == 1) {
+                    return "break";
+                }
+                if (y == 1) {
+                    return "break-l1";
+                }
+                if (y == 1) {
+                    return "break-ll1";
+                }
+                if (y == 1) {
+                    return "continue-l0";
+                }
+                if (x == 2) {
+                    return "continue";
+                }
+                if (x == 2) {
+                    return "continue-l1";
+                }
+                if (x == 2) {
+                    return "continue-ll1";
+                }
+                if (x == 2) {
+                    return { value: "123" };
+                }
+                if (x == 3) {
+                    return { value: void 0 };
+                }
+            };
+            ll1: for (var y = 0; y < 1; ++y) {
+                var state_1 = _loop_2(y);
+                if (typeof state_1 === "object") return state_1;
+                if (state_1 === "break") break;
+                if (state_1 === "continue") continue;
+                switch(state_1) {
+                    case "break-l1": return state_1;
+                    case "break-ll1": break ll1;
+                    case "continue-l0": return state_1;
+                    case "continue-l1": return state_1;
+                    case "continue-ll1": continue ll1;
+                }
+            }
+            if (x == 1) {
+                return "break";
+            }
+            if (x == 1) {
+                return "break-l1";
+            }
+            if (x == 2) {
+                return "continue";
+            }
+            if (x == 2) {
+                return "continue-l1";
+            }
+            if (x == 2) {
+                return "continue-l0";
+            }
+            if (x == 2) {
+                return { value: "456" };
+            }
+            if (x == 3) {
+                return { value: void 0 };
+            }
+        };
+        l1: for (var x = 0; x < 1; ++x) {
+            var state_2 = _loop_1(x);
+            if (typeof state_2 === "object") return state_2.value
+            if (state_2 === "break") break;
+            if (state_2 === "continue") continue;
+            switch(state_2) {
+                case "break-l1": break l1;
+                case "continue-l0": continue l0;
+                case "continue-l1": continue l1;
+            }
+        }
+    }
+}
+function foo_c() {
+    l0: for (var z = 0; z < 1;) {
+        var _loop_3 = function(x) {
+            var _loop_4 = function(y) {
+                (function () { return x + y; });
+                (function () { return x + y; });
+                if (y == 1) {
+                    return "break";
+                }
+                if (y == 1) {
+                    return "break-l1";
+                }
+                if (y == 1) {
+                    return "break-ll1";
+                }
+                if (y == 1) {
+                    return "continue-l0";
+                }
+                if (x == 2) {
+                    return "continue";
+                }
+                if (x == 2) {
+                    return "continue-l1";
+                }
+                if (x == 2) {
+                    return "continue-ll1";
+                }
+                if (x == 2) {
+                    return { value: "123" };
+                }
+                if (x == 3) {
+                    return { value: void 0 };
+                }
+            };
+            ll1: for (var y = 0; y < 1;) {
+                var state_3 = _loop_4(y);
+                if (typeof state_3 === "object") return state_3;
+                if (state_3 === "break") break;
+                if (state_3 === "continue") continue;
+                switch(state_3) {
+                    case "break-l1": return state_3;
+                    case "break-ll1": break ll1;
+                    case "continue-l0": return state_3;
+                    case "continue-l1": return state_3;
+                    case "continue-ll1": continue ll1;
+                }
+            }
+            if (x == 1) {
+                return "break";
+            }
+            if (x == 1) {
+                return "break-l1";
+            }
+            if (x == 2) {
+                return "continue";
+            }
+            if (x == 2) {
+                return "continue-l1";
+            }
+            if (x == 2) {
+                return "continue-l0";
+            }
+            if (x == 2) {
+                return { value: "456" };
+            }
+            if (x == 3) {
+                return { value: void 0 };
+            }
+        };
+        l1: for (var x = 0; x < 1;) {
+            var state_4 = _loop_3(x);
+            if (typeof state_4 === "object") return state_4.value
+            if (state_4 === "break") break;
+            if (state_4 === "continue") continue;
+            switch(state_4) {
+                case "break-l1": break l1;
+                case "continue-l0": continue l0;
+                case "continue-l1": continue l1;
+            }
+        }
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop8.symbols b/tests/baselines/reference/capturedLetConstInLoop8.symbols
new file mode 100644
index 00000000000..9622062c94b
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop8.symbols
@@ -0,0 +1,228 @@
+=== tests/cases/compiler/capturedLetConstInLoop8.ts ===
+function foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop8.ts, 0, 0))
+
+    l0:
+    for (let z = 0; z < 1; ++z) {
+>z : Symbol(z, Decl(capturedLetConstInLoop8.ts, 2, 12))
+>z : Symbol(z, Decl(capturedLetConstInLoop8.ts, 2, 12))
+>z : Symbol(z, Decl(capturedLetConstInLoop8.ts, 2, 12))
+
+        l1:
+        for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+            ll1:
+            for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                (function() { return x + y });
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                    break;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                    break l1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                    break ll1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 6, 20))
+
+                    continue l0;
+                }
+
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                    continue;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                    continue l1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                    continue ll1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                    return "123"
+                }
+                if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                break;
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                break l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                continue;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                continue l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                continue l0;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                return "456";
+            }
+            if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 4, 16))
+
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+>foo_c : Symbol(foo_c, Decl(capturedLetConstInLoop8.ts, 61, 1))
+
+    l0:
+    for (const z = 0; z < 1;) {
+>z : Symbol(z, Decl(capturedLetConstInLoop8.ts, 65, 14))
+>z : Symbol(z, Decl(capturedLetConstInLoop8.ts, 65, 14))
+
+        l1:
+        for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+            ll1:
+            for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                (function() { return x + y });
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                    break;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                    break l1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                    break ll1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8.ts, 69, 22))
+
+                    continue l0;
+                }
+
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                    continue;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                    continue l1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                    continue ll1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                    return "123"
+                }
+                if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                break;
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                break l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                continue;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                continue l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                continue l0;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                return "456";
+            }
+            if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8.ts, 67, 18))
+
+                return;
+            }
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop8.types b/tests/baselines/reference/capturedLetConstInLoop8.types
new file mode 100644
index 00000000000..9c3db88535c
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop8.types
@@ -0,0 +1,357 @@
+=== tests/cases/compiler/capturedLetConstInLoop8.ts ===
+function foo() {
+>foo : () => string
+
+    l0:
+>l0 : any
+
+    for (let z = 0; z < 1; ++z) {
+>z : number
+>0 : number
+>z < 1 : boolean
+>z : number
+>1 : number
+>++z : number
+>z : number
+
+        l1:
+>l1 : any
+
+        for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+            ll1:
+>ll1 : any
+
+            for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+                (function() { return x + y });
+>(function() { return x + y }) : () => number
+>function() { return x + y } : () => number
+>x + y : number
+>x : number
+>y : number
+
+                (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break;
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break l1;
+>l1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break ll1;
+>ll1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    continue l0;
+>l0 : any
+                }
+
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue;
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue l1;
+>l1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue ll1;
+>ll1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    return "123"
+>"123" : string
+                }
+                if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break;
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue;
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l0;
+>l0 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                return "456";
+>"456" : string
+            }
+            if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+>foo_c : () => string
+
+    l0:
+>l0 : any
+
+    for (const z = 0; z < 1;) {
+>z : number
+>0 : number
+>z < 1 : boolean
+>z : number
+>1 : number
+
+        l1:
+>l1 : any
+
+        for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+            ll1:
+>ll1 : any
+
+            for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+                (function() { return x + y });
+>(function() { return x + y }) : () => number
+>function() { return x + y } : () => number
+>x + y : number
+>x : number
+>y : number
+
+                (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break;
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break l1;
+>l1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break ll1;
+>ll1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    continue l0;
+>l0 : any
+                }
+
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue;
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue l1;
+>l1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue ll1;
+>ll1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    return "123"
+>"123" : string
+                }
+                if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break;
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue;
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l0;
+>l0 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                return "456";
+>"456" : string
+            }
+            if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                return;
+            }
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop8_ES6.js b/tests/baselines/reference/capturedLetConstInLoop8_ES6.js
new file mode 100644
index 00000000000..71d0ecd4c4c
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop8_ES6.js
@@ -0,0 +1,245 @@
+//// [capturedLetConstInLoop8_ES6.ts]
+function foo() {
+    l0:
+    for (let z = 0; z < 1; ++z) {
+        l1:
+        for (let x = 0; x < 1; ++x) {
+            ll1:
+            for (let y = 0; y < 1; ++y) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+    l0:
+    for (const z = 0; z < 1;) {
+        l1:
+        for (const x = 0; x < 1;) {
+            ll1:
+            for (const y = 0; y < 1;) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+
+
+//// [capturedLetConstInLoop8_ES6.js]
+function foo() {
+    l0: for (let z = 0; z < 1; ++z) {
+        l1: for (let x = 0; x < 1; ++x) {
+            ll1: for (let y = 0; y < 1; ++y) {
+                (function () { return x + y; });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123";
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+function foo_c() {
+    l0: for (const z = 0; z < 1;) {
+        l1: for (const x = 0; x < 1;) {
+            ll1: for (const y = 0; y < 1;) {
+                (function () { return x + y; });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123";
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop8_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop8_ES6.symbols
new file mode 100644
index 00000000000..01ca5f227f4
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop8_ES6.symbols
@@ -0,0 +1,228 @@
+=== tests/cases/compiler/capturedLetConstInLoop8_ES6.ts ===
+function foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop8_ES6.ts, 0, 0))
+
+    l0:
+    for (let z = 0; z < 1; ++z) {
+>z : Symbol(z, Decl(capturedLetConstInLoop8_ES6.ts, 2, 12))
+>z : Symbol(z, Decl(capturedLetConstInLoop8_ES6.ts, 2, 12))
+>z : Symbol(z, Decl(capturedLetConstInLoop8_ES6.ts, 2, 12))
+
+        l1:
+        for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+            ll1:
+            for (let y = 0; y < 1; ++y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                (function() { return x + y });
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                    break;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                    break l1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                    break ll1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 6, 20))
+
+                    continue l0;
+                }
+
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                    continue;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                    continue l1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                    continue ll1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                    return "123"
+                }
+                if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                break;
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                break l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                continue;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                continue l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                continue l0;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                return "456";
+            }
+            if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 4, 16))
+
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+>foo_c : Symbol(foo_c, Decl(capturedLetConstInLoop8_ES6.ts, 61, 1))
+
+    l0:
+    for (const z = 0; z < 1;) {
+>z : Symbol(z, Decl(capturedLetConstInLoop8_ES6.ts, 65, 14))
+>z : Symbol(z, Decl(capturedLetConstInLoop8_ES6.ts, 65, 14))
+
+        l1:
+        for (const x = 0; x < 1;) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+            ll1:
+            for (const y = 0; y < 1;) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                (function() { return x + y });
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                (() => x + y);
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                    break;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                    break l1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                    break ll1;
+                }
+                if (y == 1) {
+>y : Symbol(y, Decl(capturedLetConstInLoop8_ES6.ts, 69, 22))
+
+                    continue l0;
+                }
+
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                    continue;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                    continue l1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                    continue ll1;
+                }
+                if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                    return "123"
+                }
+                if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                break;
+            }
+            if (x == 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                break l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                continue;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                continue l1;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                continue l0;
+            }
+            if (x == 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                return "456";
+            }
+            if (x == 3) {
+>x : Symbol(x, Decl(capturedLetConstInLoop8_ES6.ts, 67, 18))
+
+                return;
+            }
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop8_ES6.types b/tests/baselines/reference/capturedLetConstInLoop8_ES6.types
new file mode 100644
index 00000000000..7911e9b63a2
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop8_ES6.types
@@ -0,0 +1,357 @@
+=== tests/cases/compiler/capturedLetConstInLoop8_ES6.ts ===
+function foo() {
+>foo : () => string
+
+    l0:
+>l0 : any
+
+    for (let z = 0; z < 1; ++z) {
+>z : number
+>0 : number
+>z < 1 : boolean
+>z : number
+>1 : number
+>++z : number
+>z : number
+
+        l1:
+>l1 : any
+
+        for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+            ll1:
+>ll1 : any
+
+            for (let y = 0; y < 1; ++y) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+>++y : number
+>y : number
+
+                (function() { return x + y });
+>(function() { return x + y }) : () => number
+>function() { return x + y } : () => number
+>x + y : number
+>x : number
+>y : number
+
+                (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break;
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break l1;
+>l1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break ll1;
+>ll1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    continue l0;
+>l0 : any
+                }
+
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue;
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue l1;
+>l1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue ll1;
+>ll1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    return "123"
+>"123" : string
+                }
+                if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break;
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue;
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l0;
+>l0 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                return "456";
+>"456" : string
+            }
+            if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+>foo_c : () => string
+
+    l0:
+>l0 : any
+
+    for (const z = 0; z < 1;) {
+>z : number
+>0 : number
+>z < 1 : boolean
+>z : number
+>1 : number
+
+        l1:
+>l1 : any
+
+        for (const x = 0; x < 1;) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+
+            ll1:
+>ll1 : any
+
+            for (const y = 0; y < 1;) {
+>y : number
+>0 : number
+>y < 1 : boolean
+>y : number
+>1 : number
+
+                (function() { return x + y });
+>(function() { return x + y }) : () => number
+>function() { return x + y } : () => number
+>x + y : number
+>x : number
+>y : number
+
+                (() => x + y);
+>(() => x + y) : () => number
+>() => x + y : () => number
+>x + y : number
+>x : number
+>y : number
+
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break;
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break l1;
+>l1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    break ll1;
+>ll1 : any
+                }
+                if (y == 1) {
+>y == 1 : boolean
+>y : number
+>1 : number
+
+                    continue l0;
+>l0 : any
+                }
+
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue;
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue l1;
+>l1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    continue ll1;
+>ll1 : any
+                }
+                if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                    return "123"
+>"123" : string
+                }
+                if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                    return;
+                }
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break;
+            }
+            if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+                break l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue;
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l1;
+>l1 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                continue l0;
+>l0 : any
+            }
+            if (x == 2) {
+>x == 2 : boolean
+>x : number
+>2 : number
+
+                return "456";
+>"456" : string
+            }
+            if (x == 3) {
+>x == 3 : boolean
+>x : number
+>3 : number
+
+                return;
+            }
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js
new file mode 100644
index 00000000000..93aef628f8a
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop9.js
@@ -0,0 +1,295 @@
+//// [capturedLetConstInLoop9.ts]
+for (let x = 0; x < 1; ++x) {
+    let x;
+    (function() { return x });
+    {
+        let x;
+        (function() { return x });
+    }
+
+    try { }
+    catch (e) {
+        let x;
+        (function() { return x });
+    }
+
+    switch (x) {
+        case 1:
+            let x;
+            (function() { return x });
+           break;
+    }
+    
+    while (1 == 1) {
+        let x;
+        (function() { return x });
+    }
+    
+    class A {
+        m() {
+            return x + 1;
+        }
+    }
+}
+
+declare function use(a: any);
+
+function foo() {
+    l0:
+    for (let a of []) {
+        
+        if (a === 1) {
+            break;
+        }
+        
+        if (a === 2) {
+            break l0;
+        }
+        
+        for (let b of []) {
+            var [{x, y:z}] = [{x:1, y:2}];
+            if (b === 1) {
+                break;
+            }
+            
+            
+            if (b === 2) {
+                break l0;
+            }
+            
+            l1:
+            if (b === 3) {
+                break l1;
+            }
+            
+            return 50;
+        }
+
+        for (let b of []) {
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+            if (b === 1) {
+                break;
+            }
+            
+            if (b === 2) {
+                break l0;
+            }
+            
+            () => b
+            return 100;
+        }
+
+        
+        () => a;
+    }
+    
+    use(x);
+    use(z);
+    use(x1);
+    use(z1);
+}
+
+function foo2() {
+    for (let x of []) {
+        if (x === 1) {
+            break;
+        }
+        else if (x === 2) {
+            continue;
+        }
+        
+        while (1 === 1) {
+            if (x) {
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+            case 1: break;
+            case 2: continue;
+        }
+        
+        for (let y of []) {
+            switch(y) {
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+
+class C {
+    constructor(private N: number) { }
+    foo() {
+        for (let i = 0; i < 100; i++) {
+            let f = () => this.N * i;
+        }
+    }
+}
+
+function foo3 () {
+    let x = arguments.length;
+    for (let y of []) {
+        let z = arguments.length;
+        (function() { return y + z + arguments.length; });
+    }
+}
+
+//// [capturedLetConstInLoop9.js]
+var _loop_1 = function(x) {
+    var x_1 = void 0;
+    (function () { return x_1; });
+    {
+        var x_2 = void 0;
+        (function () { return x_2; });
+    }
+    try { }
+    catch (e) {
+        var x_3 = void 0;
+        (function () { return x_3; });
+    }
+    switch (x_1) {
+        case 1:
+            var x_4 = void 0;
+            (function () { return x_4; });
+            break;
+    }
+    var _loop_2 = function() {
+        var x_5 = void 0;
+        (function () { return x_5; });
+    };
+    while (1 == 1) {
+        _loop_2();
+    }
+    var A = (function () {
+        function A() {
+        }
+        A.prototype.m = function () {
+            return x_1 + 1;
+        };
+        return A;
+    })();
+};
+for (var x = 0; x < 1; ++x) {
+    _loop_1(x);
+}
+function foo() {
+    var _loop_3 = function(a) {
+        if (a === 1) {
+            return "break";
+        }
+        if (a === 2) {
+            return "break-l0";
+        }
+        for (var _i = 0, _a = []; _i < _a.length; _i++) {
+            var b = _a[_i];
+            _b = [{ x: 1, y: 2 }][0], x = _b.x, z = _b.y;
+            if (b === 1) {
+                break;
+            }
+            if (b === 2) {
+                return "break-l0";
+            }
+            l1: if (b === 3) {
+                break l1;
+            }
+            return { value: 50 };
+        }
+        var _loop_4 = function(b) {
+            _c = [{ x1: 1, y: arguments_1.length }][0], x1 = _c.x1, z1 = _c.y;
+            if (b === 1) {
+                return "break";
+            }
+            if (b === 2) {
+                return "break-l0";
+            }
+            (function () { return b; });
+            return { value: 100 };
+        };
+        for (var _d = 0, _e = []; _d < _e.length; _d++) {
+            var b = _e[_d];
+            var state_3 = _loop_4(b);
+            if (typeof state_3 === "object") return state_3;
+            if (state_3 === "break") break;
+            switch(state_3) {
+                case "break-l0": return state_3;
+            }
+        }
+        (function () { return a; });
+    };
+    var arguments_1 = arguments;
+    var x, z, x1, z1;
+    l0: for (var _f = 0, _g = []; _f < _g.length; _f++) {
+        var a = _g[_f];
+        var state_4 = _loop_3(a);
+        if (typeof state_4 === "object") return state_4.value
+        if (state_4 === "break") break;
+        switch(state_4) {
+            case "break-l0": break l0;
+        }
+    }
+    use(x);
+    use(z);
+    use(x1);
+    use(z1);
+}
+function foo2() {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var x = _a[_i];
+        if (x === 1) {
+            break;
+        }
+        else if (x === 2) {
+            continue;
+        }
+        while (1 === 1) {
+            if (x) {
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        switch (x) {
+            case 1: break;
+            case 2: continue;
+        }
+        for (var _b = 0, _c = []; _b < _c.length; _b++) {
+            var y = _c[_b];
+            switch (y) {
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+var C = (function () {
+    function C(N) {
+        this.N = N;
+    }
+    C.prototype.foo = function () {
+        var _this = this;
+        var _loop_5 = function(i) {
+            var f = function () { return _this.N * i; };
+        };
+        for (var i = 0; i < 100; i++) {
+            _loop_5(i);
+        }
+    };
+    return C;
+})();
+function foo3() {
+    var x = arguments.length;
+    var _loop_6 = function(y) {
+        var z = arguments_2.length;
+        (function () { return y + z + arguments.length; });
+    };
+    var arguments_2 = arguments;
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var y = _a[_i];
+        _loop_6(y);
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.symbols b/tests/baselines/reference/capturedLetConstInLoop9.symbols
new file mode 100644
index 00000000000..37d1764b41b
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop9.symbols
@@ -0,0 +1,270 @@
+=== tests/cases/compiler/capturedLetConstInLoop9.ts ===
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 0, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 0, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 0, 8))
+
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 1, 7))
+
+    (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 1, 7))
+    {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 4, 11))
+
+        (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 4, 11))
+    }
+
+    try { }
+    catch (e) {
+>e : Symbol(e, Decl(capturedLetConstInLoop9.ts, 9, 11))
+
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 10, 11))
+
+        (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 10, 11))
+    }
+
+    switch (x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 1, 7))
+
+        case 1:
+            let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 16, 15))
+
+            (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 16, 15))
+
+           break;
+    }
+    
+    while (1 == 1) {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 22, 11))
+
+        (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 22, 11))
+    }
+    
+    class A {
+>A : Symbol(A, Decl(capturedLetConstInLoop9.ts, 24, 5))
+
+        m() {
+>m : Symbol(m, Decl(capturedLetConstInLoop9.ts, 26, 13))
+
+            return x + 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 1, 7))
+        }
+    }
+}
+
+declare function use(a: any);
+>use : Symbol(use, Decl(capturedLetConstInLoop9.ts, 31, 1))
+>a : Symbol(a, Decl(capturedLetConstInLoop9.ts, 33, 21))
+
+function foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop9.ts, 33, 29))
+
+    l0:
+    for (let a of []) {
+>a : Symbol(a, Decl(capturedLetConstInLoop9.ts, 37, 12))
+        
+        if (a === 1) {
+>a : Symbol(a, Decl(capturedLetConstInLoop9.ts, 37, 12))
+
+            break;
+        }
+        
+        if (a === 2) {
+>a : Symbol(a, Decl(capturedLetConstInLoop9.ts, 37, 12))
+
+            break l0;
+        }
+        
+        for (let b of []) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 47, 16))
+
+            var [{x, y:z}] = [{x:1, y:2}];
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 48, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 48, 35))
+>z : Symbol(z, Decl(capturedLetConstInLoop9.ts, 48, 20))
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 48, 31))
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 48, 35))
+
+            if (b === 1) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 47, 16))
+
+                break;
+            }
+            
+            
+            if (b === 2) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 47, 16))
+
+                break l0;
+            }
+            
+            l1:
+            if (b === 3) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 47, 16))
+
+                break l1;
+            }
+            
+            return 50;
+        }
+
+        for (let b of []) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 66, 16))
+
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+>x1 : Symbol(x1, Decl(capturedLetConstInLoop9.ts, 67, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 67, 38))
+>z1 : Symbol(z1, Decl(capturedLetConstInLoop9.ts, 67, 21))
+>x1 : Symbol(x1, Decl(capturedLetConstInLoop9.ts, 67, 33))
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 67, 38))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+            if (b === 1) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 66, 16))
+
+                break;
+            }
+            
+            if (b === 2) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 66, 16))
+
+                break l0;
+            }
+            
+            () => b
+>b : Symbol(b, Decl(capturedLetConstInLoop9.ts, 66, 16))
+
+            return 100;
+        }
+
+        
+        () => a;
+>a : Symbol(a, Decl(capturedLetConstInLoop9.ts, 37, 12))
+    }
+    
+    use(x);
+>use : Symbol(use, Decl(capturedLetConstInLoop9.ts, 31, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 48, 18))
+
+    use(z);
+>use : Symbol(use, Decl(capturedLetConstInLoop9.ts, 31, 1))
+>z : Symbol(z, Decl(capturedLetConstInLoop9.ts, 48, 20))
+
+    use(x1);
+>use : Symbol(use, Decl(capturedLetConstInLoop9.ts, 31, 1))
+>x1 : Symbol(x1, Decl(capturedLetConstInLoop9.ts, 67, 18))
+
+    use(z1);
+>use : Symbol(use, Decl(capturedLetConstInLoop9.ts, 31, 1))
+>z1 : Symbol(z1, Decl(capturedLetConstInLoop9.ts, 67, 21))
+}
+
+function foo2() {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop9.ts, 88, 1))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 91, 12))
+
+        if (x === 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 91, 12))
+
+            break;
+        }
+        else if (x === 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 91, 12))
+
+            continue;
+        }
+        
+        while (1 === 1) {
+            if (x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 91, 12))
+
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 91, 12))
+
+            case 1: break;
+            case 2: continue;
+        }
+        
+        for (let y of []) {
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 113, 16))
+
+            switch(y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 113, 16))
+
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+
+class C {
+>C : Symbol(C, Decl(capturedLetConstInLoop9.ts, 120, 1))
+
+    constructor(private N: number) { }
+>N : Symbol(N, Decl(capturedLetConstInLoop9.ts, 123, 16))
+
+    foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop9.ts, 123, 38))
+
+        for (let i = 0; i < 100; i++) {
+>i : Symbol(i, Decl(capturedLetConstInLoop9.ts, 125, 16))
+>i : Symbol(i, Decl(capturedLetConstInLoop9.ts, 125, 16))
+>i : Symbol(i, Decl(capturedLetConstInLoop9.ts, 125, 16))
+
+            let f = () => this.N * i;
+>f : Symbol(f, Decl(capturedLetConstInLoop9.ts, 126, 15))
+>this.N : Symbol(N, Decl(capturedLetConstInLoop9.ts, 123, 16))
+>this : Symbol(C, Decl(capturedLetConstInLoop9.ts, 120, 1))
+>N : Symbol(N, Decl(capturedLetConstInLoop9.ts, 123, 16))
+>i : Symbol(i, Decl(capturedLetConstInLoop9.ts, 125, 16))
+        }
+    }
+}
+
+function foo3 () {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop9.ts, 129, 1))
+
+    let x = arguments.length;
+>x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 132, 7))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+    for (let y of []) {
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 133, 12))
+
+        let z = arguments.length;
+>z : Symbol(z, Decl(capturedLetConstInLoop9.ts, 134, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return y + z + arguments.length; });
+>y : Symbol(y, Decl(capturedLetConstInLoop9.ts, 133, 12))
+>z : Symbol(z, Decl(capturedLetConstInLoop9.ts, 134, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.types b/tests/baselines/reference/capturedLetConstInLoop9.types
new file mode 100644
index 00000000000..7f793ab6601
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop9.types
@@ -0,0 +1,359 @@
+=== tests/cases/compiler/capturedLetConstInLoop9.ts ===
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    let x;
+>x : any
+
+    (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    {
+        let x;
+>x : any
+
+        (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    }
+
+    try { }
+    catch (e) {
+>e : any
+
+        let x;
+>x : any
+
+        (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    }
+
+    switch (x) {
+>x : any
+
+        case 1:
+>1 : number
+
+            let x;
+>x : any
+
+            (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+
+           break;
+    }
+    
+    while (1 == 1) {
+>1 == 1 : boolean
+>1 : number
+>1 : number
+
+        let x;
+>x : any
+
+        (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    }
+    
+    class A {
+>A : A
+
+        m() {
+>m : () => any
+
+            return x + 1;
+>x + 1 : any
+>x : any
+>1 : number
+        }
+    }
+}
+
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+function foo() {
+>foo : () => number
+
+    l0:
+>l0 : any
+
+    for (let a of []) {
+>a : any
+>[] : undefined[]
+        
+        if (a === 1) {
+>a === 1 : boolean
+>a : any
+>1 : number
+
+            break;
+        }
+        
+        if (a === 2) {
+>a === 2 : boolean
+>a : any
+>2 : number
+
+            break l0;
+>l0 : any
+        }
+        
+        for (let b of []) {
+>b : any
+>[] : undefined[]
+
+            var [{x, y:z}] = [{x:1, y:2}];
+>x : number
+>y : any
+>z : number
+>[{x:1, y:2}] : [{ x: number; y: number; }]
+>{x:1, y:2} : { x: number; y: number; }
+>x : number
+>1 : number
+>y : number
+>2 : number
+
+            if (b === 1) {
+>b === 1 : boolean
+>b : any
+>1 : number
+
+                break;
+            }
+            
+            
+            if (b === 2) {
+>b === 2 : boolean
+>b : any
+>2 : number
+
+                break l0;
+>l0 : any
+            }
+            
+            l1:
+>l1 : any
+
+            if (b === 3) {
+>b === 3 : boolean
+>b : any
+>3 : number
+
+                break l1;
+>l1 : any
+            }
+            
+            return 50;
+>50 : number
+        }
+
+        for (let b of []) {
+>b : any
+>[] : undefined[]
+
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+>x1 : number
+>y : any
+>z1 : number
+>[{x1:1, y:arguments.length}] : [{ x1: number; y: number; }]
+>{x1:1, y:arguments.length} : { x1: number; y: number; }
+>x1 : number
+>1 : number
+>y : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+            if (b === 1) {
+>b === 1 : boolean
+>b : any
+>1 : number
+
+                break;
+            }
+            
+            if (b === 2) {
+>b === 2 : boolean
+>b : any
+>2 : number
+
+                break l0;
+>l0 : any
+            }
+            
+            () => b
+>() => b : () => any
+>b : any
+
+            return 100;
+>100 : number
+        }
+
+        
+        () => a;
+>() => a : () => any
+>a : any
+    }
+    
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : number
+
+    use(z);
+>use(z) : any
+>use : (a: any) => any
+>z : number
+
+    use(x1);
+>use(x1) : any
+>use : (a: any) => any
+>x1 : number
+
+    use(z1);
+>use(z1) : any
+>use : (a: any) => any
+>z1 : number
+}
+
+function foo2() {
+>foo2 : () => void
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        if (x === 1) {
+>x === 1 : boolean
+>x : any
+>1 : number
+
+            break;
+        }
+        else if (x === 2) {
+>x === 2 : boolean
+>x : any
+>2 : number
+
+            continue;
+        }
+        
+        while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+            if (x) {
+>x : any
+
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+>x : any
+
+            case 1: break;
+>1 : number
+
+            case 2: continue;
+>2 : number
+        }
+        
+        for (let y of []) {
+>y : any
+>[] : undefined[]
+
+            switch(y) {
+>y : any
+
+                case 1: break;
+>1 : number
+
+                case 2: continue;
+>2 : number
+            }
+        }
+    }
+}
+
+class C {
+>C : C
+
+    constructor(private N: number) { }
+>N : number
+
+    foo() {
+>foo : () => void
+
+        for (let i = 0; i < 100; i++) {
+>i : number
+>0 : number
+>i < 100 : boolean
+>i : number
+>100 : number
+>i++ : number
+>i : number
+
+            let f = () => this.N * i;
+>f : () => number
+>() => this.N * i : () => number
+>this.N * i : number
+>this.N : number
+>this : this
+>N : number
+>i : number
+        }
+    }
+}
+
+function foo3 () {
+>foo3 : () => void
+
+    let x = arguments.length;
+>x : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+    for (let y of []) {
+>y : any
+>[] : undefined[]
+
+        let z = arguments.length;
+>z : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return y + z + arguments.length; });
+>(function() { return y + z + arguments.length; }) : () => any
+>function() { return y + z + arguments.length; } : () => any
+>y + z + arguments.length : any
+>y + z : any
+>y : any
+>z : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop9_ES6.js b/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
new file mode 100644
index 00000000000..0c9d8ea6a68
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
@@ -0,0 +1,253 @@
+//// [capturedLetConstInLoop9_ES6.ts]
+
+for (let x = 0; x < 1; ++x) {
+    let x;
+    (function() { return x });
+    {
+        let x;
+        (function() { return x });
+    }
+
+    try { }
+    catch (e) {
+        let x;
+        (function() { return x });
+    }
+
+    switch (x) {
+        case 1:
+            let x;
+            (function() { return x });
+           break;
+    }
+    
+    while (1 == 1) {
+        let x;
+        (function() { return x });
+    }
+    
+    class A {
+        m() {
+            return x + 1;
+        }
+    }
+}
+
+declare function use(a: any);
+
+function foo() {
+    l0:
+    for (let a of []) {
+        
+        if (a === 1) {
+            break;
+        }
+        
+        if (a === 2) {
+            break l0;
+        }
+        
+        for (let b of []) {
+            var [{x, y:z}] = [{x:1, y:2}];
+            if (b === 1) {
+                break;
+            }
+            
+            
+            if (b === 2) {
+                break l0;
+            }
+            
+            l1:
+            if (b === 3) {
+                break l1;
+            }
+            
+            return 50;
+        }
+
+        for (let b of []) {
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+            if (b === 1) {
+                break;
+            }
+            
+            if (b === 2) {
+                break l0;
+            }
+            () => b
+            return 100;
+        }
+
+        
+        () => a;
+    }
+    
+    use(x);
+    use(z);
+    use(x1);
+    use(z1);
+}
+
+function foo2() {
+    for (let x of []) {
+        if (x === 1) {
+            break;
+        }
+        else if (x === 2) {
+            continue;
+        }
+        
+        while (1 === 1) {
+            if (x) {
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+            case 1: break;
+            case 2: continue;
+        }
+        
+        for (let y of []) {
+            switch(y) {
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+
+class C {
+    constructor(private N: number) { }
+    foo() {
+        for (let i = 0; i < 100; i++) {
+            let f = () => this.N * i;
+        }
+    }
+}
+
+function foo3 () {
+    let x = arguments.length;
+    for (let y of []) {
+        let z = arguments.length;
+        (function() { return y + z + arguments.length; });
+    }
+}
+
+//// [capturedLetConstInLoop9_ES6.js]
+for (let x = 0; x < 1; ++x) {
+    let x;
+    (function () { return x; });
+    {
+        let x;
+        (function () { return x; });
+    }
+    try { }
+    catch (e) {
+        let x;
+        (function () { return x; });
+    }
+    switch (x) {
+        case 1:
+            let x;
+            (function () { return x; });
+            break;
+    }
+    while (1 == 1) {
+        let x;
+        (function () { return x; });
+    }
+    class A {
+        m() {
+            return x + 1;
+        }
+    }
+}
+function foo() {
+    l0: for (let a of []) {
+        if (a === 1) {
+            break;
+        }
+        if (a === 2) {
+            break l0;
+        }
+        for (let b of []) {
+            var [{ x, y: z }] = [{ x: 1, y: 2 }];
+            if (b === 1) {
+                break;
+            }
+            if (b === 2) {
+                break l0;
+            }
+            l1: if (b === 3) {
+                break l1;
+            }
+            return 50;
+        }
+        for (let b of []) {
+            var [{ x1, y: z1 }] = [{ x1: 1, y: arguments.length }];
+            if (b === 1) {
+                break;
+            }
+            if (b === 2) {
+                break l0;
+            }
+            (() => b);
+            return 100;
+        }
+        (() => a);
+    }
+    use(x);
+    use(z);
+    use(x1);
+    use(z1);
+}
+function foo2() {
+    for (let x of []) {
+        if (x === 1) {
+            break;
+        }
+        else if (x === 2) {
+            continue;
+        }
+        while (1 === 1) {
+            if (x) {
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        switch (x) {
+            case 1: break;
+            case 2: continue;
+        }
+        for (let y of []) {
+            switch (y) {
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+class C {
+    constructor(N) {
+        this.N = N;
+    }
+    foo() {
+        for (let i = 0; i < 100; i++) {
+            let f = () => this.N * i;
+        }
+    }
+}
+function foo3() {
+    let x = arguments.length;
+    for (let y of []) {
+        let z = arguments.length;
+        (function () { return y + z + arguments.length; });
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop9_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop9_ES6.symbols
new file mode 100644
index 00000000000..d71a20afe47
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.symbols
@@ -0,0 +1,270 @@
+=== tests/cases/compiler/capturedLetConstInLoop9_ES6.ts ===
+
+for (let x = 0; x < 1; ++x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 1, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 1, 8))
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 1, 8))
+
+    let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 2, 7))
+
+    (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 2, 7))
+    {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 5, 11))
+
+        (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 5, 11))
+    }
+
+    try { }
+    catch (e) {
+>e : Symbol(e, Decl(capturedLetConstInLoop9_ES6.ts, 10, 11))
+
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 11, 11))
+
+        (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 11, 11))
+    }
+
+    switch (x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 2, 7))
+
+        case 1:
+            let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 17, 15))
+
+            (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 17, 15))
+
+           break;
+    }
+    
+    while (1 == 1) {
+        let x;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 23, 11))
+
+        (function() { return x });
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 23, 11))
+    }
+    
+    class A {
+>A : Symbol(A, Decl(capturedLetConstInLoop9_ES6.ts, 25, 5))
+
+        m() {
+>m : Symbol(m, Decl(capturedLetConstInLoop9_ES6.ts, 27, 13))
+
+            return x + 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 2, 7))
+        }
+    }
+}
+
+declare function use(a: any);
+>use : Symbol(use, Decl(capturedLetConstInLoop9_ES6.ts, 32, 1))
+>a : Symbol(a, Decl(capturedLetConstInLoop9_ES6.ts, 34, 21))
+
+function foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop9_ES6.ts, 34, 29))
+
+    l0:
+    for (let a of []) {
+>a : Symbol(a, Decl(capturedLetConstInLoop9_ES6.ts, 38, 12))
+        
+        if (a === 1) {
+>a : Symbol(a, Decl(capturedLetConstInLoop9_ES6.ts, 38, 12))
+
+            break;
+        }
+        
+        if (a === 2) {
+>a : Symbol(a, Decl(capturedLetConstInLoop9_ES6.ts, 38, 12))
+
+            break l0;
+        }
+        
+        for (let b of []) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 48, 16))
+
+            var [{x, y:z}] = [{x:1, y:2}];
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 49, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 49, 35))
+>z : Symbol(z, Decl(capturedLetConstInLoop9_ES6.ts, 49, 20))
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 49, 31))
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 49, 35))
+
+            if (b === 1) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 48, 16))
+
+                break;
+            }
+            
+            
+            if (b === 2) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 48, 16))
+
+                break l0;
+            }
+            
+            l1:
+            if (b === 3) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 48, 16))
+
+                break l1;
+            }
+            
+            return 50;
+        }
+
+        for (let b of []) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 67, 16))
+
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+>x1 : Symbol(x1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 18))
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 68, 38))
+>z1 : Symbol(z1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 21))
+>x1 : Symbol(x1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 33))
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 68, 38))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+            if (b === 1) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 67, 16))
+
+                break;
+            }
+            
+            if (b === 2) {
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 67, 16))
+
+                break l0;
+            }
+            () => b
+>b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 67, 16))
+
+            return 100;
+        }
+
+        
+        () => a;
+>a : Symbol(a, Decl(capturedLetConstInLoop9_ES6.ts, 38, 12))
+    }
+    
+    use(x);
+>use : Symbol(use, Decl(capturedLetConstInLoop9_ES6.ts, 32, 1))
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 49, 18))
+
+    use(z);
+>use : Symbol(use, Decl(capturedLetConstInLoop9_ES6.ts, 32, 1))
+>z : Symbol(z, Decl(capturedLetConstInLoop9_ES6.ts, 49, 20))
+
+    use(x1);
+>use : Symbol(use, Decl(capturedLetConstInLoop9_ES6.ts, 32, 1))
+>x1 : Symbol(x1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 18))
+
+    use(z1);
+>use : Symbol(use, Decl(capturedLetConstInLoop9_ES6.ts, 32, 1))
+>z1 : Symbol(z1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 21))
+}
+
+function foo2() {
+>foo2 : Symbol(foo2, Decl(capturedLetConstInLoop9_ES6.ts, 88, 1))
+
+    for (let x of []) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 91, 12))
+
+        if (x === 1) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 91, 12))
+
+            break;
+        }
+        else if (x === 2) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 91, 12))
+
+            continue;
+        }
+        
+        while (1 === 1) {
+            if (x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 91, 12))
+
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 91, 12))
+
+            case 1: break;
+            case 2: continue;
+        }
+        
+        for (let y of []) {
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 113, 16))
+
+            switch(y) {
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 113, 16))
+
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+
+class C {
+>C : Symbol(C, Decl(capturedLetConstInLoop9_ES6.ts, 120, 1))
+
+    constructor(private N: number) { }
+>N : Symbol(N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
+
+    foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop9_ES6.ts, 123, 38))
+
+        for (let i = 0; i < 100; i++) {
+>i : Symbol(i, Decl(capturedLetConstInLoop9_ES6.ts, 125, 16))
+>i : Symbol(i, Decl(capturedLetConstInLoop9_ES6.ts, 125, 16))
+>i : Symbol(i, Decl(capturedLetConstInLoop9_ES6.ts, 125, 16))
+
+            let f = () => this.N * i;
+>f : Symbol(f, Decl(capturedLetConstInLoop9_ES6.ts, 126, 15))
+>this.N : Symbol(N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
+>this : Symbol(C, Decl(capturedLetConstInLoop9_ES6.ts, 120, 1))
+>N : Symbol(N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
+>i : Symbol(i, Decl(capturedLetConstInLoop9_ES6.ts, 125, 16))
+        }
+    }
+}
+
+function foo3 () {
+>foo3 : Symbol(foo3, Decl(capturedLetConstInLoop9_ES6.ts, 129, 1))
+
+    let x = arguments.length;
+>x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 132, 7))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+    for (let y of []) {
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 133, 12))
+
+        let z = arguments.length;
+>z : Symbol(z, Decl(capturedLetConstInLoop9_ES6.ts, 134, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+
+        (function() { return y + z + arguments.length; });
+>y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 133, 12))
+>z : Symbol(z, Decl(capturedLetConstInLoop9_ES6.ts, 134, 11))
+>arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments : Symbol(arguments)
+>length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+    }
+}
diff --git a/tests/baselines/reference/capturedLetConstInLoop9_ES6.types b/tests/baselines/reference/capturedLetConstInLoop9_ES6.types
new file mode 100644
index 00000000000..dfbfa387ed4
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.types
@@ -0,0 +1,359 @@
+=== tests/cases/compiler/capturedLetConstInLoop9_ES6.ts ===
+
+for (let x = 0; x < 1; ++x) {
+>x : number
+>0 : number
+>x < 1 : boolean
+>x : number
+>1 : number
+>++x : number
+>x : number
+
+    let x;
+>x : any
+
+    (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    {
+        let x;
+>x : any
+
+        (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    }
+
+    try { }
+    catch (e) {
+>e : any
+
+        let x;
+>x : any
+
+        (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    }
+
+    switch (x) {
+>x : any
+
+        case 1:
+>1 : number
+
+            let x;
+>x : any
+
+            (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+
+           break;
+    }
+    
+    while (1 == 1) {
+>1 == 1 : boolean
+>1 : number
+>1 : number
+
+        let x;
+>x : any
+
+        (function() { return x });
+>(function() { return x }) : () => any
+>function() { return x } : () => any
+>x : any
+    }
+    
+    class A {
+>A : A
+
+        m() {
+>m : () => any
+
+            return x + 1;
+>x + 1 : any
+>x : any
+>1 : number
+        }
+    }
+}
+
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+function foo() {
+>foo : () => number
+
+    l0:
+>l0 : any
+
+    for (let a of []) {
+>a : any
+>[] : undefined[]
+        
+        if (a === 1) {
+>a === 1 : boolean
+>a : any
+>1 : number
+
+            break;
+        }
+        
+        if (a === 2) {
+>a === 2 : boolean
+>a : any
+>2 : number
+
+            break l0;
+>l0 : any
+        }
+        
+        for (let b of []) {
+>b : any
+>[] : undefined[]
+
+            var [{x, y:z}] = [{x:1, y:2}];
+>x : number
+>y : any
+>z : number
+>[{x:1, y:2}] : [{ x: number; y: number; }]
+>{x:1, y:2} : { x: number; y: number; }
+>x : number
+>1 : number
+>y : number
+>2 : number
+
+            if (b === 1) {
+>b === 1 : boolean
+>b : any
+>1 : number
+
+                break;
+            }
+            
+            
+            if (b === 2) {
+>b === 2 : boolean
+>b : any
+>2 : number
+
+                break l0;
+>l0 : any
+            }
+            
+            l1:
+>l1 : any
+
+            if (b === 3) {
+>b === 3 : boolean
+>b : any
+>3 : number
+
+                break l1;
+>l1 : any
+            }
+            
+            return 50;
+>50 : number
+        }
+
+        for (let b of []) {
+>b : any
+>[] : undefined[]
+
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+>x1 : number
+>y : any
+>z1 : number
+>[{x1:1, y:arguments.length}] : [{ x1: number; y: number; }]
+>{x1:1, y:arguments.length} : { x1: number; y: number; }
+>x1 : number
+>1 : number
+>y : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+            if (b === 1) {
+>b === 1 : boolean
+>b : any
+>1 : number
+
+                break;
+            }
+            
+            if (b === 2) {
+>b === 2 : boolean
+>b : any
+>2 : number
+
+                break l0;
+>l0 : any
+            }
+            () => b
+>() => b : () => any
+>b : any
+
+            return 100;
+>100 : number
+        }
+
+        
+        () => a;
+>() => a : () => any
+>a : any
+    }
+    
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : number
+
+    use(z);
+>use(z) : any
+>use : (a: any) => any
+>z : number
+
+    use(x1);
+>use(x1) : any
+>use : (a: any) => any
+>x1 : number
+
+    use(z1);
+>use(z1) : any
+>use : (a: any) => any
+>z1 : number
+}
+
+function foo2() {
+>foo2 : () => void
+
+    for (let x of []) {
+>x : any
+>[] : undefined[]
+
+        if (x === 1) {
+>x === 1 : boolean
+>x : any
+>1 : number
+
+            break;
+        }
+        else if (x === 2) {
+>x === 2 : boolean
+>x : any
+>2 : number
+
+            continue;
+        }
+        
+        while (1 === 1) {
+>1 === 1 : boolean
+>1 : number
+>1 : number
+
+            if (x) {
+>x : any
+
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+>x : any
+
+            case 1: break;
+>1 : number
+
+            case 2: continue;
+>2 : number
+        }
+        
+        for (let y of []) {
+>y : any
+>[] : undefined[]
+
+            switch(y) {
+>y : any
+
+                case 1: break;
+>1 : number
+
+                case 2: continue;
+>2 : number
+            }
+        }
+    }
+}
+
+class C {
+>C : C
+
+    constructor(private N: number) { }
+>N : number
+
+    foo() {
+>foo : () => void
+
+        for (let i = 0; i < 100; i++) {
+>i : number
+>0 : number
+>i < 100 : boolean
+>i : number
+>100 : number
+>i++ : number
+>i : number
+
+            let f = () => this.N * i;
+>f : () => number
+>() => this.N * i : () => number
+>this.N * i : number
+>this.N : number
+>this : this
+>N : number
+>i : number
+        }
+    }
+}
+
+function foo3 () {
+>foo3 : () => void
+
+    let x = arguments.length;
+>x : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+    for (let y of []) {
+>y : any
+>[] : undefined[]
+
+        let z = arguments.length;
+>z : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+
+        (function() { return y + z + arguments.length; });
+>(function() { return y + z + arguments.length; }) : () => any
+>function() { return y + z + arguments.length; } : () => any
+>y + z + arguments.length : any
+>y + z : any
+>y : any
+>z : number
+>arguments.length : number
+>arguments : IArguments
+>length : number
+    }
+}
diff --git a/tests/baselines/reference/cf.errors.txt b/tests/baselines/reference/cf.errors.txt
new file mode 100644
index 00000000000..75b285c37c6
--- /dev/null
+++ b/tests/baselines/reference/cf.errors.txt
@@ -0,0 +1,72 @@
+tests/cases/compiler/cf.ts(9,13): error TS7027: Unreachable code detected.
+tests/cases/compiler/cf.ts(21,17): error TS7027: Unreachable code detected.
+tests/cases/compiler/cf.ts(32,13): error TS7027: Unreachable code detected.
+tests/cases/compiler/cf.ts(36,13): error TS7027: Unreachable code detected.
+
+
+==== tests/cases/compiler/cf.ts (4 errors) ====
+    function f() {
+        var z;
+        var x=10;
+        var y=3;
+    
+        L1: for (var i=0;i<19;i++) {
+            if (y==7) {
+                continue L1;
+                x=11;
+                ~
+!!! error TS7027: Unreachable code detected.
+            }
+            if (y==3) {
+                y++;
+            }
+            else {
+                y--;
+            }
+            do {
+                y+=2;
+                if (y==20) {
+                    break;
+                    x=12;
+                    ~
+!!! error TS7027: Unreachable code detected.
+                }
+            } while (y<41);
+            y++;
+        }
+        while (y>2) {
+            y=y>>1;
+        }
+        L2: try {
+            L3: if (x<y) {
+                break L2;
+                x=13;
+                ~
+!!! error TS7027: Unreachable code detected.
+            }
+            else {
+                break L3;
+                x=14;
+                ~
+!!! error TS7027: Unreachable code detected.
+            }
+        }
+        catch (e) {
+            x++;
+        }    
+        finally {
+            x+=3;
+        }
+        y++;
+        for (var k=0;k<10;k++) {
+            z;
+            break;
+        }
+        for (k=0;k<10;k++) {
+            if (k==6) {
+                continue;
+            }
+            break;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/cf.symbols b/tests/baselines/reference/cf.symbols
deleted file mode 100644
index 9c2d73f5134..00000000000
--- a/tests/baselines/reference/cf.symbols
+++ /dev/null
@@ -1,111 +0,0 @@
-=== tests/cases/compiler/cf.ts ===
-function f() {
->f : Symbol(f, Decl(cf.ts, 0, 0))
-
-    var z;
->z : Symbol(z, Decl(cf.ts, 1, 7))
-
-    var x=10;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-
-    var y=3;
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-    L1: for (var i=0;i<19;i++) {
->i : Symbol(i, Decl(cf.ts, 5, 16))
->i : Symbol(i, Decl(cf.ts, 5, 16))
->i : Symbol(i, Decl(cf.ts, 5, 16))
-
-        if (y==7) {
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-            continue L1;
-            x=11;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-        }
-        if (y==3) {
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-            y++;
->y : Symbol(y, Decl(cf.ts, 3, 7))
-        }
-        else {
-            y--;
->y : Symbol(y, Decl(cf.ts, 3, 7))
-        }
-        do {
-            y+=2;
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-            if (y==20) {
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-                break;
-                x=12;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-            }
-        } while (y<41);
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-        y++;
->y : Symbol(y, Decl(cf.ts, 3, 7))
-    }
-    while (y>2) {
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-        y=y>>1;
->y : Symbol(y, Decl(cf.ts, 3, 7))
->y : Symbol(y, Decl(cf.ts, 3, 7))
-    }
-    L2: try {
-        L3: if (x<y) {
->x : Symbol(x, Decl(cf.ts, 2, 7))
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-            break L2;
-            x=13;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-        }
-        else {
-            break L3;
-            x=14;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-        }
-    }
-    catch (e) {
->e : Symbol(e, Decl(cf.ts, 38, 11))
-
-        x++;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-    }    
-    finally {
-        x+=3;
->x : Symbol(x, Decl(cf.ts, 2, 7))
-    }
-    y++;
->y : Symbol(y, Decl(cf.ts, 3, 7))
-
-    for (var k=0;k<10;k++) {
->k : Symbol(k, Decl(cf.ts, 45, 12))
->k : Symbol(k, Decl(cf.ts, 45, 12))
->k : Symbol(k, Decl(cf.ts, 45, 12))
-
-        z;
->z : Symbol(z, Decl(cf.ts, 1, 7))
-
-        break;
-    }
-    for (k=0;k<10;k++) {
->k : Symbol(k, Decl(cf.ts, 45, 12))
->k : Symbol(k, Decl(cf.ts, 45, 12))
->k : Symbol(k, Decl(cf.ts, 45, 12))
-
-        if (k==6) {
->k : Symbol(k, Decl(cf.ts, 45, 12))
-
-            continue;
-        }
-        break;
-    }
-}
-
diff --git a/tests/baselines/reference/cf.types b/tests/baselines/reference/cf.types
deleted file mode 100644
index 397e3469ece..00000000000
--- a/tests/baselines/reference/cf.types
+++ /dev/null
@@ -1,169 +0,0 @@
-=== tests/cases/compiler/cf.ts ===
-function f() {
->f : () => void
-
-    var z;
->z : any
-
-    var x=10;
->x : number
->10 : number
-
-    var y=3;
->y : number
->3 : number
-
-    L1: for (var i=0;i<19;i++) {
->L1 : any
->i : number
->0 : number
->i<19 : boolean
->i : number
->19 : number
->i++ : number
->i : number
-
-        if (y==7) {
->y==7 : boolean
->y : number
->7 : number
-
-            continue L1;
->L1 : any
-
-            x=11;
->x=11 : number
->x : number
->11 : number
-        }
-        if (y==3) {
->y==3 : boolean
->y : number
->3 : number
-
-            y++;
->y++ : number
->y : number
-        }
-        else {
-            y--;
->y-- : number
->y : number
-        }
-        do {
-            y+=2;
->y+=2 : number
->y : number
->2 : number
-
-            if (y==20) {
->y==20 : boolean
->y : number
->20 : number
-
-                break;
-                x=12;
->x=12 : number
->x : number
->12 : number
-            }
-        } while (y<41);
->y<41 : boolean
->y : number
->41 : number
-
-        y++;
->y++ : number
->y : number
-    }
-    while (y>2) {
->y>2 : boolean
->y : number
->2 : number
-
-        y=y>>1;
->y=y>>1 : number
->y : number
->y>>1 : number
->y : number
->1 : number
-    }
-    L2: try {
->L2 : any
-
-        L3: if (x<y) {
->L3 : any
->x<y : boolean
->x : number
->y : number
-
-            break L2;
->L2 : any
-
-            x=13;
->x=13 : number
->x : number
->13 : number
-        }
-        else {
-            break L3;
->L3 : any
-
-            x=14;
->x=14 : number
->x : number
->14 : number
-        }
-    }
-    catch (e) {
->e : any
-
-        x++;
->x++ : number
->x : number
-    }    
-    finally {
-        x+=3;
->x+=3 : number
->x : number
->3 : number
-    }
-    y++;
->y++ : number
->y : number
-
-    for (var k=0;k<10;k++) {
->k : number
->0 : number
->k<10 : boolean
->k : number
->10 : number
->k++ : number
->k : number
-
-        z;
->z : any
-
-        break;
-    }
-    for (k=0;k<10;k++) {
->k=0 : number
->k : number
->0 : number
->k<10 : boolean
->k : number
->10 : number
->k++ : number
->k : number
-
-        if (k==6) {
->k==6 : boolean
->k : number
->6 : number
-
-            continue;
-        }
-        break;
-    }
-}
-
diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js
new file mode 100644
index 00000000000..64ea4e67fa8
--- /dev/null
+++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js
@@ -0,0 +1,27 @@
+//// [checkSwitchStatementIfCaseTypeIsString.ts]
+declare function use(a: any): void;
+
+class A {
+    doIt(x: Array<string>): void {
+        x.forEach((v) => {
+            switch(v) {
+                case "test": use(this);
+            }
+        });
+    }
+}
+
+//// [checkSwitchStatementIfCaseTypeIsString.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.doIt = function (x) {
+        var _this = this;
+        x.forEach(function (v) {
+            switch (v) {
+                case "test": use(_this);
+            }
+        });
+    };
+    return A;
+})();
diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols
new file mode 100644
index 00000000000..6bc994f2a44
--- /dev/null
+++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts ===
+declare function use(a: any): void;
+>use : Symbol(use, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 0))
+>a : Symbol(a, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 21))
+
+class A {
+>A : Symbol(A, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 35))
+
+    doIt(x: Array<string>): void {
+>doIt : Symbol(doIt, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 2, 9))
+>x : Symbol(x, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 3, 9))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+        x.forEach((v) => {
+>x.forEach : Symbol(Array.forEach, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 3, 9))
+>forEach : Symbol(Array.forEach, Decl(lib.d.ts, --, --))
+>v : Symbol(v, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 4, 19))
+
+            switch(v) {
+>v : Symbol(v, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 4, 19))
+
+                case "test": use(this);
+>use : Symbol(use, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 0))
+>this : Symbol(A, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 35))
+            }
+        });
+    }
+}
diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types
new file mode 100644
index 00000000000..fa394b4e0bd
--- /dev/null
+++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts ===
+declare function use(a: any): void;
+>use : (a: any) => void
+>a : any
+
+class A {
+>A : A
+
+    doIt(x: Array<string>): void {
+>doIt : (x: string[]) => void
+>x : string[]
+>Array : T[]
+
+        x.forEach((v) => {
+>x.forEach((v) => {            switch(v) {                case "test": use(this);            }        }) : void
+>x.forEach : (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void
+>x : string[]
+>forEach : (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void
+>(v) => {            switch(v) {                case "test": use(this);            }        } : (v: string) => void
+>v : string
+
+            switch(v) {
+>v : string
+
+                case "test": use(this);
+>"test" : string
+>use(this) : void
+>use : (a: any) => void
+>this : this
+            }
+        });
+    }
+}
diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.js b/tests/baselines/reference/commentEmitAtEndOfFile1.js
index 1be031fa84a..cada7754002 100644
--- a/tests/baselines/reference/commentEmitAtEndOfFile1.js
+++ b/tests/baselines/reference/commentEmitAtEndOfFile1.js
@@ -1,4 +1,5 @@
 //// [commentEmitAtEndOfFile1.ts]
+
 // test
 var f = ''
 // test #2
diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.symbols b/tests/baselines/reference/commentEmitAtEndOfFile1.symbols
index 1fc0ad09553..cb06d088307 100644
--- a/tests/baselines/reference/commentEmitAtEndOfFile1.symbols
+++ b/tests/baselines/reference/commentEmitAtEndOfFile1.symbols
@@ -1,17 +1,18 @@
 === tests/cases/compiler/commentEmitAtEndOfFile1.ts ===
+
 // test
 var f = ''
->f : Symbol(f, Decl(commentEmitAtEndOfFile1.ts, 1, 3))
+>f : Symbol(f, Decl(commentEmitAtEndOfFile1.ts, 2, 3))
 
 // test #2
 module foo {
->foo : Symbol(foo, Decl(commentEmitAtEndOfFile1.ts, 1, 10))
+>foo : Symbol(foo, Decl(commentEmitAtEndOfFile1.ts, 2, 10))
 
         function bar() { }
->bar : Symbol(bar, Decl(commentEmitAtEndOfFile1.ts, 3, 12))
+>bar : Symbol(bar, Decl(commentEmitAtEndOfFile1.ts, 4, 12))
 }
 // test #3
 module empty {
->empty : Symbol(empty, Decl(commentEmitAtEndOfFile1.ts, 5, 1))
+>empty : Symbol(empty, Decl(commentEmitAtEndOfFile1.ts, 6, 1))
 }
 // test #4
diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.types b/tests/baselines/reference/commentEmitAtEndOfFile1.types
index d88d7ffa5fc..f96a1069a06 100644
--- a/tests/baselines/reference/commentEmitAtEndOfFile1.types
+++ b/tests/baselines/reference/commentEmitAtEndOfFile1.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/commentEmitAtEndOfFile1.ts ===
+
 // test
 var f = ''
 >f : string
diff --git a/tests/baselines/reference/commentsAtEndOfFile1.js b/tests/baselines/reference/commentsAtEndOfFile1.js
index 2d4dae39e6b..d93dded59b0 100644
--- a/tests/baselines/reference/commentsAtEndOfFile1.js
+++ b/tests/baselines/reference/commentsAtEndOfFile1.js
@@ -1,4 +1,5 @@
 //// [commentsAtEndOfFile1.ts]
+
 Input:
 ;
 //Testing two
diff --git a/tests/baselines/reference/commentsAtEndOfFile1.symbols b/tests/baselines/reference/commentsAtEndOfFile1.symbols
index c09a435f1a7..d35b4f251f6 100644
--- a/tests/baselines/reference/commentsAtEndOfFile1.symbols
+++ b/tests/baselines/reference/commentsAtEndOfFile1.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/commentsAtEndOfFile1.ts ===
-Input:
+
+No type information for this code.Input:
 No type information for this code.;
 No type information for this code.//Testing two
 No type information for this code.
diff --git a/tests/baselines/reference/commentsAtEndOfFile1.types b/tests/baselines/reference/commentsAtEndOfFile1.types
index 6bac6757061..71eb367738b 100644
--- a/tests/baselines/reference/commentsAtEndOfFile1.types
+++ b/tests/baselines/reference/commentsAtEndOfFile1.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/commentsAtEndOfFile1.ts ===
+
 Input:
 >Input : any
 
diff --git a/tests/baselines/reference/commonSourceDir1.js b/tests/baselines/reference/commonSourceDir1.js
new file mode 100644
index 00000000000..68833aed49d
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir1.js
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/commonSourceDir1.ts] ////
+
+//// [bar.ts]
+var x: number;
+
+//// [baz.ts]
+var y: number;
+
+
+//// [bar.js]
+var x;
+//// [baz.js]
+var y;
diff --git a/tests/baselines/reference/commonSourceDir1.symbols b/tests/baselines/reference/commonSourceDir1.symbols
new file mode 100644
index 00000000000..9248e0c97af
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir1.symbols
@@ -0,0 +1,8 @@
+=== A:/foo/bar.ts ===
+var x: number;
+>x : Symbol(x, Decl(bar.ts, 0, 3))
+
+=== A:/foo/baz.ts ===
+var y: number;
+>y : Symbol(y, Decl(baz.ts, 0, 3))
+
diff --git a/tests/baselines/reference/commonSourceDir1.types b/tests/baselines/reference/commonSourceDir1.types
new file mode 100644
index 00000000000..6c9864c02cc
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir1.types
@@ -0,0 +1,8 @@
+=== A:/foo/bar.ts ===
+var x: number;
+>x : number
+
+=== A:/foo/baz.ts ===
+var y: number;
+>y : number
+
diff --git a/tests/baselines/reference/commonSourceDir2.errors.txt b/tests/baselines/reference/commonSourceDir2.errors.txt
new file mode 100644
index 00000000000..85bcf5d9c72
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir2.errors.txt
@@ -0,0 +1,9 @@
+error TS5009: Cannot find the common subdirectory path for the input files.
+
+
+!!! error TS5009: Cannot find the common subdirectory path for the input files.
+==== A:/foo/bar.ts (0 errors) ====
+    var x: number;
+    
+==== B:/foo/baz.ts (0 errors) ====
+    var y: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDir2.js b/tests/baselines/reference/commonSourceDir2.js
new file mode 100644
index 00000000000..cf263b51fb6
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir2.js
@@ -0,0 +1,12 @@
+//// [tests/cases/compiler/commonSourceDir2.ts] ////
+
+//// [bar.ts]
+var x: number;
+
+//// [baz.ts]
+var y: number;
+
+//// [bar.js]
+var x;
+//// [baz.js]
+var y;
diff --git a/tests/baselines/reference/commonSourceDir3.js b/tests/baselines/reference/commonSourceDir3.js
new file mode 100644
index 00000000000..0535d51f4bf
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir3.js
@@ -0,0 +1,12 @@
+//// [tests/cases/compiler/commonSourceDir3.ts] ////
+
+//// [bar.ts]
+var x: number;
+
+//// [baz.ts]
+var y: number;
+
+//// [bar.js]
+var x;
+//// [baz.js]
+var y;
diff --git a/tests/baselines/reference/commonSourceDir3.symbols b/tests/baselines/reference/commonSourceDir3.symbols
new file mode 100644
index 00000000000..b8783523dfd
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir3.symbols
@@ -0,0 +1,8 @@
+=== A:/foo/bar.ts ===
+var x: number;
+>x : Symbol(x, Decl(bar.ts, 0, 3))
+
+=== a:/foo/baz.ts ===
+var y: number;
+>y : Symbol(y, Decl(baz.ts, 0, 3))
+
diff --git a/tests/baselines/reference/commonSourceDir3.types b/tests/baselines/reference/commonSourceDir3.types
new file mode 100644
index 00000000000..a0b95275897
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir3.types
@@ -0,0 +1,8 @@
+=== A:/foo/bar.ts ===
+var x: number;
+>x : number
+
+=== a:/foo/baz.ts ===
+var y: number;
+>y : number
+
diff --git a/tests/baselines/reference/commonSourceDir4.errors.txt b/tests/baselines/reference/commonSourceDir4.errors.txt
new file mode 100644
index 00000000000..f3493504e4d
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir4.errors.txt
@@ -0,0 +1,9 @@
+error TS5009: Cannot find the common subdirectory path for the input files.
+
+
+!!! error TS5009: Cannot find the common subdirectory path for the input files.
+==== A:/foo/bar.ts (0 errors) ====
+    var x: number;
+    
+==== a:/foo/baz.ts (0 errors) ====
+    var y: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDir4.js b/tests/baselines/reference/commonSourceDir4.js
new file mode 100644
index 00000000000..2f2af9f68b2
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir4.js
@@ -0,0 +1,12 @@
+//// [tests/cases/compiler/commonSourceDir4.ts] ////
+
+//// [bar.ts]
+var x: number;
+
+//// [baz.ts]
+var y: number;
+
+//// [bar.js]
+var x;
+//// [baz.js]
+var y;
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt b/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt
index 7b26fc4bf9e..392e1781dd5 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt
@@ -1,80 +1,81 @@
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(7,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(8,9): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(11,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(12,9): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(15,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(16,9): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(21,5): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(8,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(9,9): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(12,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(13,9): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(16,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(17,9): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(22,5): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(25,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(23,5): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(26,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(30,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(31,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(33,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(34,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(37,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(38,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(40,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(41,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(44,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(27,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(31,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(32,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(34,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(35,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(38,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(39,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(41,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(42,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(45,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(46,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(47,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(48,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(49,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(46,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(47,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(48,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(49,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(50,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(51,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(52,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(53,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(54,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(55,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(58,9): error TS1128: Declaration or statement expected.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(52,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(53,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(54,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(55,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(56,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(59,9): error TS1128: Declaration or statement expected.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(62,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(63,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(69,15): error TS1034: 'super' must be followed by an argument list or member access.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(60,9): error TS1128: Declaration or statement expected.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(63,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(64,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(70,15): error TS1034: 'super' must be followed by an argument list or member access.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(74,15): error TS1034: 'super' must be followed by an argument list or member access.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(71,15): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(75,15): error TS1034: 'super' must be followed by an argument list or member access.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(79,15): error TS1034: 'super' must be followed by an argument list or member access.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(76,15): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(80,15): error TS1034: 'super' must be followed by an argument list or member access.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(85,21): error TS1128: Declaration or statement expected.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(81,15): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(86,21): error TS1128: Declaration or statement expected.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(87,11): error TS1005: ';' expected.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(87,21): error TS1128: Declaration or statement expected.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(88,11): error TS1005: ';' expected.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(91,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(92,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(95,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(89,11): error TS1005: ';' expected.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(92,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(93,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(96,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(97,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(98,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(99,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(100,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(101,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(102,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(103,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(104,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(97,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(98,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(99,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(100,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(101,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(102,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(103,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(104,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(105,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(106,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(107,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(108,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(107,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(108,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(109,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(110,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(111,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(112,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(113,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(114,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(115,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(116,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(117,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(118,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(119,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(120,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(121,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(122,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(111,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(112,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(113,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(114,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(115,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(116,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(117,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(118,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(119,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(120,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(121,1): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(122,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts(123,1): error TS2364: Invalid left-hand side of assignment expression.
 
 
 ==== tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts (74 errors) ====
+    
     // expected error for all the LHS of compound assignments (arithmetic and addition)
     var value;
     
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
index 833c1e1ea7c..bf66183b70a 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -1,4 +1,5 @@
 //// [compoundAssignmentLHSIsValue.ts]
+
 // expected error for all the LHS of compound assignments (arithmetic and addition)
 var value;
 
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt
index bee6f75ff5c..23720468bb7 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt
@@ -13,6 +13,7 @@ tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignm
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(38,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(39,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(40,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(43,3): error TS7028: Unused label.
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(43,10): error TS1128: Declaration or statement expected.
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(46,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(52,15): error TS1034: 'super' must be followed by an argument list or member access.
@@ -37,7 +38,7 @@ tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignm
 tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts(85,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 
 
-==== tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts (37 errors) ====
+==== tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts (38 errors) ====
     // expected error for all the LHS of compound assignments (arithmetic and addition)
     var value;
     
@@ -111,6 +112,8 @@ tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignm
     
     // object literals
     { a: 0 } **= value;
+      ~
+!!! error TS7028: Unused label.
              ~~~
 !!! error TS1128: Declaration or statement expected.
     
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt b/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt
new file mode 100644
index 00000000000..dc536e544b2
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt
@@ -0,0 +1,52 @@
+tests/cases/compiler/computedPropertiesInDestructuring1.ts(20,8): error TS2349: Cannot invoke an expression whose type lacks a call signature.
+tests/cases/compiler/computedPropertiesInDestructuring1.ts(21,12): error TS2339: Property 'toExponential' does not exist on type 'string'.
+tests/cases/compiler/computedPropertiesInDestructuring1.ts(33,4): error TS2349: Cannot invoke an expression whose type lacks a call signature.
+tests/cases/compiler/computedPropertiesInDestructuring1.ts(34,5): error TS2365: Operator '+' cannot be applied to types 'number' and '{}'.
+
+
+==== tests/cases/compiler/computedPropertiesInDestructuring1.ts (4 errors) ====
+    // destructuring in variable declarations
+    let foo = "bar";
+    let {[foo]: bar} = {bar: "bar"};
+    
+    let {["bar"]: bar2} = {bar: "bar"};
+    
+    let foo2 = () => "bar";
+    let {[foo2()]: bar3} = {bar: "bar"};
+    
+    let [{[foo]: bar4}] = [{bar: "bar"}];
+    let [{[foo2()]: bar5}] = [{bar: "bar"}];
+    
+    function f1({["bar"]: x}: { bar: number }) {}
+    function f2({[foo]: x}: { bar: number }) {}
+    function f3({[foo2()]: x}: { bar: number }) {}
+    function f4([{[foo]: x}]: [{ bar: number }]) {}
+    function f5([{[foo2()]: x}]: [{ bar: number }]) {}
+    
+    // report errors on type errors in computed properties used in destructuring
+    let [{[foo()]: bar6}] = [{bar: "bar"}];
+           ~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature.
+    let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
+               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'toExponential' does not exist on type 'string'.
+    
+    // destructuring assignment
+    ({[foo]: bar} = {bar: "bar"});
+    
+    ({["bar"]: bar2} = {bar: "bar"});
+    
+    ({[foo2()]: bar3} = {bar: "bar"});
+    
+    [{[foo]: bar4}] = [{bar: "bar"}];
+    [{[foo2()]: bar5}] = [{bar: "bar"}];
+    
+    [{[foo()]: bar4}] = [{bar: "bar"}];
+       ~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature.
+    [{[(1 + {})]: bar4}] = [{bar: "bar"}];
+        ~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types 'number' and '{}'.
+    
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.js b/tests/baselines/reference/computedPropertiesInDestructuring1.js
new file mode 100644
index 00000000000..0bc4286ed7b
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1.js
@@ -0,0 +1,75 @@
+//// [computedPropertiesInDestructuring1.ts]
+// destructuring in variable declarations
+let foo = "bar";
+let {[foo]: bar} = {bar: "bar"};
+
+let {["bar"]: bar2} = {bar: "bar"};
+
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {bar: "bar"};
+
+let [{[foo]: bar4}] = [{bar: "bar"}];
+let [{[foo2()]: bar5}] = [{bar: "bar"}];
+
+function f1({["bar"]: x}: { bar: number }) {}
+function f2({[foo]: x}: { bar: number }) {}
+function f3({[foo2()]: x}: { bar: number }) {}
+function f4([{[foo]: x}]: [{ bar: number }]) {}
+function f5([{[foo2()]: x}]: [{ bar: number }]) {}
+
+// report errors on type errors in computed properties used in destructuring
+let [{[foo()]: bar6}] = [{bar: "bar"}];
+let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
+
+// destructuring assignment
+({[foo]: bar} = {bar: "bar"});
+
+({["bar"]: bar2} = {bar: "bar"});
+
+({[foo2()]: bar3} = {bar: "bar"});
+
+[{[foo]: bar4}] = [{bar: "bar"}];
+[{[foo2()]: bar5}] = [{bar: "bar"}];
+
+[{[foo()]: bar4}] = [{bar: "bar"}];
+[{[(1 + {})]: bar4}] = [{bar: "bar"}];
+
+
+
+
+//// [computedPropertiesInDestructuring1.js]
+// destructuring in variable declarations
+var foo = "bar";
+var _a = foo, bar = { bar: "bar" }[_a];
+var _b = "bar", bar2 = { bar: "bar" }[_b];
+var foo2 = function () { return "bar"; };
+var _c = foo2(), bar3 = { bar: "bar" }[_c];
+var _d = foo, bar4 = [{ bar: "bar" }][0][_d];
+var _e = foo2(), bar5 = [{ bar: "bar" }][0][_e];
+function f1(_a) {
+    var _b = "bar", x = _a[_b];
+}
+function f2(_a) {
+    var _b = foo, x = _a[_b];
+}
+function f3(_a) {
+    var _b = foo2(), x = _a[_b];
+}
+function f4(_a) {
+    var _b = foo, x = _a[0][_b];
+}
+function f5(_a) {
+    var _b = foo2(), x = _a[0][_b];
+}
+// report errors on type errors in computed properties used in destructuring
+var _f = foo(), bar6 = [{ bar: "bar" }][0][_f];
+var _g = foo.toExponential(), bar7 = [{ bar: "bar" }][0][_g];
+// destructuring assignment
+(_h = { bar: "bar" }, _j = foo, bar = _h[_j], _h);
+(_k = { bar: "bar" }, _l = "bar", bar2 = _k[_l], _k);
+(_m = { bar: "bar" }, _o = foo2(), bar3 = _m[_o], _m);
+_p = foo, bar4 = [{ bar: "bar" }][0][_p];
+_q = foo2(), bar5 = [{ bar: "bar" }][0][_q];
+_r = foo(), bar4 = [{ bar: "bar" }][0][_r];
+_s = (1 + {}), bar4 = [{ bar: "bar" }][0][_s];
+var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt
new file mode 100644
index 00000000000..96ab892d1b9
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt
@@ -0,0 +1,51 @@
+tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(21,8): error TS2349: Cannot invoke an expression whose type lacks a call signature.
+tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(22,12): error TS2339: Property 'toExponential' does not exist on type 'string'.
+tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(34,4): error TS2349: Cannot invoke an expression whose type lacks a call signature.
+tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(35,5): error TS2365: Operator '+' cannot be applied to types 'number' and '{}'.
+
+
+==== tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts (4 errors) ====
+    // destructuring in variable declarations
+    let foo = "bar";
+    let {[foo]: bar} = {bar: "bar"};
+    
+    let {["bar"]: bar2} = {bar: "bar"};
+    let {[11]: bar2_1} = {11: "bar"};
+    
+    let foo2 = () => "bar";
+    let {[foo2()]: bar3} = {bar: "bar"};
+    
+    let [{[foo]: bar4}] = [{bar: "bar"}];
+    let [{[foo2()]: bar5}] = [{bar: "bar"}];
+    
+    function f1({["bar"]: x}: { bar: number }) {}
+    function f2({[foo]: x}: { bar: number }) {}
+    function f3({[foo2()]: x}: { bar: number }) {}
+    function f4([{[foo]: x}]: [{ bar: number }]) {}
+    function f5([{[foo2()]: x}]: [{ bar: number }]) {}
+    
+    // report errors on type errors in computed properties used in destructuring
+    let [{[foo()]: bar6}] = [{bar: "bar"}];
+           ~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature.
+    let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
+               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'toExponential' does not exist on type 'string'.
+    
+    // destructuring assignment
+    ({[foo]: bar} = {bar: "bar"});
+    
+    ({["bar"]: bar2} = {bar: "bar"});
+    
+    ({[foo2()]: bar3} = {bar: "bar"});
+    
+    [{[foo]: bar4}] = [{bar: "bar"}];
+    [{[foo2()]: bar5}] = [{bar: "bar"}];
+    
+    [{[foo()]: bar4}] = [{bar: "bar"}];
+       ~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature.
+    [{[(1 + {})]: bar4}] = [{bar: "bar"}];
+        ~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types 'number' and '{}'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js
new file mode 100644
index 00000000000..e6e19f93b80
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js
@@ -0,0 +1,64 @@
+//// [computedPropertiesInDestructuring1_ES6.ts]
+// destructuring in variable declarations
+let foo = "bar";
+let {[foo]: bar} = {bar: "bar"};
+
+let {["bar"]: bar2} = {bar: "bar"};
+let {[11]: bar2_1} = {11: "bar"};
+
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {bar: "bar"};
+
+let [{[foo]: bar4}] = [{bar: "bar"}];
+let [{[foo2()]: bar5}] = [{bar: "bar"}];
+
+function f1({["bar"]: x}: { bar: number }) {}
+function f2({[foo]: x}: { bar: number }) {}
+function f3({[foo2()]: x}: { bar: number }) {}
+function f4([{[foo]: x}]: [{ bar: number }]) {}
+function f5([{[foo2()]: x}]: [{ bar: number }]) {}
+
+// report errors on type errors in computed properties used in destructuring
+let [{[foo()]: bar6}] = [{bar: "bar"}];
+let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
+
+// destructuring assignment
+({[foo]: bar} = {bar: "bar"});
+
+({["bar"]: bar2} = {bar: "bar"});
+
+({[foo2()]: bar3} = {bar: "bar"});
+
+[{[foo]: bar4}] = [{bar: "bar"}];
+[{[foo2()]: bar5}] = [{bar: "bar"}];
+
+[{[foo()]: bar4}] = [{bar: "bar"}];
+[{[(1 + {})]: bar4}] = [{bar: "bar"}];
+
+
+//// [computedPropertiesInDestructuring1_ES6.js]
+// destructuring in variable declarations
+let foo = "bar";
+let { [foo]: bar } = { bar: "bar" };
+let { ["bar"]: bar2 } = { bar: "bar" };
+let { [11]: bar2_1 } = { 11: "bar" };
+let foo2 = () => "bar";
+let { [foo2()]: bar3 } = { bar: "bar" };
+let [{ [foo]: bar4 }] = [{ bar: "bar" }];
+let [{ [foo2()]: bar5 }] = [{ bar: "bar" }];
+function f1({ ["bar"]: x }) { }
+function f2({ [foo]: x }) { }
+function f3({ [foo2()]: x }) { }
+function f4([{ [foo]: x }]) { }
+function f5([{ [foo2()]: x }]) { }
+// report errors on type errors in computed properties used in destructuring
+let [{ [foo()]: bar6 }] = [{ bar: "bar" }];
+let [{ [foo.toExponential()]: bar7 }] = [{ bar: "bar" }];
+// destructuring assignment
+({ [foo]: bar } = { bar: "bar" });
+({ ["bar"]: bar2 } = { bar: "bar" });
+({ [foo2()]: bar3 } = { bar: "bar" });
+[{ [foo]: bar4 }] = [{ bar: "bar" }];
+[{ [foo2()]: bar5 }] = [{ bar: "bar" }];
+[{ [foo()]: bar4 }] = [{ bar: "bar" }];
+[{ [(1 + {})]: bar4 }] = [{ bar: "bar" }];
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2.js b/tests/baselines/reference/computedPropertiesInDestructuring2.js
new file mode 100644
index 00000000000..8579881b775
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring2.js
@@ -0,0 +1,7 @@
+//// [computedPropertiesInDestructuring2.ts]
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {};
+
+//// [computedPropertiesInDestructuring2.js]
+var foo2 = function () { return "bar"; };
+var _a = foo2(), bar3 = {}[_a];
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2.symbols b/tests/baselines/reference/computedPropertiesInDestructuring2.symbols
new file mode 100644
index 00000000000..4ae6d5323e1
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring2.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/computedPropertiesInDestructuring2.ts ===
+let foo2 = () => "bar";
+>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2.ts, 0, 3))
+
+let {[foo2()]: bar3} = {};
+>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2.ts, 0, 3))
+>bar3 : Symbol(bar3, Decl(computedPropertiesInDestructuring2.ts, 1, 5))
+
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2.types b/tests/baselines/reference/computedPropertiesInDestructuring2.types
new file mode 100644
index 00000000000..0fa20662270
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring2.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/computedPropertiesInDestructuring2.ts ===
+let foo2 = () => "bar";
+>foo2 : () => string
+>() => "bar" : () => string
+>"bar" : string
+
+let {[foo2()]: bar3} = {};
+>foo2() : string
+>foo2 : () => string
+>bar3 : any
+>{} : {}
+
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js
new file mode 100644
index 00000000000..e0bd16287ee
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js
@@ -0,0 +1,8 @@
+//// [computedPropertiesInDestructuring2_ES6.ts]
+
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {};
+
+//// [computedPropertiesInDestructuring2_ES6.js]
+let foo2 = () => "bar";
+let { [foo2()]: bar3 } = {};
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols
new file mode 100644
index 00000000000..cd7cfda9844
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts ===
+
+let foo2 = () => "bar";
+>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2_ES6.ts, 1, 3))
+
+let {[foo2()]: bar3} = {};
+>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2_ES6.ts, 1, 3))
+>bar3 : Symbol(bar3, Decl(computedPropertiesInDestructuring2_ES6.ts, 2, 5))
+
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types
new file mode 100644
index 00000000000..f0d8b1033c8
--- /dev/null
+++ b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts ===
+
+let foo2 = () => "bar";
+>foo2 : () => string
+>() => "bar" : () => string
+>"bar" : string
+
+let {[foo2()]: bar3} = {};
+>foo2() : string
+>foo2 : () => string
+>bar3 : any
+>{} : {}
+
diff --git a/tests/baselines/reference/computedPropertyNames10_ES5.types b/tests/baselines/reference/computedPropertyNames10_ES5.types
index 87648c1ed80..9dea9cfca93 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames10_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : {}
->{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : {}
+>v : { [0](): void; [""](): void; }
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [0](): void; [""](): void; }
 
     [s]() { },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames10_ES6.types b/tests/baselines/reference/computedPropertyNames10_ES6.types
index 996dfc99fe9..d2faa138980 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames10_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : {}
->{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : {}
+>v : { [0](): void; [""](): void; }
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [0](): void; [""](): void; }
 
     [s]() { },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.js b/tests/baselines/reference/computedPropertyNames11_ES5.js
index 64c0b0bd67e..0917f824770 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames11_ES5.js
@@ -46,16 +46,8 @@ var v = (_a = {},
         enumerable: true,
         configurable: true
     }),
-    Object.defineProperty(_a, "", {
-        set: function (v) { },
-        enumerable: true,
-        configurable: true
-    }),
-    Object.defineProperty(_a, 0, {
-        get: function () { return 0; },
-        enumerable: true,
-        configurable: true
-    }),
+    ,
+    ,
     Object.defineProperty(_a, a, {
         set: function (v) { },
         enumerable: true,
diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.types b/tests/baselines/reference/computedPropertyNames11_ES5.types
index c3c59c2eb9c..e0787fc3ee7 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames11_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : {}
->{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : {}
+>v : { [0]: number; [""]: any; }
+>{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; }
 
     get [s]() { return 0; },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.types b/tests/baselines/reference/computedPropertyNames11_ES6.types
index ef11511baae..8ad31a7c2a1 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames11_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : {}
->{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : {}
+>v : { [0]: number; [""]: any; }
+>{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; }
 
     get [s]() { return 0; },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt
index 9d07f34f3c4..71f81c27245 100644
--- a/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt
@@ -3,15 +3,13 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(6,
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(7,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(9,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(10,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(11,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(12,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(13,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(14,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(15,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts (11 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts (9 errors) ====
     var s: string;
     var n: number;
     var a: any;
@@ -32,11 +30,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(15
         ~~~~
 !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         static [""]: number;
-               ~~~~
-!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         [0]: number;
-        ~~~
-!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         [a]: number;
         ~~~
 !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
diff --git a/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt
index f0a2267f8b3..8d8cce7e140 100644
--- a/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt
@@ -3,15 +3,13 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(6,
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(7,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(9,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(10,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(11,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(12,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(13,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(14,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(15,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts (11 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts (9 errors) ====
     var s: string;
     var n: number;
     var a: any;
@@ -32,11 +30,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(15
         ~~~~
 !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         static [""]: number;
-               ~~~~
-!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         [0]: number;
-        ~~~
-!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         [a]: number;
         ~~~
 !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
diff --git a/tests/baselines/reference/computedPropertyNames16_ES5.js b/tests/baselines/reference/computedPropertyNames16_ES5.js
index 2c7316e1398..f4d90579d63 100644
--- a/tests/baselines/reference/computedPropertyNames16_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames16_ES5.js
@@ -48,16 +48,6 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(C, "", {
-        set: function (v) { },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C.prototype, 0, {
-        get: function () { return 0; },
-        enumerable: true,
-        configurable: true
-    });
     Object.defineProperty(C.prototype, a, {
         set: function (v) { },
         enumerable: true,
diff --git a/tests/baselines/reference/computedPropertyNames2_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames2_ES5.errors.txt
index 2fbf68b4437..e704126c055 100644
--- a/tests/baselines/reference/computedPropertyNames2_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames2_ES5.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts(6,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts(8,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts(6,9): error TS2378: A 'get' accessor must return a value.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts(8,16): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts (2 errors) ====
@@ -10,10 +10,10 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts(8,1
         static [methodName]() { }
         get [accessorName]() { }
             ~~~~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
         set [accessorName](v) { }
         static get [accessorName]() { }
                    ~~~~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
         static set [accessorName](v) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames2_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames2_ES6.errors.txt
index 3f18a8764b4..6b294981638 100644
--- a/tests/baselines/reference/computedPropertyNames2_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames2_ES6.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(6,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(8,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(6,9): error TS2378: A 'get' accessor must return a value.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(8,16): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts (2 errors) ====
@@ -10,10 +10,10 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(8,1
         static [methodName]() { }
         get [accessorName]() { }
             ~~~~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
         set [accessorName](v) { }
         static get [accessorName]() { }
                    ~~~~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
         static set [accessorName](v) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.js b/tests/baselines/reference/computedPropertyNames36_ES5.js
index 5519a6d284c..4bb10ea7543 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames36_ES5.js
@@ -27,10 +27,6 @@ var C = (function () {
     Object.defineProperty(C.prototype, "get1", {
         // Computed properties
         get: function () { return new Foo; },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C.prototype, "set1", {
         set: function (p) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.js b/tests/baselines/reference/computedPropertyNames37_ES5.js
index 54a7243f3fa..c2a346608fe 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames37_ES5.js
@@ -27,10 +27,6 @@ var C = (function () {
     Object.defineProperty(C.prototype, "get1", {
         // Computed properties
         get: function () { return new Foo; },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C.prototype, "set1", {
         set: function (p) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/computedPropertyNames3_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames3_ES5.errors.txt
index a31965dc69e..fd6f8e8bdc1 100644
--- a/tests/baselines/reference/computedPropertyNames3_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames3_ES5.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(5,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(5,9): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(5,17): error TS1102: 'delete' cannot be called on an identifier in strict mode.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(7,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(7,16): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
 
 
@@ -16,7 +16,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(7,1
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         get [delete id]() { }
             ~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
             ~~~~~~~~~~~
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
                     ~~
@@ -26,7 +26,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts(7,1
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         static get [<String>""]() { }
                    ~~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                    ~~~~~~~~~~~~
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         static set [id.toString()](v) { }
diff --git a/tests/baselines/reference/computedPropertyNames3_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames3_ES6.errors.txt
index b9009112347..4299437777d 100644
--- a/tests/baselines/reference/computedPropertyNames3_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames3_ES6.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(5,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(5,9): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(5,17): error TS1102: 'delete' cannot be called on an identifier in strict mode.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,16): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
 
 
@@ -16,7 +16,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,1
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         get [delete id]() { }
             ~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
             ~~~~~~~~~~~
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
                     ~~
@@ -26,7 +26,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,1
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         static get [<String>""]() { }
                    ~~~~~~~~~~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                    ~~~~~~~~~~~~
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         static set [id.toString()](v) { }
diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt
index e8ceef0d581..482978064d1 100644
--- a/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt
@@ -1,7 +1,9 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(8,5): error TS2393: Duplicate function implementation.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(9,5): error TS2393: Duplicate function implementation.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts (3 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     
@@ -10,7 +12,11 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(8,
     
         // Computed properties
         [""]() { return new Foo }
+        ~~~~
+!!! error TS2393: Duplicate function implementation.
         ~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
         [""]() { return new Foo2 }
+        ~~~~
+!!! error TS2393: Duplicate function implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt
index 1a032a87b2b..669d0d04e66 100644
--- a/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt
@@ -1,7 +1,9 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8,5): error TS2393: Duplicate function implementation.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(9,5): error TS2393: Duplicate function implementation.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts (3 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     
@@ -10,7 +12,11 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8,
     
         // Computed properties
         [""]() { return new Foo }
+        ~~~~
+!!! error TS2393: Duplicate function implementation.
         ~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
         [""]() { return new Foo2 }
+        ~~~~
+!!! error TS2393: Duplicate function implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt
index 94153c47aa5..bdb978220a0 100644
--- a/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt
@@ -1,8 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     
@@ -11,8 +10,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts(8,
     
         // Computed properties
         [""]: Foo;
-        ~~~~
-!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         ~~~~~~~~~~
 !!! error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt
index 1f4e27d6e81..9feb6ba3d32 100644
--- a/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt
@@ -1,8 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     
@@ -11,8 +10,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,
     
         // Computed properties
         [""]: Foo;
-        ~~~~
-!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol.
         ~~~~~~~~~~
 !!! error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js
index c3b7f6a71d0..57026c3c706 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -41,10 +41,6 @@ var D = (function (_super) {
     Object.defineProperty(D.prototype, "get1", {
         // Computed properties
         get: function () { return new Foo; },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(D.prototype, "set1", {
         set: function (p) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt
index 83855c5f0b7..8baae68f337 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt
@@ -1,12 +1,15 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(5,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts (2 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     
     class C {
         get ["get1"]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
     
     class D extends C {
diff --git a/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt
index 963e01ed86b..e329785f4cf 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt
@@ -1,12 +1,15 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(5,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts (2 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     
     class C {
         get ["get1"]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
     
     class D extends C {
diff --git a/tests/baselines/reference/computedPropertyNames4_ES5.types b/tests/baselines/reference/computedPropertyNames4_ES5.types
index 51baca26586..6984d2e69b8 100644
--- a/tests/baselines/reference/computedPropertyNames4_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames4_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : {}
->{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : {}
+>v : { [0]: number; [""]: number; }
+>{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : { [0]: number; [""]: number; }
 
     [s]: 0,
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames4_ES6.types b/tests/baselines/reference/computedPropertyNames4_ES6.types
index 05267049517..1fece561f5a 100644
--- a/tests/baselines/reference/computedPropertyNames4_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames4_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : {}
->{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : {}
+>v : { [0]: number; [""]: number; }
+>{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : { [0]: number; [""]: number; }
 
     [s]: 0,
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types
index 9470aee8eb6..147b2966509 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2_ES5.ts ===
 var v = {
->v : {}
->{    ["hello"]() {        debugger;    }} : {}
+>v : { ["hello"](): void; }
+>{    ["hello"]() {        debugger;    }} : { ["hello"](): void; }
 
     ["hello"]() {
 >"hello" : string
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types
index c4f02155a95..00334680362 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2_ES6.ts ===
 var v = {
->v : {}
->{    ["hello"]() {        debugger;    }} : {}
+>v : { ["hello"](): void; }
+>{    ["hello"]() {        debugger;    }} : { ["hello"](): void; }
 
     ["hello"]() {
 >"hello" : string
diff --git a/tests/baselines/reference/conditionalExpressions2.js b/tests/baselines/reference/conditionalExpressions2.js
index 6749a2c0ac0..8ac7df12cfa 100644
--- a/tests/baselines/reference/conditionalExpressions2.js
+++ b/tests/baselines/reference/conditionalExpressions2.js
@@ -1,4 +1,5 @@
 //// [conditionalExpressions2.ts]
+
 var a = false ? 1 : null;
 var b = false ? undefined : 0;
 var c = false ? 1 : 0;
diff --git a/tests/baselines/reference/conditionalExpressions2.symbols b/tests/baselines/reference/conditionalExpressions2.symbols
index 63c8b417477..e6edd635b40 100644
--- a/tests/baselines/reference/conditionalExpressions2.symbols
+++ b/tests/baselines/reference/conditionalExpressions2.symbols
@@ -1,33 +1,34 @@
 === tests/cases/compiler/conditionalExpressions2.ts ===
+
 var a = false ? 1 : null;
->a : Symbol(a, Decl(conditionalExpressions2.ts, 0, 3))
+>a : Symbol(a, Decl(conditionalExpressions2.ts, 1, 3))
 
 var b = false ? undefined : 0;
->b : Symbol(b, Decl(conditionalExpressions2.ts, 1, 3))
+>b : Symbol(b, Decl(conditionalExpressions2.ts, 2, 3))
 >undefined : Symbol(undefined)
 
 var c = false ? 1 : 0;
->c : Symbol(c, Decl(conditionalExpressions2.ts, 2, 3))
+>c : Symbol(c, Decl(conditionalExpressions2.ts, 3, 3))
 
 var d = false ? false : true;
->d : Symbol(d, Decl(conditionalExpressions2.ts, 3, 3))
+>d : Symbol(d, Decl(conditionalExpressions2.ts, 4, 3))
 
 var e = false ? "foo" : "bar";
->e : Symbol(e, Decl(conditionalExpressions2.ts, 4, 3))
+>e : Symbol(e, Decl(conditionalExpressions2.ts, 5, 3))
 
 var f = false ? null : undefined;
->f : Symbol(f, Decl(conditionalExpressions2.ts, 5, 3))
+>f : Symbol(f, Decl(conditionalExpressions2.ts, 6, 3))
 >undefined : Symbol(undefined)
 
 var g = true ? {g:5} : null;
->g : Symbol(g, Decl(conditionalExpressions2.ts, 6, 3))
->g : Symbol(g, Decl(conditionalExpressions2.ts, 6, 16))
+>g : Symbol(g, Decl(conditionalExpressions2.ts, 7, 3))
+>g : Symbol(g, Decl(conditionalExpressions2.ts, 7, 16))
 
 var h = [{h:5}, null];
->h : Symbol(h, Decl(conditionalExpressions2.ts, 7, 3))
->h : Symbol(h, Decl(conditionalExpressions2.ts, 7, 10))
+>h : Symbol(h, Decl(conditionalExpressions2.ts, 8, 3))
+>h : Symbol(h, Decl(conditionalExpressions2.ts, 8, 10))
 
 function i() { if (true) { return { x: 5 }; } else { return null; } }
->i : Symbol(i, Decl(conditionalExpressions2.ts, 7, 22))
->x : Symbol(x, Decl(conditionalExpressions2.ts, 8, 35))
+>i : Symbol(i, Decl(conditionalExpressions2.ts, 8, 22))
+>x : Symbol(x, Decl(conditionalExpressions2.ts, 9, 35))
 
diff --git a/tests/baselines/reference/conditionalExpressions2.types b/tests/baselines/reference/conditionalExpressions2.types
index 5f49410b1e4..77714e664fb 100644
--- a/tests/baselines/reference/conditionalExpressions2.types
+++ b/tests/baselines/reference/conditionalExpressions2.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/conditionalExpressions2.ts ===
+
 var a = false ? 1 : null;
 >a : number
 >false ? 1 : null : number
diff --git a/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt b/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
index 0b667108b5f..afae9d40431 100644
--- a/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
+++ b/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(1,5): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,10): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,10): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 
 
 ==== tests/cases/compiler/conflictingTypeAnnotatedVar.ts (5 errors) ====
@@ -13,9 +13,9 @@ tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,17): error TS2355: A funct
              ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
                     ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function foo(): number { }
              ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
                     ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
\ No newline at end of file
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations-scopes.errors.txt b/tests/baselines/reference/constDeclarations-scopes.errors.txt
index 138acd9b16d..4c9f7ce5163 100644
--- a/tests/baselines/reference/constDeclarations-scopes.errors.txt
+++ b/tests/baselines/reference/constDeclarations-scopes.errors.txt
@@ -1,7 +1,9 @@
+tests/cases/compiler/constDeclarations-scopes.ts(13,5): error TS7027: Unreachable code detected.
+tests/cases/compiler/constDeclarations-scopes.ts(22,1): error TS7027: Unreachable code detected.
 tests/cases/compiler/constDeclarations-scopes.ts(28,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
 
 
-==== tests/cases/compiler/constDeclarations-scopes.ts (1 errors) ====
+==== tests/cases/compiler/constDeclarations-scopes.ts (3 errors) ====
     
     // global
     const c = "string";
@@ -15,6 +17,8 @@ tests/cases/compiler/constDeclarations-scopes.ts(28,7): error TS2410: All symbol
     }
     else { 
         const c = 0;
+        ~~~~~
+!!! error TS7027: Unreachable code detected.
         n = c;
     }
     
@@ -24,6 +28,8 @@ tests/cases/compiler/constDeclarations-scopes.ts(28,7): error TS2410: All symbol
     }
     
     do { 
+    ~~
+!!! error TS7027: Unreachable code detected.
        const c = 0;
         n = c;
     } while (true);
diff --git a/tests/baselines/reference/constantOverloadFunction.types b/tests/baselines/reference/constantOverloadFunction.types
index d643d3a726d..d7deaaae46d 100644
--- a/tests/baselines/reference/constantOverloadFunction.types
+++ b/tests/baselines/reference/constantOverloadFunction.types
@@ -19,27 +19,27 @@ class Derived3 extends Base { biz() { } }
 >biz : () => void
 
 function foo(tagName: 'canvas'): Derived1;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
->tagName : 'canvas'
+>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
+>tagName : "canvas"
 >Derived1 : Derived1
 
 function foo(tagName:  'div'): Derived2;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
->tagName : 'div'
+>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
+>tagName : "div"
 >Derived2 : Derived2
 
 function foo(tagName: 'span'): Derived3;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
->tagName : 'span'
+>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
+>tagName : "span"
 >Derived3 : Derived3
 
 function foo(tagName: string): Base;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : string
 >Base : Base
 
 function foo(tagName: any): Base {
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : any
 >Base : Base
 
diff --git a/tests/baselines/reference/constructorReturnsInvalidType.errors.txt b/tests/baselines/reference/constructorReturnsInvalidType.errors.txt
index 2ebd59b3d93..a8fe1de4700 100644
--- a/tests/baselines/reference/constructorReturnsInvalidType.errors.txt
+++ b/tests/baselines/reference/constructorReturnsInvalidType.errors.txt
@@ -1,11 +1,16 @@
+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
 
 
-==== tests/cases/compiler/constructorReturnsInvalidType.ts (1 errors) ====
+==== tests/cases/compiler/constructorReturnsInvalidType.ts (2 errors) ====
     class X {
         constructor() {
             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
         }
         foo() { }
diff --git a/tests/baselines/reference/constructorWithAssignableReturnExpression.errors.txt b/tests/baselines/reference/constructorWithAssignableReturnExpression.errors.txt
index f5ef669d31b..1f7d7133bd7 100644
--- a/tests/baselines/reference/constructorWithAssignableReturnExpression.errors.txt
+++ b/tests/baselines/reference/constructorWithAssignableReturnExpression.errors.txt
@@ -1,8 +1,13 @@
+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.
+    Type 'number' is not assignable to type 'T'.
 tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(26,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 (2 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts (4 errors) ====
     // a class constructor may return an expression, it must be assignable to the class instance type to be valid
     
     class C {
@@ -16,6 +21,9 @@ tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignabl
         constructor() {
             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
         }
     }
@@ -32,6 +40,10 @@ tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignabl
         constructor() {
             return { x: 1 }; // error
                    ~~~~~~~~
+!!! error TS2322: Type '{ x: number; }' is not assignable to type 'F<T>'.
+!!! error TS2322:   Types of property 'x' are incompatible.
+!!! error TS2322:     Type 'number' is not assignable to type 'T'.
+                   ~~~~~~~~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }
     }
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
index 12f397ff06c..b9804b1b6db 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
@@ -1,89 +1,90 @@
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(11,13): error TS2304: Cannot find name 'module'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(11,13): error TS2503: Cannot find namespace 'module'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(11,19): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(22,35): error TS1005: ')' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(22,39): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(24,28): error TS1005: ':' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(24,29): error TS1005: ',' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(27,18): error TS1128: Declaration or statement expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(27,26): error TS2304: Cannot find name 'bfs'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(28,30): error TS1005: '=' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(31,18): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(34,17): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(34,26): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(34,28): error TS2304: Cannot find name 'bfs'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(35,21): error TS2365: Operator '!=' cannot be applied to types 'boolean' and 'number'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(38,17): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(40,28): error TS2304: Cannot find name 'bfs'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(40,41): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(40,45): error TS1002: Unterminated string literal.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(41,21): error TS2365: Operator '!=' cannot be applied to types 'boolean' and 'number'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(47,17): error TS2304: Cannot find name 'console'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(49,13): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(53,13): error TS2304: Cannot find name 'console'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(58,5): error TS1128: Declaration or statement expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(69,13): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(72,37): error TS1127: Invalid character.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(81,13): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(89,23): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(90,13): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(105,29): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(106,13): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(108,24): error TS2365: Operator '+' cannot be applied to types 'number' and 'boolean'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(138,13): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(141,32): error TS1005: '{' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(143,13): error TS1005: 'try' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(159,24): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(159,30): error TS1005: '(' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(159,31): error TS2304: Cannot find name 'Property'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(166,13): error TS2365: Operator '+=' cannot be applied to types 'number' and 'void'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(180,40): error TS2447: The '^' operator is not allowed for boolean types. Consider using '!==' instead.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(205,28): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(213,16): error TS2304: Cannot find name 'bool'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(218,10): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(223,23): error TS2304: Cannot find name 'bool'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(227,13): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(234,14): error TS1005: '{' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,9): error TS1128: Declaration or statement expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,16): error TS2304: Cannot find name 'method1'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,24): error TS2304: Cannot find name 'val'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,27): error TS1005: ',' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,28): error TS2304: Cannot find name 'number'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,36): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(238,9): error TS1128: Declaration or statement expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(238,16): error TS2304: Cannot find name 'method2'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(238,26): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(241,5): error TS1128: Declaration or statement expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(246,25): error TS2339: Property 'method1' does not exist on type 'B'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(254,9): error TS2390: Constructor implementation is missing.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(254,21): error TS2369: A parameter property is only allowed in a constructor implementation.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(254,44): error TS2369: A parameter property is only allowed in a constructor implementation.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(254,69): error TS1110: Type expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(256,9): error TS1128: Declaration or statement expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(256,16): error TS2304: Cannot find name 'Overloads'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(256,26): error TS2304: Cannot find name 'value'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(256,31): error TS1005: ',' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(256,33): error TS2304: Cannot find name 'string'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(12,13): error TS2304: Cannot find name 'module'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(12,13): error TS2503: Cannot find namespace 'module'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(12,19): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(23,35): error TS1005: ')' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(23,39): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(25,28): error TS1005: ':' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(25,29): error TS1005: ',' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(28,18): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(28,26): error TS2304: Cannot find name 'bfs'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(29,30): error TS1005: '=' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(32,18): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(35,17): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(35,26): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(35,28): error TS2304: Cannot find name 'bfs'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(36,21): error TS2365: Operator '!=' cannot be applied to types 'boolean' and 'number'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(39,17): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(41,28): error TS2304: Cannot find name 'bfs'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(41,41): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(41,45): error TS1002: Unterminated string literal.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(42,21): error TS2365: Operator '!=' cannot be applied to types 'boolean' and 'number'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(48,17): error TS2304: Cannot find name 'console'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(50,13): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(54,13): error TS2304: Cannot find name 'console'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(59,5): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(70,13): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(73,37): error TS1127: Invalid character.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(82,13): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(90,23): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(91,13): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(106,29): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(107,13): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(109,24): error TS2365: Operator '+' cannot be applied to types 'number' and 'boolean'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(139,13): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(142,32): error TS1005: '{' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(144,13): error TS1005: 'try' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(160,24): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(160,30): error TS1005: '(' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(160,31): error TS2304: Cannot find name 'Property'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(167,13): error TS2365: Operator '+=' cannot be applied to types 'number' and 'void'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(181,40): error TS2447: The '^' operator is not allowed for boolean types. Consider using '!==' instead.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(206,28): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(214,16): error TS2304: Cannot find name 'bool'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(219,10): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(224,23): error TS2304: Cannot find name 'bool'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(228,13): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(235,14): error TS1005: '{' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(236,9): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(236,16): error TS2304: Cannot find name 'method1'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(236,24): error TS2304: Cannot find name 'val'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(236,27): error TS1005: ',' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(236,28): error TS2304: Cannot find name 'number'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(236,36): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(239,9): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(239,16): error TS2304: Cannot find name 'method2'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(239,26): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(242,5): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(247,25): error TS2339: Property 'method1' does not exist on type 'B'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(255,9): error TS2390: Constructor implementation is missing.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(255,21): error TS2369: A parameter property is only allowed in a constructor implementation.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(255,44): error TS2369: A parameter property is only allowed in a constructor implementation.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(255,69): error TS1110: Type expected.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,9): error TS1128: Declaration or statement expected.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,16): error TS2304: Cannot find name 'Overloads'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,27): error TS1135: Argument expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,33): error TS1005: '(' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,35): error TS2304: Cannot find name 'string'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,43): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,52): error TS2304: Cannot find name 'string'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,60): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,65): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,9): error TS2304: Cannot find name 'public'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,16): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,16): error TS2304: Cannot find name 'DefaultValue'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,29): error TS2304: Cannot find name 'value'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,35): error TS1109: Expression expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,37): error TS2304: Cannot find name 'string'.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,55): error TS1005: ';' expected.
-tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(261,1): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,26): error TS2304: Cannot find name 'value'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,31): error TS1005: ',' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,33): error TS2304: Cannot find name 'string'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,9): error TS1128: Declaration or statement expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,16): error TS2304: Cannot find name 'Overloads'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,27): error TS1135: Argument expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,33): error TS1005: '(' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,35): error TS2304: Cannot find name 'string'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,43): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,52): error TS2304: Cannot find name 'string'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,60): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(258,65): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,9): error TS2304: Cannot find name 'public'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,16): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,16): error TS2304: Cannot find name 'DefaultValue'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,29): error TS2304: Cannot find name 'value'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,35): error TS1109: Expression expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,37): error TS2304: Cannot find name 'string'.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(260,55): error TS1005: ';' expected.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(262,1): error TS1128: Declaration or statement expected.
 
 
 ==== tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts (83 errors) ====
+    
     declare module "fs" {
         export class File {
             constructor(filename: string);
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
index 5a61d4d5d7e..4765d1de283 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -1,4 +1,5 @@
 //// [constructorWithIncompleteTypeAnnotation.ts]
+
 declare module "fs" {
     export class File {
         constructor(filename: string);
diff --git a/tests/baselines/reference/continueNotInIterationStatement4.errors.txt b/tests/baselines/reference/continueNotInIterationStatement4.errors.txt
index 1c80f7057b8..dec899c7218 100644
--- a/tests/baselines/reference/continueNotInIterationStatement4.errors.txt
+++ b/tests/baselines/reference/continueNotInIterationStatement4.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/continueNotInIterationStatement4.ts(4,5): error TS1107: Jump target cannot cross function boundary.
+tests/cases/compiler/continueNotInIterationStatement4.ts(5,5): error TS1107: Jump target cannot cross function boundary.
 
 
 ==== tests/cases/compiler/continueNotInIterationStatement4.ts (1 errors) ====
+    
     TWO:
     while (true){
       var x = () => {
diff --git a/tests/baselines/reference/continueNotInIterationStatement4.js b/tests/baselines/reference/continueNotInIterationStatement4.js
index f3f52ecb48c..50261be23b1 100644
--- a/tests/baselines/reference/continueNotInIterationStatement4.js
+++ b/tests/baselines/reference/continueNotInIterationStatement4.js
@@ -1,4 +1,5 @@
 //// [continueNotInIterationStatement4.ts]
+
 TWO:
 while (true){
   var x = () => {
diff --git a/tests/baselines/reference/continueTarget3.js b/tests/baselines/reference/continueTarget3.js
index 052b7b593c3..70c2d2590e5 100644
--- a/tests/baselines/reference/continueTarget3.js
+++ b/tests/baselines/reference/continueTarget3.js
@@ -1,4 +1,5 @@
 //// [continueTarget3.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/continueTarget3.symbols b/tests/baselines/reference/continueTarget3.symbols
index a1b930f2f5a..a5decfe16d1 100644
--- a/tests/baselines/reference/continueTarget3.symbols
+++ b/tests/baselines/reference/continueTarget3.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/continueTarget3.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  continue target1;
diff --git a/tests/baselines/reference/continueTarget3.types b/tests/baselines/reference/continueTarget3.types
index 3336b47772c..d55f1c3f6d2 100644
--- a/tests/baselines/reference/continueTarget3.types
+++ b/tests/baselines/reference/continueTarget3.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/continueTarget3.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/continueTarget4.js b/tests/baselines/reference/continueTarget4.js
index 0f6211f9202..23c20a03260 100644
--- a/tests/baselines/reference/continueTarget4.js
+++ b/tests/baselines/reference/continueTarget4.js
@@ -1,4 +1,5 @@
 //// [continueTarget4.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/continueTarget4.symbols b/tests/baselines/reference/continueTarget4.symbols
index ea1989a3e4d..fc69a881a60 100644
--- a/tests/baselines/reference/continueTarget4.symbols
+++ b/tests/baselines/reference/continueTarget4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/continueTarget4.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  continue target2;
diff --git a/tests/baselines/reference/continueTarget4.types b/tests/baselines/reference/continueTarget4.types
index 5d2b7c29bbe..e3e3ae82dfe 100644
--- a/tests/baselines/reference/continueTarget4.types
+++ b/tests/baselines/reference/continueTarget4.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/continueTarget4.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/continueTarget5.errors.txt b/tests/baselines/reference/continueTarget5.errors.txt
index 401c5874ee0..854f57017b6 100644
--- a/tests/baselines/reference/continueTarget5.errors.txt
+++ b/tests/baselines/reference/continueTarget5.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/continueTarget5.ts(5,7): error TS1107: Jump target cannot cross function boundary.
+tests/cases/compiler/continueTarget5.ts(6,7): error TS1107: Jump target cannot cross function boundary.
 
 
 ==== tests/cases/compiler/continueTarget5.ts (1 errors) ====
+    
     target:
     while (true) {
       function f() {
diff --git a/tests/baselines/reference/continueTarget5.js b/tests/baselines/reference/continueTarget5.js
index 5bf309d2690..030a1c2589c 100644
--- a/tests/baselines/reference/continueTarget5.js
+++ b/tests/baselines/reference/continueTarget5.js
@@ -1,4 +1,5 @@
 //// [continueTarget5.ts]
+
 target:
 while (true) {
   function f() {
diff --git a/tests/baselines/reference/declarationEmitDetachedComment1.js b/tests/baselines/reference/declarationEmitDetachedComment1.js
new file mode 100644
index 00000000000..38c7e60406d
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDetachedComment1.js
@@ -0,0 +1,85 @@
+//// [tests/cases/compiler/declarationEmitDetachedComment1.ts] ////
+
+//// [test1.ts]
+
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+
+}
+
+//// [test2.ts]
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+
+}
+
+//// [test3.ts]
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+
+}
+
+
+//// [test1.js]
+/*! Copyright 2015 MyCompany Inc. */
+/**
+ * Hello class
+ */
+var Hello = (function () {
+    function Hello() {
+    }
+    return Hello;
+})();
+//// [test2.js]
+/* A comment at the top of the file. */
+/**
+ * Hi class
+ */
+var Hi = (function () {
+    function Hi() {
+    }
+    return Hi;
+})();
+//// [test3.js]
+// A one-line comment at the top of the file.
+/**
+ * Hola class
+ */
+var Hola = (function () {
+    function Hola() {
+    }
+    return Hola;
+})();
+
+
+//// [test1.d.ts]
+/*! Copyright 2015 MyCompany Inc. */
+/**
+ * Hello class
+ */
+declare class Hello {
+}
+//// [test2.d.ts]
+/**
+ * Hi class
+ */
+declare class Hi {
+}
+//// [test3.d.ts]
+/**
+ * Hola class
+ */
+declare class Hola {
+}
diff --git a/tests/baselines/reference/declarationEmitDetachedComment1.symbols b/tests/baselines/reference/declarationEmitDetachedComment1.symbols
new file mode 100644
index 00000000000..c466716ca44
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDetachedComment1.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/compiler/test1.ts ===
+
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+>Hello : Symbol(Hello, Decl(test1.ts, 0, 0))
+
+}
+
+=== tests/cases/compiler/test2.ts ===
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+>Hi : Symbol(Hi, Decl(test2.ts, 0, 0))
+
+}
+
+=== tests/cases/compiler/test3.ts ===
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+>Hola : Symbol(Hola, Decl(test3.ts, 0, 0))
+
+}
+
diff --git a/tests/baselines/reference/declarationEmitDetachedComment1.types b/tests/baselines/reference/declarationEmitDetachedComment1.types
new file mode 100644
index 00000000000..6d1a87b5151
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDetachedComment1.types
@@ -0,0 +1,34 @@
+=== tests/cases/compiler/test1.ts ===
+
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+>Hello : Hello
+
+}
+
+=== tests/cases/compiler/test2.ts ===
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+>Hi : Hi
+
+}
+
+=== tests/cases/compiler/test3.ts ===
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+>Hola : Hola
+
+}
+
diff --git a/tests/baselines/reference/declarationEmitDetachedComment2.js b/tests/baselines/reference/declarationEmitDetachedComment2.js
new file mode 100644
index 00000000000..d4d176da12c
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDetachedComment2.js
@@ -0,0 +1,65 @@
+//// [tests/cases/compiler/declarationEmitDetachedComment2.ts] ////
+
+//// [test1.ts]
+
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+
+}
+
+//// [test2.ts]
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+
+}
+
+//// [test3.ts]
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+
+}
+
+
+//// [test1.js]
+/*! Copyright 2015 MyCompany Inc. */
+var Hello = (function () {
+    function Hello() {
+    }
+    return Hello;
+})();
+//// [test2.js]
+var Hi = (function () {
+    function Hi() {
+    }
+    return Hi;
+})();
+//// [test3.js]
+var Hola = (function () {
+    function Hola() {
+    }
+    return Hola;
+})();
+
+
+//// [test1.d.ts]
+/*! Copyright 2015 MyCompany Inc. */
+declare class Hello {
+}
+//// [test2.d.ts]
+declare class Hi {
+}
+//// [test3.d.ts]
+declare class Hola {
+}
diff --git a/tests/baselines/reference/declarationEmitDetachedComment2.symbols b/tests/baselines/reference/declarationEmitDetachedComment2.symbols
new file mode 100644
index 00000000000..c466716ca44
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDetachedComment2.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/compiler/test1.ts ===
+
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+>Hello : Symbol(Hello, Decl(test1.ts, 0, 0))
+
+}
+
+=== tests/cases/compiler/test2.ts ===
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+>Hi : Symbol(Hi, Decl(test2.ts, 0, 0))
+
+}
+
+=== tests/cases/compiler/test3.ts ===
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+>Hola : Symbol(Hola, Decl(test3.ts, 0, 0))
+
+}
+
diff --git a/tests/baselines/reference/declarationEmitDetachedComment2.types b/tests/baselines/reference/declarationEmitDetachedComment2.types
new file mode 100644
index 00000000000..6d1a87b5151
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDetachedComment2.types
@@ -0,0 +1,34 @@
+=== tests/cases/compiler/test1.ts ===
+
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+>Hello : Hello
+
+}
+
+=== tests/cases/compiler/test2.ts ===
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+>Hi : Hi
+
+}
+
+=== tests/cases/compiler/test3.ts ===
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+>Hola : Hola
+
+}
+
diff --git a/tests/baselines/reference/declarationFiles.errors.txt b/tests/baselines/reference/declarationFiles.errors.txt
index c55cac9000b..bbd65b6d658 100644
--- a/tests/baselines/reference/declarationFiles.errors.txt
+++ b/tests/baselines/reference/declarationFiles.errors.txt
@@ -1,15 +1,18 @@
+tests/cases/conformance/types/thisType/declarationFiles.ts(5,20): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
 tests/cases/conformance/types/thisType/declarationFiles.ts(31,5): error TS2527: The inferred type of 'x1' references an inaccessible 'this' type. A type annotation is necessary.
 tests/cases/conformance/types/thisType/declarationFiles.ts(33,5): error TS2527: The inferred type of 'x3' references an inaccessible 'this' type. A type annotation is necessary.
 tests/cases/conformance/types/thisType/declarationFiles.ts(35,5): error TS2527: The inferred type of 'f1' references an inaccessible 'this' type. A type annotation is necessary.
 tests/cases/conformance/types/thisType/declarationFiles.ts(41,5): error TS2527: The inferred type of 'f3' references an inaccessible 'this' type. A type annotation is necessary.
 
 
-==== tests/cases/conformance/types/thisType/declarationFiles.ts (4 errors) ====
+==== tests/cases/conformance/types/thisType/declarationFiles.ts (5 errors) ====
     
     class C1 {
         x: this;
         f(x: this): this { return undefined; }
         constructor(x: this) { }
+                       ~~~~
+!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
     }
     
     class C2 {
diff --git a/tests/baselines/reference/doWhileBreakStatements.js b/tests/baselines/reference/doWhileBreakStatements.js
index a2bc0d3c549..8e272ceed0a 100644
--- a/tests/baselines/reference/doWhileBreakStatements.js
+++ b/tests/baselines/reference/doWhileBreakStatements.js
@@ -1,4 +1,5 @@
 //// [doWhileBreakStatements.ts]
+
 do {
     break;
 } while(true)
diff --git a/tests/baselines/reference/doWhileBreakStatements.symbols b/tests/baselines/reference/doWhileBreakStatements.symbols
index 7d9db9a5ebb..14db540598d 100644
--- a/tests/baselines/reference/doWhileBreakStatements.symbols
+++ b/tests/baselines/reference/doWhileBreakStatements.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/doWhileBreakStatements.ts ===
+
 do {
     break;
 } while(true)
@@ -34,7 +35,7 @@ do do do break SEVEN; while (true) while (true)  while (true)
 EIGHT:
 do{
     var fn = function () { }
->fn : Symbol(fn, Decl(doWhileBreakStatements.ts, 34, 7))
+>fn : Symbol(fn, Decl(doWhileBreakStatements.ts, 35, 7))
 
     break EIGHT;
 }while(true)
diff --git a/tests/baselines/reference/doWhileBreakStatements.types b/tests/baselines/reference/doWhileBreakStatements.types
index c3ca932910a..f143cb17d08 100644
--- a/tests/baselines/reference/doWhileBreakStatements.types
+++ b/tests/baselines/reference/doWhileBreakStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/doWhileBreakStatements.ts ===
+
 do {
     break;
 } while(true)
diff --git a/tests/baselines/reference/doWhileContinueStatements.js b/tests/baselines/reference/doWhileContinueStatements.js
index 7f73157fd99..51bac3c4e09 100644
--- a/tests/baselines/reference/doWhileContinueStatements.js
+++ b/tests/baselines/reference/doWhileContinueStatements.js
@@ -1,4 +1,5 @@
 //// [doWhileContinueStatements.ts]
+
 do {
     continue;
 } while(true)
diff --git a/tests/baselines/reference/doWhileContinueStatements.symbols b/tests/baselines/reference/doWhileContinueStatements.symbols
index e4c6d577d5a..36ca2dde764 100644
--- a/tests/baselines/reference/doWhileContinueStatements.symbols
+++ b/tests/baselines/reference/doWhileContinueStatements.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/continueStatements/doWhileContinueStatements.ts ===
+
 do {
     continue;
 } while(true)
@@ -34,7 +35,7 @@ do do do continue SEVEN; while (true) while (true)  while (true)
 EIGHT:
 do{
     var fn = function () { }
->fn : Symbol(fn, Decl(doWhileContinueStatements.ts, 34, 7))
+>fn : Symbol(fn, Decl(doWhileContinueStatements.ts, 35, 7))
 
     continue EIGHT;
 }while(true)
diff --git a/tests/baselines/reference/doWhileContinueStatements.types b/tests/baselines/reference/doWhileContinueStatements.types
index 90c9f59842a..e4d3191d040 100644
--- a/tests/baselines/reference/doWhileContinueStatements.types
+++ b/tests/baselines/reference/doWhileContinueStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/continueStatements/doWhileContinueStatements.ts ===
+
 do {
     continue;
 } while(true)
diff --git a/tests/baselines/reference/downlevelLetConst16.errors.txt b/tests/baselines/reference/downlevelLetConst16.errors.txt
index 905d1a607e8..a6ada633016 100644
--- a/tests/baselines/reference/downlevelLetConst16.errors.txt
+++ b/tests/baselines/reference/downlevelLetConst16.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/compiler/downlevelLetConst16.ts(151,15): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
-tests/cases/compiler/downlevelLetConst16.ts(164,17): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
-tests/cases/compiler/downlevelLetConst16.ts(195,14): error TS2461: Type 'undefined' is not an array type.
-tests/cases/compiler/downlevelLetConst16.ts(202,15): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
-tests/cases/compiler/downlevelLetConst16.ts(216,16): error TS2461: Type 'undefined' is not an array type.
-tests/cases/compiler/downlevelLetConst16.ts(223,17): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
+tests/cases/compiler/downlevelLetConst16.ts(152,15): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
+tests/cases/compiler/downlevelLetConst16.ts(165,17): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
+tests/cases/compiler/downlevelLetConst16.ts(196,14): error TS2461: Type 'undefined' is not an array type.
+tests/cases/compiler/downlevelLetConst16.ts(203,15): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
+tests/cases/compiler/downlevelLetConst16.ts(217,16): error TS2461: Type 'undefined' is not an array type.
+tests/cases/compiler/downlevelLetConst16.ts(224,17): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
 
 
 ==== tests/cases/compiler/downlevelLetConst16.ts (6 errors) ====
+    
     'use strict'
     
     declare function use(a: any);
diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js
index 874fc121191..d6f05f7584a 100644
--- a/tests/baselines/reference/downlevelLetConst16.js
+++ b/tests/baselines/reference/downlevelLetConst16.js
@@ -1,4 +1,5 @@
 //// [downlevelLetConst16.ts]
+
 'use strict'
 
 declare function use(a: any);
diff --git a/tests/baselines/reference/downlevelLetConst18.errors.txt b/tests/baselines/reference/downlevelLetConst18.errors.txt
deleted file mode 100644
index 8f30b0f802a..00000000000
--- a/tests/baselines/reference/downlevelLetConst18.errors.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-tests/cases/compiler/downlevelLetConst18.ts(3,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst18.ts(4,14): error TS2393: Duplicate function implementation.
-tests/cases/compiler/downlevelLetConst18.ts(7,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst18.ts(8,14): error TS2393: Duplicate function implementation.
-tests/cases/compiler/downlevelLetConst18.ts(11,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst18.ts(15,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst18.ts(19,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst18.ts(23,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst18.ts(27,1): error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-
-
-==== tests/cases/compiler/downlevelLetConst18.ts (9 errors) ====
-    'use strict'
-    
-    for (let x; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        function foo() { x };
-                 ~~~
-!!! error TS2393: Duplicate function implementation.
-    }
-    
-    for (let x; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        function foo() { x };
-                 ~~~
-!!! error TS2393: Duplicate function implementation.
-    }
-    
-    for (let x; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        (() => { x })();
-    }
-    
-    for (const x = 1; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        (() => { x })();
-    }
-    
-    for (let x; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        ({ foo() { x }})
-    }
-    
-    for (let x; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        ({ get foo() { return x } })
-    }
-    
-    for (let x; ;) {
-    ~~~
-!!! error TS4091: Loop contains block-scoped variable 'x' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.
-        ({ set foo(v) { x } })
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/downlevelLetConst18.js b/tests/baselines/reference/downlevelLetConst18.js
index 70b8cb9e346..cc11c1eef3a 100644
--- a/tests/baselines/reference/downlevelLetConst18.js
+++ b/tests/baselines/reference/downlevelLetConst18.js
@@ -1,4 +1,5 @@
 //// [downlevelLetConst18.ts]
+
 'use strict'
 
 for (let x; ;) {
@@ -6,7 +7,7 @@ for (let x; ;) {
 }
 
 for (let x; ;) {
-    function foo() { x };
+    function foo1() { x };
 }
 
 for (let x; ;) {
@@ -32,26 +33,47 @@ for (let x; ;) {
 
 //// [downlevelLetConst18.js]
 'use strict';
-for (var x = void 0;;) {
+var _loop_1 = function(x) {
     function foo() { x; }
     ;
-}
+};
 for (var x = void 0;;) {
-    function foo() { x; }
+    _loop_1(x);
+}
+var _loop_2 = function(x) {
+    function foo1() { x; }
     ;
-}
+};
 for (var x = void 0;;) {
+    _loop_2(x);
+}
+var _loop_3 = function(x) {
     (function () { x; })();
+};
+for (var x = void 0;;) {
+    _loop_3(x);
 }
+var _loop_4 = function(x) {
+    (function () { x; })();
+};
 for (var x = 1;;) {
-    (function () { x; })();
+    _loop_4(x);
 }
-for (var x = void 0;;) {
+var _loop_5 = function(x) {
     ({ foo: function () { x; } });
-}
+};
 for (var x = void 0;;) {
+    _loop_5(x);
+}
+var _loop_6 = function(x) {
     ({ get foo() { return x; } });
-}
+};
 for (var x = void 0;;) {
+    _loop_6(x);
+}
+var _loop_7 = function(x) {
     ({ set foo(v) { x; } });
+};
+for (var x = void 0;;) {
+    _loop_7(x);
 }
diff --git a/tests/baselines/reference/downlevelLetConst18.symbols b/tests/baselines/reference/downlevelLetConst18.symbols
new file mode 100644
index 00000000000..a1df0dc6ae9
--- /dev/null
+++ b/tests/baselines/reference/downlevelLetConst18.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/downlevelLetConst18.ts ===
+
+'use strict'
+
+for (let x; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 3, 8))
+
+    function foo() { x };
+>foo : Symbol(foo, Decl(downlevelLetConst18.ts, 3, 16))
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 3, 8))
+}
+
+for (let x; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 7, 8))
+
+    function foo1() { x };
+>foo1 : Symbol(foo1, Decl(downlevelLetConst18.ts, 7, 16))
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 7, 8))
+}
+
+for (let x; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 11, 8))
+
+    (() => { x })();
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 11, 8))
+}
+
+for (const x = 1; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 15, 10))
+
+    (() => { x })();
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 15, 10))
+}
+
+for (let x; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 19, 8))
+
+    ({ foo() { x }})
+>foo : Symbol(foo, Decl(downlevelLetConst18.ts, 20, 6))
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 19, 8))
+}
+
+for (let x; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 23, 8))
+
+    ({ get foo() { return x } })
+>foo : Symbol(foo, Decl(downlevelLetConst18.ts, 24, 6))
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 23, 8))
+}
+
+for (let x; ;) {
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 27, 8))
+
+    ({ set foo(v) { x } })
+>foo : Symbol(foo, Decl(downlevelLetConst18.ts, 28, 6))
+>v : Symbol(v, Decl(downlevelLetConst18.ts, 28, 15))
+>x : Symbol(x, Decl(downlevelLetConst18.ts, 27, 8))
+}
+
diff --git a/tests/baselines/reference/downlevelLetConst18.types b/tests/baselines/reference/downlevelLetConst18.types
new file mode 100644
index 00000000000..42421aa80c0
--- /dev/null
+++ b/tests/baselines/reference/downlevelLetConst18.types
@@ -0,0 +1,73 @@
+=== tests/cases/compiler/downlevelLetConst18.ts ===
+
+'use strict'
+>'use strict' : string
+
+for (let x; ;) {
+>x : any
+
+    function foo() { x };
+>foo : () => void
+>x : any
+}
+
+for (let x; ;) {
+>x : any
+
+    function foo1() { x };
+>foo1 : () => void
+>x : any
+}
+
+for (let x; ;) {
+>x : any
+
+    (() => { x })();
+>(() => { x })() : void
+>(() => { x }) : () => void
+>() => { x } : () => void
+>x : any
+}
+
+for (const x = 1; ;) {
+>x : number
+>1 : number
+
+    (() => { x })();
+>(() => { x })() : void
+>(() => { x }) : () => void
+>() => { x } : () => void
+>x : number
+}
+
+for (let x; ;) {
+>x : any
+
+    ({ foo() { x }})
+>({ foo() { x }}) : { foo(): void; }
+>{ foo() { x }} : { foo(): void; }
+>foo : () => void
+>x : any
+}
+
+for (let x; ;) {
+>x : any
+
+    ({ get foo() { return x } })
+>({ get foo() { return x } }) : { foo: any; }
+>{ get foo() { return x } } : { foo: any; }
+>foo : any
+>x : any
+}
+
+for (let x; ;) {
+>x : any
+
+    ({ set foo(v) { x } })
+>({ set foo(v) { x } }) : { foo: any; }
+>{ set foo(v) { x } } : { foo: any; }
+>foo : any
+>v : any
+>x : any
+}
+
diff --git a/tests/baselines/reference/duplicateLabel1.errors.txt b/tests/baselines/reference/duplicateLabel1.errors.txt
index b34f1f771e0..cf116f656fc 100644
--- a/tests/baselines/reference/duplicateLabel1.errors.txt
+++ b/tests/baselines/reference/duplicateLabel1.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/duplicateLabel1.ts(2,1): error TS1114: Duplicate label 'target'
+tests/cases/compiler/duplicateLabel1.ts(3,1): error TS1114: Duplicate label 'target'
 
 
 ==== tests/cases/compiler/duplicateLabel1.ts (1 errors) ====
+    
     target:
     target:
     ~~~~~~
diff --git a/tests/baselines/reference/duplicateLabel1.js b/tests/baselines/reference/duplicateLabel1.js
index e7976895c94..5251cec3e36 100644
--- a/tests/baselines/reference/duplicateLabel1.js
+++ b/tests/baselines/reference/duplicateLabel1.js
@@ -1,4 +1,5 @@
 //// [duplicateLabel1.ts]
+
 target:
 target:
 while (true) {
diff --git a/tests/baselines/reference/duplicateLabel2.errors.txt b/tests/baselines/reference/duplicateLabel2.errors.txt
index 307596cf4e8..2a87ed96648 100644
--- a/tests/baselines/reference/duplicateLabel2.errors.txt
+++ b/tests/baselines/reference/duplicateLabel2.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/duplicateLabel2.ts(3,3): error TS1114: Duplicate label 'target'
+tests/cases/compiler/duplicateLabel2.ts(4,3): error TS1114: Duplicate label 'target'
 
 
 ==== tests/cases/compiler/duplicateLabel2.ts (1 errors) ====
+    
     target:
     while (true) {
       target:
diff --git a/tests/baselines/reference/duplicateLabel2.js b/tests/baselines/reference/duplicateLabel2.js
index 9ee9671d59d..40a5ee4595e 100644
--- a/tests/baselines/reference/duplicateLabel2.js
+++ b/tests/baselines/reference/duplicateLabel2.js
@@ -1,4 +1,5 @@
 //// [duplicateLabel2.ts]
+
 target:
 while (true) {
   target:
diff --git a/tests/baselines/reference/duplicateLabel3.js b/tests/baselines/reference/duplicateLabel3.js
index 37e9619e8f6..a1d33e46fc1 100644
--- a/tests/baselines/reference/duplicateLabel3.js
+++ b/tests/baselines/reference/duplicateLabel3.js
@@ -1,4 +1,5 @@
 //// [duplicateLabel3.ts]
+
 target:
 while (true) {
   function f() {
diff --git a/tests/baselines/reference/duplicateLabel3.symbols b/tests/baselines/reference/duplicateLabel3.symbols
index 07d0ded2923..89f2d5ee48a 100644
--- a/tests/baselines/reference/duplicateLabel3.symbols
+++ b/tests/baselines/reference/duplicateLabel3.symbols
@@ -1,8 +1,9 @@
 === tests/cases/compiler/duplicateLabel3.ts ===
+
 target:
 while (true) {
   function f() {
->f : Symbol(f, Decl(duplicateLabel3.ts, 1, 14))
+>f : Symbol(f, Decl(duplicateLabel3.ts, 2, 14))
 
     target:
     while (true) {
diff --git a/tests/baselines/reference/duplicateLabel3.types b/tests/baselines/reference/duplicateLabel3.types
index 8d75b08c768..920a077aa9e 100644
--- a/tests/baselines/reference/duplicateLabel3.types
+++ b/tests/baselines/reference/duplicateLabel3.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/duplicateLabel3.ts ===
+
 target:
 >target : any
 
diff --git a/tests/baselines/reference/duplicateLabel4.js b/tests/baselines/reference/duplicateLabel4.js
index 22d072d38d7..d5b81b1e5bb 100644
--- a/tests/baselines/reference/duplicateLabel4.js
+++ b/tests/baselines/reference/duplicateLabel4.js
@@ -1,4 +1,5 @@
 //// [duplicateLabel4.ts]
+
 target:
 while (true) {
 }
diff --git a/tests/baselines/reference/duplicateLabel4.symbols b/tests/baselines/reference/duplicateLabel4.symbols
index c671abcef35..5660782e2ec 100644
--- a/tests/baselines/reference/duplicateLabel4.symbols
+++ b/tests/baselines/reference/duplicateLabel4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/duplicateLabel4.ts ===
-target:
+
+No type information for this code.target:
 No type information for this code.while (true) {
 No type information for this code.}
 No type information for this code.
diff --git a/tests/baselines/reference/duplicateLabel4.types b/tests/baselines/reference/duplicateLabel4.types
index 9238986b582..a10a06fe7a2 100644
--- a/tests/baselines/reference/duplicateLabel4.types
+++ b/tests/baselines/reference/duplicateLabel4.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/duplicateLabel4.ts ===
+
 target:
 >target : any
 
diff --git a/tests/baselines/reference/duplicateLocalVariable1.errors.txt b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
index e4217d4d411..bd6d535d88e 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.errors.txt
+++ b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
@@ -1,7 +1,19 @@
-tests/cases/compiler/duplicateLocalVariable1.ts(185,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'any', but here has type 'number'.
+tests/cases/compiler/duplicateLocalVariable1.ts(2,4): error TS1005: ';' expected.
+tests/cases/compiler/duplicateLocalVariable1.ts(2,11): error TS1146: Declaration expected.
+tests/cases/compiler/duplicateLocalVariable1.ts(2,13): error TS2304: Cannot find name 'commonjs'.
+tests/cases/compiler/duplicateLocalVariable1.ts(12,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
+tests/cases/compiler/duplicateLocalVariable1.ts(187,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'any', but here has type 'number'.
 
 
-==== tests/cases/compiler/duplicateLocalVariable1.ts (1 errors) ====
+==== tests/cases/compiler/duplicateLocalVariable1.ts (5 errors) ====
+    
+    / /@module: commonjs
+       ~
+!!! error TS1005: ';' expected.
+              
+!!! error TS1146: Declaration expected.
+                ~~~~~~~~
+!!! error TS2304: Cannot find name 'commonjs'.
     
     //import FileManager = require('filemanager');
     //import App = require('app');
@@ -12,6 +24,8 @@ tests/cases/compiler/duplicateLocalVariable1.ts(185,22): error TS2403: Subsequen
     var TestFileDir = ".\\TempTestFiles";
     
     export class TestCase {
+                 ~~~~~~~~
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
         constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) {
         }
     }
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index 62e291f28c0..ecde1ff2407 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -1,5 +1,7 @@
 //// [duplicateLocalVariable1.ts]
 
+/ /@module: commonjs
+
 //import FileManager = require('filemanager');
 //import App = require('app');
 
@@ -344,8 +346,8 @@ export var tests: TestRunner = (function () {
 })();
 
 //// [duplicateLocalVariable1.js]
-//import FileManager = require('filemanager');
-//import App = require('app');
+/ /;
+commonjs;
 var TestFileDir = ".\\TempTestFiles";
 var TestCase = (function () {
     function TestCase(name, test, errorMessageRegEx) {
diff --git a/tests/baselines/reference/duplicateVariablesByScope.js b/tests/baselines/reference/duplicateVariablesByScope.js
index d87fd966f32..43b6e89d412 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.js
+++ b/tests/baselines/reference/duplicateVariablesByScope.js
@@ -1,4 +1,5 @@
 //// [duplicateVariablesByScope.ts]
+
 // duplicate local variables are only reported at global scope
 
 module M {
diff --git a/tests/baselines/reference/duplicateVariablesByScope.symbols b/tests/baselines/reference/duplicateVariablesByScope.symbols
index bc94dc9b807..9dd280d2756 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.symbols
+++ b/tests/baselines/reference/duplicateVariablesByScope.symbols
@@ -1,56 +1,57 @@
 === tests/cases/compiler/duplicateVariablesByScope.ts ===
+
 // duplicate local variables are only reported at global scope
 
 module M {
 >M : Symbol(M, Decl(duplicateVariablesByScope.ts, 0, 0))
 
     for (var j = 0; j < 10; j++) {
->j : Symbol(j, Decl(duplicateVariablesByScope.ts, 3, 12), Decl(duplicateVariablesByScope.ts, 6, 12))
->j : Symbol(j, Decl(duplicateVariablesByScope.ts, 3, 12), Decl(duplicateVariablesByScope.ts, 6, 12))
->j : Symbol(j, Decl(duplicateVariablesByScope.ts, 3, 12), Decl(duplicateVariablesByScope.ts, 6, 12))
+>j : Symbol(j, Decl(duplicateVariablesByScope.ts, 4, 12), Decl(duplicateVariablesByScope.ts, 7, 12))
+>j : Symbol(j, Decl(duplicateVariablesByScope.ts, 4, 12), Decl(duplicateVariablesByScope.ts, 7, 12))
+>j : Symbol(j, Decl(duplicateVariablesByScope.ts, 4, 12), Decl(duplicateVariablesByScope.ts, 7, 12))
     }
 
     for (var j = 0; j < 10; j++) {
->j : Symbol(j, Decl(duplicateVariablesByScope.ts, 3, 12), Decl(duplicateVariablesByScope.ts, 6, 12))
->j : Symbol(j, Decl(duplicateVariablesByScope.ts, 3, 12), Decl(duplicateVariablesByScope.ts, 6, 12))
->j : Symbol(j, Decl(duplicateVariablesByScope.ts, 3, 12), Decl(duplicateVariablesByScope.ts, 6, 12))
+>j : Symbol(j, Decl(duplicateVariablesByScope.ts, 4, 12), Decl(duplicateVariablesByScope.ts, 7, 12))
+>j : Symbol(j, Decl(duplicateVariablesByScope.ts, 4, 12), Decl(duplicateVariablesByScope.ts, 7, 12))
+>j : Symbol(j, Decl(duplicateVariablesByScope.ts, 4, 12), Decl(duplicateVariablesByScope.ts, 7, 12))
     }
 }
 
 function foo() {
->foo : Symbol(foo, Decl(duplicateVariablesByScope.ts, 8, 1))
+>foo : Symbol(foo, Decl(duplicateVariablesByScope.ts, 9, 1))
 
     var x = 2;
->x : Symbol(x, Decl(duplicateVariablesByScope.ts, 11, 7), Decl(duplicateVariablesByScope.ts, 12, 7))
+>x : Symbol(x, Decl(duplicateVariablesByScope.ts, 12, 7), Decl(duplicateVariablesByScope.ts, 13, 7))
 
     var x = 1;
->x : Symbol(x, Decl(duplicateVariablesByScope.ts, 11, 7), Decl(duplicateVariablesByScope.ts, 12, 7))
+>x : Symbol(x, Decl(duplicateVariablesByScope.ts, 12, 7), Decl(duplicateVariablesByScope.ts, 13, 7))
 
     if (true) {
         var result = 1;
->result : Symbol(result, Decl(duplicateVariablesByScope.ts, 14, 11), Decl(duplicateVariablesByScope.ts, 17, 11))
+>result : Symbol(result, Decl(duplicateVariablesByScope.ts, 15, 11), Decl(duplicateVariablesByScope.ts, 18, 11))
     }
     else {
         var result = 2;
->result : Symbol(result, Decl(duplicateVariablesByScope.ts, 14, 11), Decl(duplicateVariablesByScope.ts, 17, 11))
+>result : Symbol(result, Decl(duplicateVariablesByScope.ts, 15, 11), Decl(duplicateVariablesByScope.ts, 18, 11))
     }
 }
 
 class C {
->C : Symbol(C, Decl(duplicateVariablesByScope.ts, 19, 1))
+>C : Symbol(C, Decl(duplicateVariablesByScope.ts, 20, 1))
 
     foo() {
->foo : Symbol(foo, Decl(duplicateVariablesByScope.ts, 21, 9))
+>foo : Symbol(foo, Decl(duplicateVariablesByScope.ts, 22, 9))
 
         try {
             var x = 1;
->x : Symbol(x, Decl(duplicateVariablesByScope.ts, 24, 15), Decl(duplicateVariablesByScope.ts, 27, 15))
+>x : Symbol(x, Decl(duplicateVariablesByScope.ts, 25, 15), Decl(duplicateVariablesByScope.ts, 28, 15))
         }
         catch (e) {
->e : Symbol(e, Decl(duplicateVariablesByScope.ts, 26, 15))
+>e : Symbol(e, Decl(duplicateVariablesByScope.ts, 27, 15))
 
             var x = 2;
->x : Symbol(x, Decl(duplicateVariablesByScope.ts, 24, 15), Decl(duplicateVariablesByScope.ts, 27, 15))
+>x : Symbol(x, Decl(duplicateVariablesByScope.ts, 25, 15), Decl(duplicateVariablesByScope.ts, 28, 15))
         }
     }
 }
diff --git a/tests/baselines/reference/duplicateVariablesByScope.types b/tests/baselines/reference/duplicateVariablesByScope.types
index 42d8cae2a3c..30e68d921ca 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.types
+++ b/tests/baselines/reference/duplicateVariablesByScope.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/duplicateVariablesByScope.ts ===
+
 // duplicate local variables are only reported at global scope
 
 module M {
diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js
index ece24d691da..e7f88b92775 100644
--- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js
@@ -10,16 +10,16 @@ class C {
     static get ["computedname"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname1"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname2"]() {
         return "";
     }
 
-    set ["computedname"](x: any) {
+    set ["computedname3"](x: any) {
     }
-    set ["computedname"](y: string) {
+    set ["computedname4"](y: string) {
     }
 
     set foo(a: string) { }
@@ -38,15 +38,15 @@ class C {
     static get ["computedname"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname1"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname2"]() {
         return "";
     }
-    set ["computedname"](x) {
+    set ["computedname3"](x) {
     }
-    set ["computedname"](y) {
+    set ["computedname4"](y) {
     }
     set foo(a) { }
     static set bar(b) { }
diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols
index 2d249348f9b..b2b1a000dc9 100644
--- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols
@@ -21,18 +21,18 @@ class C {
     static get ["computedname"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname1"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname2"]() {
         return "";
     }
 
-    set ["computedname"](x: any) {
->x : Symbol(x, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 18, 25))
+    set ["computedname3"](x: any) {
+>x : Symbol(x, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 18, 26))
     }
-    set ["computedname"](y: string) {
->y : Symbol(y, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 20, 25))
+    set ["computedname4"](y: string) {
+>y : Symbol(y, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 20, 26))
     }
 
     set foo(a: string) { }
diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
index 292fb961b10..e4f7d6c00b4 100644
--- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types
@@ -25,25 +25,25 @@ class C {
         return "";
 >"" : string
     }
-    get ["computedname"]() {
->"computedname" : string
+    get ["computedname1"]() {
+>"computedname1" : string
 
         return "";
 >"" : string
     }
-    get ["computedname"]() {
->"computedname" : string
+    get ["computedname2"]() {
+>"computedname2" : string
 
         return "";
 >"" : string
     }
 
-    set ["computedname"](x: any) {
->"computedname" : string
+    set ["computedname3"](x: any) {
+>"computedname3" : string
 >x : any
     }
-    set ["computedname"](y: string) {
->"computedname" : string
+    set ["computedname4"](y: string) {
+>"computedname4" : string
 >y : string
     }
 
diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js
index fc0a510461b..8a79d45b678 100644
--- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js
@@ -2,18 +2,18 @@
 class D {
     _bar: string;
     foo() { }
-    ["computedName"]() { }
-    ["computedName"](a: string) { }
-    ["computedName"](a: string): number { return 1; }
+    ["computedName1"]() { }
+    ["computedName2"](a: string) { }
+    ["computedName3"](a: string): number { return 1; }
     bar(): string {
         return this._bar;
     } 
     baz(a: any, x: string): string {
         return "HELLO";
     }
-    static ["computedname"]() { }
-    static ["computedname"](a: string) { }
-    static ["computedname"](a: string): boolean { return true; }
+    static ["computedname4"]() { }
+    static ["computedname5"](a: string) { }
+    static ["computedname6"](a: string): boolean { return true; }
     static staticMethod() {
         var x = 1 + 2;
         return x
@@ -25,18 +25,18 @@ class D {
 //// [emitClassDeclarationWithMethodInES6.js]
 class D {
     foo() { }
-    ["computedName"]() { }
-    ["computedName"](a) { }
-    ["computedName"](a) { return 1; }
+    ["computedName1"]() { }
+    ["computedName2"](a) { }
+    ["computedName3"](a) { return 1; }
     bar() {
         return this._bar;
     }
     baz(a, x) {
         return "HELLO";
     }
-    static ["computedname"]() { }
-    static ["computedname"](a) { }
-    static ["computedname"](a) { return true; }
+    static ["computedname4"]() { }
+    static ["computedname5"](a) { }
+    static ["computedname6"](a) { return true; }
     static staticMethod() {
         var x = 1 + 2;
         return x;
diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols
index b7a4dbbf341..970076f6b78 100644
--- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols
@@ -8,15 +8,15 @@ class D {
     foo() { }
 >foo : Symbol(foo, Decl(emitClassDeclarationWithMethodInES6.ts, 1, 17))
 
-    ["computedName"]() { }
-    ["computedName"](a: string) { }
->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 4, 21))
+    ["computedName1"]() { }
+    ["computedName2"](a: string) { }
+>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 4, 22))
 
-    ["computedName"](a: string): number { return 1; }
->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 21))
+    ["computedName3"](a: string): number { return 1; }
+>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 22))
 
     bar(): string {
->bar : Symbol(bar, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 53))
+>bar : Symbol(bar, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 54))
 
         return this._bar;
 >this._bar : Symbol(_bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
@@ -30,15 +30,15 @@ class D {
 
         return "HELLO";
     }
-    static ["computedname"]() { }
-    static ["computedname"](a: string) { }
->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 13, 28))
+    static ["computedname4"]() { }
+    static ["computedname5"](a: string) { }
+>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 13, 29))
 
-    static ["computedname"](a: string): boolean { return true; }
->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 28))
+    static ["computedname6"](a: string): boolean { return true; }
+>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 29))
 
     static staticMethod() {
->staticMethod : Symbol(D.staticMethod, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 64))
+>staticMethod : Symbol(D.staticMethod, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 65))
 
         var x = 1 + 2;
 >x : Symbol(x, Decl(emitClassDeclarationWithMethodInES6.ts, 16, 11))
diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types
index 10ae930c244..02a90729486 100644
--- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types
@@ -8,15 +8,15 @@ class D {
     foo() { }
 >foo : () => void
 
-    ["computedName"]() { }
->"computedName" : string
+    ["computedName1"]() { }
+>"computedName1" : string
 
-    ["computedName"](a: string) { }
->"computedName" : string
+    ["computedName2"](a: string) { }
+>"computedName2" : string
 >a : string
 
-    ["computedName"](a: string): number { return 1; }
->"computedName" : string
+    ["computedName3"](a: string): number { return 1; }
+>"computedName3" : string
 >a : string
 >1 : number
 
@@ -36,15 +36,15 @@ class D {
         return "HELLO";
 >"HELLO" : string
     }
-    static ["computedname"]() { }
->"computedname" : string
+    static ["computedname4"]() { }
+>"computedname4" : string
 
-    static ["computedname"](a: string) { }
->"computedname" : string
+    static ["computedname5"](a: string) { }
+>"computedname5" : string
 >a : string
 
-    static ["computedname"](a: string): boolean { return true; }
->"computedname" : string
+    static ["computedname6"](a: string): boolean { return true; }
+>"computedname6" : string
 >a : string
 >true : boolean
 
diff --git a/tests/baselines/reference/emptyThenWarning.errors.txt b/tests/baselines/reference/emptyThenWarning.errors.txt
new file mode 100644
index 00000000000..a4f91261865
--- /dev/null
+++ b/tests/baselines/reference/emptyThenWarning.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/emptyThenWarning.ts(1,6): error TS1313: The body of an 'if' statement cannot be the empty statement.
+tests/cases/compiler/emptyThenWarning.ts(4,19): error TS1313: The body of an 'if' statement cannot be the empty statement.
+
+
+==== tests/cases/compiler/emptyThenWarning.ts (2 errors) ====
+    if(1);
+         ~
+!!! error TS1313: The body of an 'if' statement cannot be the empty statement.
+    
+    let x = 0;
+    if (true === true); {  
+                      ~
+!!! error TS1313: The body of an 'if' statement cannot be the empty statement.
+        x = 1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emptyThenWarning.js b/tests/baselines/reference/emptyThenWarning.js
new file mode 100644
index 00000000000..c7959d03d57
--- /dev/null
+++ b/tests/baselines/reference/emptyThenWarning.js
@@ -0,0 +1,17 @@
+//// [emptyThenWarning.ts]
+if(1);
+
+let x = 0;
+if (true === true); {  
+    x = 1;
+}
+
+//// [emptyThenWarning.js]
+if (1)
+    ;
+var x = 0;
+if (true === true)
+    ;
+{
+    x = 1;
+}
diff --git a/tests/baselines/reference/emptyThenWithoutWarning.js b/tests/baselines/reference/emptyThenWithoutWarning.js
new file mode 100644
index 00000000000..107531fe1e3
--- /dev/null
+++ b/tests/baselines/reference/emptyThenWithoutWarning.js
@@ -0,0 +1,16 @@
+//// [emptyThenWithoutWarning.ts]
+let a = 4;
+
+if(a === 1 || a === 2 || a === 3) {
+}
+else {
+    let message = "Ooops";
+}
+
+//// [emptyThenWithoutWarning.js]
+var a = 4;
+if (a === 1 || a === 2 || a === 3) {
+}
+else {
+    var message = "Ooops";
+}
diff --git a/tests/baselines/reference/emptyThenWithoutWarning.symbols b/tests/baselines/reference/emptyThenWithoutWarning.symbols
new file mode 100644
index 00000000000..d707e7bc89c
--- /dev/null
+++ b/tests/baselines/reference/emptyThenWithoutWarning.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/emptyThenWithoutWarning.ts ===
+let a = 4;
+>a : Symbol(a, Decl(emptyThenWithoutWarning.ts, 0, 3))
+
+if(a === 1 || a === 2 || a === 3) {
+>a : Symbol(a, Decl(emptyThenWithoutWarning.ts, 0, 3))
+>a : Symbol(a, Decl(emptyThenWithoutWarning.ts, 0, 3))
+>a : Symbol(a, Decl(emptyThenWithoutWarning.ts, 0, 3))
+}
+else {
+    let message = "Ooops";
+>message : Symbol(message, Decl(emptyThenWithoutWarning.ts, 5, 7))
+}
diff --git a/tests/baselines/reference/emptyThenWithoutWarning.types b/tests/baselines/reference/emptyThenWithoutWarning.types
new file mode 100644
index 00000000000..2dca4059669
--- /dev/null
+++ b/tests/baselines/reference/emptyThenWithoutWarning.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/emptyThenWithoutWarning.ts ===
+let a = 4;
+>a : number
+>4 : number
+
+if(a === 1 || a === 2 || a === 3) {
+>a === 1 || a === 2 || a === 3 : boolean
+>a === 1 || a === 2 : boolean
+>a === 1 : boolean
+>a : number
+>1 : number
+>a === 2 : boolean
+>a : number
+>2 : number
+>a === 3 : boolean
+>a : number
+>3 : number
+}
+else {
+    let message = "Ooops";
+>message : string
+>"Ooops" : string
+}
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js
index 11c4f4e1807..52207ceda96 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js
@@ -80,22 +80,22 @@
 })();
 (function () {
     var ns = [];
-    for (var _i = 0; _i < ns.length; _i++) {
-        var _a = ns[_i];
+    for (var _i = 0, ns_1 = ns; _i < ns_1.length; _i++) {
+        var _a = ns_1[_i];
     }
-    for (var _b = 0; _b < ns.length; _b++) {
-        var _c = ns[_b];
+    for (var _b = 0, ns_2 = ns; _b < ns_2.length; _b++) {
+        var _c = ns_2[_b];
     }
-    for (var _d = 0; _d < ns.length; _d++) {
-        var _e = ns[_d];
+    for (var _d = 0, ns_3 = ns; _d < ns_3.length; _d++) {
+        var _e = ns_3[_d];
     }
-    for (var _f = 0; _f < ns.length; _f++) {
-        var _g = ns[_f];
+    for (var _f = 0, ns_4 = ns; _f < ns_4.length; _f++) {
+        var _g = ns_4[_f];
     }
-    for (var _h = 0; _h < ns.length; _h++) {
-        var _j = ns[_h];
+    for (var _h = 0, ns_5 = ns; _h < ns_5.length; _h++) {
+        var _j = ns_5[_h];
     }
-    for (var _k = 0; _k < ns.length; _k++) {
-        var _l = ns[_k];
+    for (var _k = 0, ns_6 = ns; _k < ns_6.length; _k++) {
+        var _l = ns_6[_k];
     }
 })();
diff --git a/tests/baselines/reference/errorOnContextuallyTypedReturnType.errors.txt b/tests/baselines/reference/errorOnContextuallyTypedReturnType.errors.txt
index 5b66a377307..403e79b8742 100644
--- a/tests/baselines/reference/errorOnContextuallyTypedReturnType.errors.txt
+++ b/tests/baselines/reference/errorOnContextuallyTypedReturnType.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/errorOnContextuallyTypedReturnType.ts(1,5): error TS2322: Type '() => void' is not assignable to type '() => boolean'.
   Type 'void' is not assignable to type 'boolean'.
-tests/cases/compiler/errorOnContextuallyTypedReturnType.ts(2,37): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/errorOnContextuallyTypedReturnType.ts(2,37): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 
 
 ==== tests/cases/compiler/errorOnContextuallyTypedReturnType.ts (2 errors) ====
@@ -10,5 +10,5 @@ tests/cases/compiler/errorOnContextuallyTypedReturnType.ts(2,37): error TS2355:
 !!! error TS2322:   Type 'void' is not assignable to type 'boolean'.
     var n2: () => boolean = function ():boolean { }; // expect an error here
                                         ~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es5andes6module.errors.txt b/tests/baselines/reference/es5andes6module.errors.txt
index d5a672b9486..6908bfc8ae6 100644
--- a/tests/baselines/reference/es5andes6module.errors.txt
+++ b/tests/baselines/reference/es5andes6module.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile modules into 'es6' when targeting 'ES5' or lower.
+error TS1204: Cannot compile modules into 'es2015' when targeting 'ES5' or lower.
 
 
-!!! error TS1204: Cannot compile modules into 'es6' when targeting 'ES5' or lower.
+!!! error TS1204: Cannot compile modules into 'es2015' when targeting 'ES5' or lower.
 ==== tests/cases/compiler/es5andes6module.ts (0 errors) ====
     
     export default class A
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.js b/tests/baselines/reference/es6ClassSuperCodegenBug.js
index 62c96f6260d..9f15af96be8 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -1,4 +1,5 @@
 //// [es6ClassSuperCodegenBug.ts]
+
 class A {
 	constructor(str1:string, str2:string) {}
 }
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.symbols b/tests/baselines/reference/es6ClassSuperCodegenBug.symbols
index d520ec3ceb1..bb500a1d2c2 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.symbols
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.symbols
@@ -1,13 +1,14 @@
 === tests/cases/compiler/es6ClassSuperCodegenBug.ts ===
+
 class A {
 >A : Symbol(A, Decl(es6ClassSuperCodegenBug.ts, 0, 0))
 
 	constructor(str1:string, str2:string) {}
->str1 : Symbol(str1, Decl(es6ClassSuperCodegenBug.ts, 1, 13))
->str2 : Symbol(str2, Decl(es6ClassSuperCodegenBug.ts, 1, 25))
+>str1 : Symbol(str1, Decl(es6ClassSuperCodegenBug.ts, 2, 13))
+>str2 : Symbol(str2, Decl(es6ClassSuperCodegenBug.ts, 2, 25))
 }
 class B extends A {
->B : Symbol(B, Decl(es6ClassSuperCodegenBug.ts, 2, 1))
+>B : Symbol(B, Decl(es6ClassSuperCodegenBug.ts, 3, 1))
 >A : Symbol(A, Decl(es6ClassSuperCodegenBug.ts, 0, 0))
 
     constructor() {
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.types b/tests/baselines/reference/es6ClassSuperCodegenBug.types
index bdf8ebde8f2..65269c99997 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.types
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/es6ClassSuperCodegenBug.ts ===
+
 class A {
 >A : A
 
diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js
index 5ab7dcc5a5a..64eaaa5784f 100644
--- a/tests/baselines/reference/escapedIdentifiers.js
+++ b/tests/baselines/reference/escapedIdentifiers.js
@@ -1,4 +1,5 @@
 //// [escapedIdentifiers.ts]
+
 /*
     0 .. \u0030
     9 .. \u0039
diff --git a/tests/baselines/reference/escapedIdentifiers.symbols b/tests/baselines/reference/escapedIdentifiers.symbols
index 6c84b25647f..a99e067b898 100644
--- a/tests/baselines/reference/escapedIdentifiers.symbols
+++ b/tests/baselines/reference/escapedIdentifiers.symbols
@@ -1,4 +1,5 @@
 === tests/cases/compiler/escapedIdentifiers.ts ===
+
 /*
     0 .. \u0030
     9 .. \u0039
@@ -12,222 +13,222 @@
 
 // var decl
 var \u0061 = 1;
->\u0061 : Symbol(\u0061, Decl(escapedIdentifiers.ts, 12, 3))
+>\u0061 : Symbol(\u0061, Decl(escapedIdentifiers.ts, 13, 3))
 
 a ++;
->a : Symbol(\u0061, Decl(escapedIdentifiers.ts, 12, 3))
+>a : Symbol(\u0061, Decl(escapedIdentifiers.ts, 13, 3))
 
 \u0061 ++;
->\u0061 : Symbol(\u0061, Decl(escapedIdentifiers.ts, 12, 3))
+>\u0061 : Symbol(\u0061, Decl(escapedIdentifiers.ts, 13, 3))
 
 var b = 1;
->b : Symbol(b, Decl(escapedIdentifiers.ts, 16, 3))
+>b : Symbol(b, Decl(escapedIdentifiers.ts, 17, 3))
 
 b ++;
->b : Symbol(b, Decl(escapedIdentifiers.ts, 16, 3))
+>b : Symbol(b, Decl(escapedIdentifiers.ts, 17, 3))
 
 \u0062 ++;
->\u0062 : Symbol(b, Decl(escapedIdentifiers.ts, 16, 3))
+>\u0062 : Symbol(b, Decl(escapedIdentifiers.ts, 17, 3))
 
 // modules
 module moduleType1 { 
->moduleType1 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 18, 10))
+>moduleType1 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 19, 10))
 
     export var baz1: number;
->baz1 : Symbol(baz1, Decl(escapedIdentifiers.ts, 22, 14))
+>baz1 : Symbol(baz1, Decl(escapedIdentifiers.ts, 23, 14))
 }
 module moduleType\u0032 { 
->moduleType\u0032 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 23, 1))
+>moduleType\u0032 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 24, 1))
 
     export var baz2: number;
->baz2 : Symbol(baz2, Decl(escapedIdentifiers.ts, 25, 14))
+>baz2 : Symbol(baz2, Decl(escapedIdentifiers.ts, 26, 14))
 }
 
 moduleType1.baz1 = 3;
->moduleType1.baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 22, 14))
->moduleType1 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 18, 10))
->baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 22, 14))
+>moduleType1.baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 23, 14))
+>moduleType1 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 19, 10))
+>baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 23, 14))
 
 moduleType\u0031.baz1 = 3;
->moduleType\u0031.baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 22, 14))
->moduleType\u0031 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 18, 10))
->baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 22, 14))
+>moduleType\u0031.baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 23, 14))
+>moduleType\u0031 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 19, 10))
+>baz1 : Symbol(moduleType1.baz1, Decl(escapedIdentifiers.ts, 23, 14))
 
 moduleType2.baz2 = 3;
->moduleType2.baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 25, 14))
->moduleType2 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 23, 1))
->baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 25, 14))
+>moduleType2.baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 26, 14))
+>moduleType2 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 24, 1))
+>baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 26, 14))
 
 moduleType\u0032.baz2 = 3;
->moduleType\u0032.baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 25, 14))
->moduleType\u0032 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 23, 1))
->baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 25, 14))
+>moduleType\u0032.baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 26, 14))
+>moduleType\u0032 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 24, 1))
+>baz2 : Symbol(moduleType\u0032.baz2, Decl(escapedIdentifiers.ts, 26, 14))
 
 // classes
 
 class classType1 { 
->classType1 : Symbol(classType1, Decl(escapedIdentifiers.ts, 31, 26))
+>classType1 : Symbol(classType1, Decl(escapedIdentifiers.ts, 32, 26))
 
     public foo1: number;
->foo1 : Symbol(foo1, Decl(escapedIdentifiers.ts, 35, 18))
+>foo1 : Symbol(foo1, Decl(escapedIdentifiers.ts, 36, 18))
 }
 class classType\u0032 { 
->classType\u0032 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 37, 1))
+>classType\u0032 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 38, 1))
 
     public foo2: number;
->foo2 : Symbol(foo2, Decl(escapedIdentifiers.ts, 38, 23))
+>foo2 : Symbol(foo2, Decl(escapedIdentifiers.ts, 39, 23))
 }
 
 var classType1Object1 = new classType1();
->classType1Object1 : Symbol(classType1Object1, Decl(escapedIdentifiers.ts, 42, 3))
->classType1 : Symbol(classType1, Decl(escapedIdentifiers.ts, 31, 26))
+>classType1Object1 : Symbol(classType1Object1, Decl(escapedIdentifiers.ts, 43, 3))
+>classType1 : Symbol(classType1, Decl(escapedIdentifiers.ts, 32, 26))
 
 classType1Object1.foo1 = 2;
->classType1Object1.foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 35, 18))
->classType1Object1 : Symbol(classType1Object1, Decl(escapedIdentifiers.ts, 42, 3))
->foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 35, 18))
+>classType1Object1.foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 36, 18))
+>classType1Object1 : Symbol(classType1Object1, Decl(escapedIdentifiers.ts, 43, 3))
+>foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 36, 18))
 
 var classType1Object2 = new classType\u0031();
->classType1Object2 : Symbol(classType1Object2, Decl(escapedIdentifiers.ts, 44, 3))
->classType\u0031 : Symbol(classType1, Decl(escapedIdentifiers.ts, 31, 26))
+>classType1Object2 : Symbol(classType1Object2, Decl(escapedIdentifiers.ts, 45, 3))
+>classType\u0031 : Symbol(classType1, Decl(escapedIdentifiers.ts, 32, 26))
 
 classType1Object2.foo1 = 2;
->classType1Object2.foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 35, 18))
->classType1Object2 : Symbol(classType1Object2, Decl(escapedIdentifiers.ts, 44, 3))
->foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 35, 18))
+>classType1Object2.foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 36, 18))
+>classType1Object2 : Symbol(classType1Object2, Decl(escapedIdentifiers.ts, 45, 3))
+>foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 36, 18))
 
 var classType2Object1 = new classType2();
->classType2Object1 : Symbol(classType2Object1, Decl(escapedIdentifiers.ts, 46, 3))
->classType2 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 37, 1))
+>classType2Object1 : Symbol(classType2Object1, Decl(escapedIdentifiers.ts, 47, 3))
+>classType2 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 38, 1))
 
 classType2Object1.foo2 = 2;
->classType2Object1.foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 38, 23))
->classType2Object1 : Symbol(classType2Object1, Decl(escapedIdentifiers.ts, 46, 3))
->foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 38, 23))
+>classType2Object1.foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 39, 23))
+>classType2Object1 : Symbol(classType2Object1, Decl(escapedIdentifiers.ts, 47, 3))
+>foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 39, 23))
 
 var classType2Object2 = new classType\u0032();
->classType2Object2 : Symbol(classType2Object2, Decl(escapedIdentifiers.ts, 48, 3))
->classType\u0032 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 37, 1))
+>classType2Object2 : Symbol(classType2Object2, Decl(escapedIdentifiers.ts, 49, 3))
+>classType\u0032 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 38, 1))
 
 classType2Object2.foo2 = 2;
->classType2Object2.foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 38, 23))
->classType2Object2 : Symbol(classType2Object2, Decl(escapedIdentifiers.ts, 48, 3))
->foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 38, 23))
+>classType2Object2.foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 39, 23))
+>classType2Object2 : Symbol(classType2Object2, Decl(escapedIdentifiers.ts, 49, 3))
+>foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 39, 23))
 
 // interfaces
 interface interfaceType1 { 
->interfaceType1 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 49, 27))
+>interfaceType1 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 50, 27))
 
     bar1: number;
->bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 52, 26))
+>bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 53, 26))
 }
 interface interfaceType\u0032 { 
->interfaceType\u0032 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 54, 1))
+>interfaceType\u0032 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 55, 1))
 
     bar2: number;
->bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 55, 31))
+>bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 56, 31))
 }
 
 var interfaceType1Object1 = <interfaceType1>{ bar1: 0 };
->interfaceType1Object1 : Symbol(interfaceType1Object1, Decl(escapedIdentifiers.ts, 59, 3))
->interfaceType1 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 49, 27))
->bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 59, 45))
+>interfaceType1Object1 : Symbol(interfaceType1Object1, Decl(escapedIdentifiers.ts, 60, 3))
+>interfaceType1 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 50, 27))
+>bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 60, 45))
 
 interfaceType1Object1.bar1 = 2;
->interfaceType1Object1.bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 52, 26))
->interfaceType1Object1 : Symbol(interfaceType1Object1, Decl(escapedIdentifiers.ts, 59, 3))
->bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 52, 26))
+>interfaceType1Object1.bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 53, 26))
+>interfaceType1Object1 : Symbol(interfaceType1Object1, Decl(escapedIdentifiers.ts, 60, 3))
+>bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 53, 26))
 
 var interfaceType1Object2 = <interfaceType\u0031>{ bar1: 0 };
->interfaceType1Object2 : Symbol(interfaceType1Object2, Decl(escapedIdentifiers.ts, 61, 3))
->interfaceType\u0031 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 49, 27))
->bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 61, 50))
+>interfaceType1Object2 : Symbol(interfaceType1Object2, Decl(escapedIdentifiers.ts, 62, 3))
+>interfaceType\u0031 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 50, 27))
+>bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 62, 50))
 
 interfaceType1Object2.bar1 = 2;
->interfaceType1Object2.bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 52, 26))
->interfaceType1Object2 : Symbol(interfaceType1Object2, Decl(escapedIdentifiers.ts, 61, 3))
->bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 52, 26))
+>interfaceType1Object2.bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 53, 26))
+>interfaceType1Object2 : Symbol(interfaceType1Object2, Decl(escapedIdentifiers.ts, 62, 3))
+>bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 53, 26))
 
 var interfaceType2Object1 = <interfaceType2>{ bar2: 0 };
->interfaceType2Object1 : Symbol(interfaceType2Object1, Decl(escapedIdentifiers.ts, 63, 3))
->interfaceType2 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 54, 1))
->bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 63, 45))
+>interfaceType2Object1 : Symbol(interfaceType2Object1, Decl(escapedIdentifiers.ts, 64, 3))
+>interfaceType2 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 55, 1))
+>bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 64, 45))
 
 interfaceType2Object1.bar2 = 2;
->interfaceType2Object1.bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 55, 31))
->interfaceType2Object1 : Symbol(interfaceType2Object1, Decl(escapedIdentifiers.ts, 63, 3))
->bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 55, 31))
+>interfaceType2Object1.bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 56, 31))
+>interfaceType2Object1 : Symbol(interfaceType2Object1, Decl(escapedIdentifiers.ts, 64, 3))
+>bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 56, 31))
 
 var interfaceType2Object2 = <interfaceType\u0032>{ bar2: 0 };
->interfaceType2Object2 : Symbol(interfaceType2Object2, Decl(escapedIdentifiers.ts, 65, 3))
->interfaceType\u0032 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 54, 1))
->bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 65, 50))
+>interfaceType2Object2 : Symbol(interfaceType2Object2, Decl(escapedIdentifiers.ts, 66, 3))
+>interfaceType\u0032 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 55, 1))
+>bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 66, 50))
 
 interfaceType2Object2.bar2 = 2;
->interfaceType2Object2.bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 55, 31))
->interfaceType2Object2 : Symbol(interfaceType2Object2, Decl(escapedIdentifiers.ts, 65, 3))
->bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 55, 31))
+>interfaceType2Object2.bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 56, 31))
+>interfaceType2Object2 : Symbol(interfaceType2Object2, Decl(escapedIdentifiers.ts, 66, 3))
+>bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 56, 31))
 
 
 // arguments
 class testClass { 
->testClass : Symbol(testClass, Decl(escapedIdentifiers.ts, 66, 31))
+>testClass : Symbol(testClass, Decl(escapedIdentifiers.ts, 67, 31))
 
     public func(arg1: number, arg\u0032: string, arg\u0033: boolean, arg4: number) { 
->func : Symbol(func, Decl(escapedIdentifiers.ts, 70, 17))
->arg1 : Symbol(arg1, Decl(escapedIdentifiers.ts, 71, 16))
->arg\u0032 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 71, 29))
->arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 71, 48))
->arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 71, 68))
+>func : Symbol(func, Decl(escapedIdentifiers.ts, 71, 17))
+>arg1 : Symbol(arg1, Decl(escapedIdentifiers.ts, 72, 16))
+>arg\u0032 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 72, 29))
+>arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 72, 48))
+>arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 72, 68))
 
         arg\u0031 = 1;
->arg\u0031 : Symbol(arg1, Decl(escapedIdentifiers.ts, 71, 16))
+>arg\u0031 : Symbol(arg1, Decl(escapedIdentifiers.ts, 72, 16))
 
         arg2 = 'string';
->arg2 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 71, 29))
+>arg2 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 72, 29))
 
         arg\u0033 = true;
->arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 71, 48))
+>arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 72, 48))
 
         arg4 = 2;
->arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 71, 68))
+>arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 72, 68))
     }
 }
 
 // constructors
 class constructorTestClass { 
->constructorTestClass : Symbol(constructorTestClass, Decl(escapedIdentifiers.ts, 77, 1))
+>constructorTestClass : Symbol(constructorTestClass, Decl(escapedIdentifiers.ts, 78, 1))
 
     constructor (public arg1: number,public arg\u0032: string,public arg\u0033: boolean,public arg4: number) { 
->arg1 : Symbol(arg1, Decl(escapedIdentifiers.ts, 81, 17))
->arg\u0032 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 81, 37))
->arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 81, 62))
->arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 81, 88))
+>arg1 : Symbol(arg1, Decl(escapedIdentifiers.ts, 82, 17))
+>arg\u0032 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 82, 37))
+>arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 82, 62))
+>arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 82, 88))
     }
 }
 var constructorTestObject = new constructorTestClass(1, 'string', true, 2);
->constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 84, 3))
->constructorTestClass : Symbol(constructorTestClass, Decl(escapedIdentifiers.ts, 77, 1))
+>constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 85, 3))
+>constructorTestClass : Symbol(constructorTestClass, Decl(escapedIdentifiers.ts, 78, 1))
 
 constructorTestObject.arg\u0031 = 1;
->constructorTestObject.arg\u0031 : Symbol(constructorTestClass.arg1, Decl(escapedIdentifiers.ts, 81, 17))
->constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 84, 3))
->arg\u0031 : Symbol(constructorTestClass.arg1, Decl(escapedIdentifiers.ts, 81, 17))
+>constructorTestObject.arg\u0031 : Symbol(constructorTestClass.arg1, Decl(escapedIdentifiers.ts, 82, 17))
+>constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 85, 3))
+>arg\u0031 : Symbol(constructorTestClass.arg1, Decl(escapedIdentifiers.ts, 82, 17))
 
 constructorTestObject.arg2 = 'string';
->constructorTestObject.arg2 : Symbol(constructorTestClass.arg\u0032, Decl(escapedIdentifiers.ts, 81, 37))
->constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 84, 3))
->arg2 : Symbol(constructorTestClass.arg\u0032, Decl(escapedIdentifiers.ts, 81, 37))
+>constructorTestObject.arg2 : Symbol(constructorTestClass.arg\u0032, Decl(escapedIdentifiers.ts, 82, 37))
+>constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 85, 3))
+>arg2 : Symbol(constructorTestClass.arg\u0032, Decl(escapedIdentifiers.ts, 82, 37))
 
 constructorTestObject.arg\u0033 = true;
->constructorTestObject.arg\u0033 : Symbol(constructorTestClass.arg\u0033, Decl(escapedIdentifiers.ts, 81, 62))
->constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 84, 3))
->arg\u0033 : Symbol(constructorTestClass.arg\u0033, Decl(escapedIdentifiers.ts, 81, 62))
+>constructorTestObject.arg\u0033 : Symbol(constructorTestClass.arg\u0033, Decl(escapedIdentifiers.ts, 82, 62))
+>constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 85, 3))
+>arg\u0033 : Symbol(constructorTestClass.arg\u0033, Decl(escapedIdentifiers.ts, 82, 62))
 
 constructorTestObject.arg4 = 2;
->constructorTestObject.arg4 : Symbol(constructorTestClass.arg4, Decl(escapedIdentifiers.ts, 81, 88))
->constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 84, 3))
->arg4 : Symbol(constructorTestClass.arg4, Decl(escapedIdentifiers.ts, 81, 88))
+>constructorTestObject.arg4 : Symbol(constructorTestClass.arg4, Decl(escapedIdentifiers.ts, 82, 88))
+>constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 85, 3))
+>arg4 : Symbol(constructorTestClass.arg4, Decl(escapedIdentifiers.ts, 82, 88))
 
 // Lables
 
diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types
index b32d21a48cb..67713976bd6 100644
--- a/tests/baselines/reference/escapedIdentifiers.types
+++ b/tests/baselines/reference/escapedIdentifiers.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/escapedIdentifiers.ts ===
+
 /*
     0 .. \u0030
     9 .. \u0039
diff --git a/tests/baselines/reference/for.errors.txt b/tests/baselines/reference/for.errors.txt
index 41ed5765c9a..d2caefbcdae 100644
--- a/tests/baselines/reference/for.errors.txt
+++ b/tests/baselines/reference/for.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/for.ts(29,6): error TS1109: Expression expected.
+tests/cases/compiler/for.ts(30,6): error TS1109: Expression expected.
 
 
 ==== tests/cases/compiler/for.ts (1 errors) ====
+    
     for (var i = 0; i < 10; i++) { // ok
         var x1 = i;
     }
diff --git a/tests/baselines/reference/for.js b/tests/baselines/reference/for.js
index a77b68d8b6e..857d42bafdb 100644
--- a/tests/baselines/reference/for.js
+++ b/tests/baselines/reference/for.js
@@ -1,4 +1,5 @@
 //// [for.ts]
+
 for (var i = 0; i < 10; i++) { // ok
     var x1 = i;
 }
diff --git a/tests/baselines/reference/forBreakStatements.js b/tests/baselines/reference/forBreakStatements.js
index 9ed65627c9c..da4fccdfd2a 100644
--- a/tests/baselines/reference/forBreakStatements.js
+++ b/tests/baselines/reference/forBreakStatements.js
@@ -1,4 +1,5 @@
 //// [forBreakStatements.ts]
+
 for (; ;) {
     break;
 }
diff --git a/tests/baselines/reference/forBreakStatements.symbols b/tests/baselines/reference/forBreakStatements.symbols
index 76db9309a39..6d869b45934 100644
--- a/tests/baselines/reference/forBreakStatements.symbols
+++ b/tests/baselines/reference/forBreakStatements.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/forBreakStatements.ts ===
+
 for (; ;) {
     break;
 }
@@ -33,7 +34,7 @@ for (; ;) for (; ;) for (; ;) break SEVEN;
 EIGHT:
 for (; ;) {
     var fn = function () { }
->fn : Symbol(fn, Decl(forBreakStatements.ts, 33, 7))
+>fn : Symbol(fn, Decl(forBreakStatements.ts, 34, 7))
 
     break EIGHT;
 }
diff --git a/tests/baselines/reference/forBreakStatements.types b/tests/baselines/reference/forBreakStatements.types
index 8469a85bd19..c494f6be30a 100644
--- a/tests/baselines/reference/forBreakStatements.types
+++ b/tests/baselines/reference/forBreakStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/forBreakStatements.ts ===
+
 for (; ;) {
     break;
 }
diff --git a/tests/baselines/reference/forContinueStatements.js b/tests/baselines/reference/forContinueStatements.js
index 34f70bb1fc1..fc5aa0434b3 100644
--- a/tests/baselines/reference/forContinueStatements.js
+++ b/tests/baselines/reference/forContinueStatements.js
@@ -1,4 +1,5 @@
 //// [forContinueStatements.ts]
+
 for (; ;) {
     continue;
 }
diff --git a/tests/baselines/reference/forContinueStatements.symbols b/tests/baselines/reference/forContinueStatements.symbols
index e24eb2aaa92..9e0c396acfb 100644
--- a/tests/baselines/reference/forContinueStatements.symbols
+++ b/tests/baselines/reference/forContinueStatements.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/continueStatements/forContinueStatements.ts ===
+
 for (; ;) {
     continue;
 }
@@ -33,7 +34,7 @@ for (; ;) for (; ;) for (; ;) continue SEVEN;
 EIGHT:
 for (; ;) {
     var fn = function () { }
->fn : Symbol(fn, Decl(forContinueStatements.ts, 33, 7))
+>fn : Symbol(fn, Decl(forContinueStatements.ts, 34, 7))
 
     continue EIGHT;
 }
diff --git a/tests/baselines/reference/forContinueStatements.types b/tests/baselines/reference/forContinueStatements.types
index 79b78e83345..0b52bdd5d47 100644
--- a/tests/baselines/reference/forContinueStatements.types
+++ b/tests/baselines/reference/forContinueStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/continueStatements/forContinueStatements.ts ===
+
 for (; ;) {
     continue;
 }
diff --git a/tests/baselines/reference/forInBreakStatements.js b/tests/baselines/reference/forInBreakStatements.js
index 24b7cc57b8d..ebbadb31277 100644
--- a/tests/baselines/reference/forInBreakStatements.js
+++ b/tests/baselines/reference/forInBreakStatements.js
@@ -1,4 +1,5 @@
 //// [forInBreakStatements.ts]
+
 for(var x in {}) {
     break;
 }
diff --git a/tests/baselines/reference/forInBreakStatements.symbols b/tests/baselines/reference/forInBreakStatements.symbols
index 7984edc3fd6..5f48e110835 100644
--- a/tests/baselines/reference/forInBreakStatements.symbols
+++ b/tests/baselines/reference/forInBreakStatements.symbols
@@ -1,13 +1,14 @@
 === tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts ===
+
 for(var x in {}) {
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
     break;
 }
 
 ONE:
 for(var x in {}) {
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
     break ONE;
 }
@@ -15,43 +16,43 @@ for(var x in {}) {
 TWO:
 THREE:
 for(var x in {}) {
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
     break THREE;
 }
 
 FOUR:
 for(var x in {}) {
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
     FIVE:
     for(var x in {}) {
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
         break FOUR;
     }
 }
 
 for(var x in {}) {
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
     SIX:
     for(var x in {}) break SIX;
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 }
 
 SEVEN:
 for (var x in {}) for (var x in {}) for (var x in {}) break SEVEN;
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
 EIGHT:
 for (var x in {}){
->x : Symbol(x, Decl(forInBreakStatements.ts, 0, 7), Decl(forInBreakStatements.ts, 5, 7), Decl(forInBreakStatements.ts, 11, 7), Decl(forInBreakStatements.ts, 16, 7), Decl(forInBreakStatements.ts, 18, 11), Decl(forInBreakStatements.ts, 23, 7), Decl(forInBreakStatements.ts, 25, 11), Decl(forInBreakStatements.ts, 29, 8), Decl(forInBreakStatements.ts, 29, 26), Decl(forInBreakStatements.ts, 29, 44), Decl(forInBreakStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInBreakStatements.ts, 1, 7), Decl(forInBreakStatements.ts, 6, 7), Decl(forInBreakStatements.ts, 12, 7), Decl(forInBreakStatements.ts, 17, 7), Decl(forInBreakStatements.ts, 19, 11), Decl(forInBreakStatements.ts, 24, 7), Decl(forInBreakStatements.ts, 26, 11), Decl(forInBreakStatements.ts, 30, 8), Decl(forInBreakStatements.ts, 30, 26), Decl(forInBreakStatements.ts, 30, 44), Decl(forInBreakStatements.ts, 33, 8))
 
     var fn = function () { }
->fn : Symbol(fn, Decl(forInBreakStatements.ts, 33, 7))
+>fn : Symbol(fn, Decl(forInBreakStatements.ts, 34, 7))
 
     break EIGHT;
 }
diff --git a/tests/baselines/reference/forInBreakStatements.types b/tests/baselines/reference/forInBreakStatements.types
index 05ea8e35feb..7714429e5af 100644
--- a/tests/baselines/reference/forInBreakStatements.types
+++ b/tests/baselines/reference/forInBreakStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts ===
+
 for(var x in {}) {
 >x : any
 >{} : {}
diff --git a/tests/baselines/reference/forInContinueStatements.js b/tests/baselines/reference/forInContinueStatements.js
index 8b036c59721..ca530dd5d6c 100644
--- a/tests/baselines/reference/forInContinueStatements.js
+++ b/tests/baselines/reference/forInContinueStatements.js
@@ -1,4 +1,5 @@
 //// [forInContinueStatements.ts]
+
 for(var x in {}) {
     continue;
 }
diff --git a/tests/baselines/reference/forInContinueStatements.symbols b/tests/baselines/reference/forInContinueStatements.symbols
index 88129a50d21..a0edea53f3e 100644
--- a/tests/baselines/reference/forInContinueStatements.symbols
+++ b/tests/baselines/reference/forInContinueStatements.symbols
@@ -1,13 +1,14 @@
 === tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts ===
+
 for(var x in {}) {
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
     continue;
 }
 
 ONE:
 for(var x in {}) {
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
     continue ONE;
 }
@@ -15,43 +16,43 @@ for(var x in {}) {
 TWO:
 THREE:
 for(var x in {}) {
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
     continue THREE;
 }
 
 FOUR:
 for(var x in {}) {
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
     FIVE:
     for(var x in {}) {
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
         continue FOUR;
     }
 }
 
 for(var x in {}) {
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
     SIX:
     for(var x in {}) continue SIX;
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 }
 
 SEVEN:
 for (var x in {}) for (var x in {}) for (var x in {}) continue SEVEN;
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
 EIGHT:
 for (var x in {}){
->x : Symbol(x, Decl(forInContinueStatements.ts, 0, 7), Decl(forInContinueStatements.ts, 5, 7), Decl(forInContinueStatements.ts, 11, 7), Decl(forInContinueStatements.ts, 16, 7), Decl(forInContinueStatements.ts, 18, 11), Decl(forInContinueStatements.ts, 23, 7), Decl(forInContinueStatements.ts, 25, 11), Decl(forInContinueStatements.ts, 29, 8), Decl(forInContinueStatements.ts, 29, 26), Decl(forInContinueStatements.ts, 29, 44), Decl(forInContinueStatements.ts, 32, 8))
+>x : Symbol(x, Decl(forInContinueStatements.ts, 1, 7), Decl(forInContinueStatements.ts, 6, 7), Decl(forInContinueStatements.ts, 12, 7), Decl(forInContinueStatements.ts, 17, 7), Decl(forInContinueStatements.ts, 19, 11), Decl(forInContinueStatements.ts, 24, 7), Decl(forInContinueStatements.ts, 26, 11), Decl(forInContinueStatements.ts, 30, 8), Decl(forInContinueStatements.ts, 30, 26), Decl(forInContinueStatements.ts, 30, 44), Decl(forInContinueStatements.ts, 33, 8))
 
     var fn = function () { }
->fn : Symbol(fn, Decl(forInContinueStatements.ts, 33, 7))
+>fn : Symbol(fn, Decl(forInContinueStatements.ts, 34, 7))
 
     continue EIGHT;
 }
diff --git a/tests/baselines/reference/forInContinueStatements.types b/tests/baselines/reference/forInContinueStatements.types
index 95637345fa6..572fd16053d 100644
--- a/tests/baselines/reference/forInContinueStatements.types
+++ b/tests/baselines/reference/forInContinueStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts ===
+
 for(var x in {}) {
 >x : any
 >{} : {}
diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js
index 39fdb6c8871..253fafc81e8 100644
--- a/tests/baselines/reference/forStatements.js
+++ b/tests/baselines/reference/forStatements.js
@@ -1,4 +1,5 @@
 //// [forStatements.ts]
+
 interface I {
     id: number;
 }
diff --git a/tests/baselines/reference/forStatements.symbols b/tests/baselines/reference/forStatements.symbols
index e72d55e5813..2d5250217f9 100644
--- a/tests/baselines/reference/forStatements.symbols
+++ b/tests/baselines/reference/forStatements.symbols
@@ -1,145 +1,146 @@
 === tests/cases/conformance/statements/forStatements/forStatements.ts ===
+
 interface I {
 >I : Symbol(I, Decl(forStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(forStatements.ts, 0, 13))
+>id : Symbol(id, Decl(forStatements.ts, 1, 13))
 }
 
 class C implements I {
->C : Symbol(C, Decl(forStatements.ts, 2, 1))
+>C : Symbol(C, Decl(forStatements.ts, 3, 1))
 >I : Symbol(I, Decl(forStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(forStatements.ts, 4, 22))
+>id : Symbol(id, Decl(forStatements.ts, 5, 22))
 }
 
 class D<T>{
->D : Symbol(D, Decl(forStatements.ts, 6, 1))
->T : Symbol(T, Decl(forStatements.ts, 8, 8))
+>D : Symbol(D, Decl(forStatements.ts, 7, 1))
+>T : Symbol(T, Decl(forStatements.ts, 9, 8))
 
     source: T;
->source : Symbol(source, Decl(forStatements.ts, 8, 11))
->T : Symbol(T, Decl(forStatements.ts, 8, 8))
+>source : Symbol(source, Decl(forStatements.ts, 9, 11))
+>T : Symbol(T, Decl(forStatements.ts, 9, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(forStatements.ts, 9, 14))
->D : Symbol(D, Decl(forStatements.ts, 6, 1))
->T : Symbol(T, Decl(forStatements.ts, 8, 8))
+>recurse : Symbol(recurse, Decl(forStatements.ts, 10, 14))
+>D : Symbol(D, Decl(forStatements.ts, 7, 1))
+>T : Symbol(T, Decl(forStatements.ts, 9, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(forStatements.ts, 10, 18))
->D : Symbol(D, Decl(forStatements.ts, 6, 1))
->D : Symbol(D, Decl(forStatements.ts, 6, 1))
->T : Symbol(T, Decl(forStatements.ts, 8, 8))
+>wrapped : Symbol(wrapped, Decl(forStatements.ts, 11, 18))
+>D : Symbol(D, Decl(forStatements.ts, 7, 1))
+>D : Symbol(D, Decl(forStatements.ts, 7, 1))
+>T : Symbol(T, Decl(forStatements.ts, 9, 8))
 }
 
 function F(x: string): number { return 42; }
->F : Symbol(F, Decl(forStatements.ts, 12, 1))
->x : Symbol(x, Decl(forStatements.ts, 14, 11))
+>F : Symbol(F, Decl(forStatements.ts, 13, 1))
+>x : Symbol(x, Decl(forStatements.ts, 15, 11))
 
 module M {
->M : Symbol(M, Decl(forStatements.ts, 14, 44))
+>M : Symbol(M, Decl(forStatements.ts, 15, 44))
 
     export class A {
->A : Symbol(A, Decl(forStatements.ts, 16, 10))
+>A : Symbol(A, Decl(forStatements.ts, 17, 10))
 
         name: string;
->name : Symbol(name, Decl(forStatements.ts, 17, 20))
+>name : Symbol(name, Decl(forStatements.ts, 18, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : Symbol(F2, Decl(forStatements.ts, 19, 5))
->x : Symbol(x, Decl(forStatements.ts, 21, 23))
+>F2 : Symbol(F2, Decl(forStatements.ts, 20, 5))
+>x : Symbol(x, Decl(forStatements.ts, 22, 23))
 >x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(forStatements.ts, 21, 23))
+>x : Symbol(x, Decl(forStatements.ts, 22, 23))
 >toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
 }
 
 for(var aNumber: number = 9.9;;){} 
->aNumber : Symbol(aNumber, Decl(forStatements.ts, 24, 7))
+>aNumber : Symbol(aNumber, Decl(forStatements.ts, 25, 7))
 
 for(var aString: string = 'this is a string';;){}
->aString : Symbol(aString, Decl(forStatements.ts, 25, 7))
+>aString : Symbol(aString, Decl(forStatements.ts, 26, 7))
 
 for(var aDate: Date = new Date(12);;){}
->aDate : Symbol(aDate, Decl(forStatements.ts, 26, 7))
+>aDate : Symbol(aDate, Decl(forStatements.ts, 27, 7))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 for(var anObject: Object = new Object();;){}
->anObject : Symbol(anObject, Decl(forStatements.ts, 27, 7))
+>anObject : Symbol(anObject, Decl(forStatements.ts, 28, 7))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 for(var anAny: any = null;;){}
->anAny : Symbol(anAny, Decl(forStatements.ts, 29, 7))
+>anAny : Symbol(anAny, Decl(forStatements.ts, 30, 7))
 
 for(var aSecondAny: any = undefined;;){}
->aSecondAny : Symbol(aSecondAny, Decl(forStatements.ts, 30, 7))
+>aSecondAny : Symbol(aSecondAny, Decl(forStatements.ts, 31, 7))
 >undefined : Symbol(undefined)
 
 for(var aVoid: void = undefined;;){}
->aVoid : Symbol(aVoid, Decl(forStatements.ts, 31, 7))
+>aVoid : Symbol(aVoid, Decl(forStatements.ts, 32, 7))
 >undefined : Symbol(undefined)
 
 for(var anInterface: I = new C();;){}
->anInterface : Symbol(anInterface, Decl(forStatements.ts, 33, 7))
+>anInterface : Symbol(anInterface, Decl(forStatements.ts, 34, 7))
 >I : Symbol(I, Decl(forStatements.ts, 0, 0))
->C : Symbol(C, Decl(forStatements.ts, 2, 1))
+>C : Symbol(C, Decl(forStatements.ts, 3, 1))
 
 for(var aClass: C = new C();;){}
->aClass : Symbol(aClass, Decl(forStatements.ts, 34, 7))
->C : Symbol(C, Decl(forStatements.ts, 2, 1))
->C : Symbol(C, Decl(forStatements.ts, 2, 1))
+>aClass : Symbol(aClass, Decl(forStatements.ts, 35, 7))
+>C : Symbol(C, Decl(forStatements.ts, 3, 1))
+>C : Symbol(C, Decl(forStatements.ts, 3, 1))
 
 for(var aGenericClass: D<string> = new D<string>();;){}
->aGenericClass : Symbol(aGenericClass, Decl(forStatements.ts, 35, 7))
->D : Symbol(D, Decl(forStatements.ts, 6, 1))
->D : Symbol(D, Decl(forStatements.ts, 6, 1))
+>aGenericClass : Symbol(aGenericClass, Decl(forStatements.ts, 36, 7))
+>D : Symbol(D, Decl(forStatements.ts, 7, 1))
+>D : Symbol(D, Decl(forStatements.ts, 7, 1))
 
 for(var anObjectLiteral: I = { id: 12 };;){}
->anObjectLiteral : Symbol(anObjectLiteral, Decl(forStatements.ts, 36, 7))
+>anObjectLiteral : Symbol(anObjectLiteral, Decl(forStatements.ts, 37, 7))
 >I : Symbol(I, Decl(forStatements.ts, 0, 0))
->id : Symbol(id, Decl(forStatements.ts, 36, 30))
+>id : Symbol(id, Decl(forStatements.ts, 37, 30))
 
 for(var anOtherObjectLiteral: { id: number } = new C();;){}
->anOtherObjectLiteral : Symbol(anOtherObjectLiteral, Decl(forStatements.ts, 37, 7))
->id : Symbol(id, Decl(forStatements.ts, 37, 31))
->C : Symbol(C, Decl(forStatements.ts, 2, 1))
+>anOtherObjectLiteral : Symbol(anOtherObjectLiteral, Decl(forStatements.ts, 38, 7))
+>id : Symbol(id, Decl(forStatements.ts, 38, 31))
+>C : Symbol(C, Decl(forStatements.ts, 3, 1))
 
 for(var aFunction: typeof F = F;;){}
->aFunction : Symbol(aFunction, Decl(forStatements.ts, 39, 7))
->F : Symbol(F, Decl(forStatements.ts, 12, 1))
->F : Symbol(F, Decl(forStatements.ts, 12, 1))
+>aFunction : Symbol(aFunction, Decl(forStatements.ts, 40, 7))
+>F : Symbol(F, Decl(forStatements.ts, 13, 1))
+>F : Symbol(F, Decl(forStatements.ts, 13, 1))
 
 for(var anOtherFunction: (x: string) => number = F;;){}
->anOtherFunction : Symbol(anOtherFunction, Decl(forStatements.ts, 40, 7))
->x : Symbol(x, Decl(forStatements.ts, 40, 26))
->F : Symbol(F, Decl(forStatements.ts, 12, 1))
+>anOtherFunction : Symbol(anOtherFunction, Decl(forStatements.ts, 41, 7))
+>x : Symbol(x, Decl(forStatements.ts, 41, 26))
+>F : Symbol(F, Decl(forStatements.ts, 13, 1))
 
 for(var aLambda: typeof F = (x) => 2;;){}
->aLambda : Symbol(aLambda, Decl(forStatements.ts, 41, 7))
->F : Symbol(F, Decl(forStatements.ts, 12, 1))
->x : Symbol(x, Decl(forStatements.ts, 41, 29))
+>aLambda : Symbol(aLambda, Decl(forStatements.ts, 42, 7))
+>F : Symbol(F, Decl(forStatements.ts, 13, 1))
+>x : Symbol(x, Decl(forStatements.ts, 42, 29))
 
 for(var aModule: typeof M = M;;){}
->aModule : Symbol(aModule, Decl(forStatements.ts, 43, 7))
->M : Symbol(M, Decl(forStatements.ts, 14, 44))
->M : Symbol(M, Decl(forStatements.ts, 14, 44))
+>aModule : Symbol(aModule, Decl(forStatements.ts, 44, 7))
+>M : Symbol(M, Decl(forStatements.ts, 15, 44))
+>M : Symbol(M, Decl(forStatements.ts, 15, 44))
 
 for(var aClassInModule: M.A = new M.A();;){}
->aClassInModule : Symbol(aClassInModule, Decl(forStatements.ts, 44, 7))
->M : Symbol(M, Decl(forStatements.ts, 14, 44))
->A : Symbol(M.A, Decl(forStatements.ts, 16, 10))
->M.A : Symbol(M.A, Decl(forStatements.ts, 16, 10))
->M : Symbol(M, Decl(forStatements.ts, 14, 44))
->A : Symbol(M.A, Decl(forStatements.ts, 16, 10))
+>aClassInModule : Symbol(aClassInModule, Decl(forStatements.ts, 45, 7))
+>M : Symbol(M, Decl(forStatements.ts, 15, 44))
+>A : Symbol(M.A, Decl(forStatements.ts, 17, 10))
+>M.A : Symbol(M.A, Decl(forStatements.ts, 17, 10))
+>M : Symbol(M, Decl(forStatements.ts, 15, 44))
+>A : Symbol(M.A, Decl(forStatements.ts, 17, 10))
 
 for(var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';;){}
->aFunctionInModule : Symbol(aFunctionInModule, Decl(forStatements.ts, 45, 7))
->M.F2 : Symbol(M.F2, Decl(forStatements.ts, 19, 5))
->M : Symbol(M, Decl(forStatements.ts, 14, 44))
->F2 : Symbol(M.F2, Decl(forStatements.ts, 19, 5))
->x : Symbol(x, Decl(forStatements.ts, 45, 42))
+>aFunctionInModule : Symbol(aFunctionInModule, Decl(forStatements.ts, 46, 7))
+>M.F2 : Symbol(M.F2, Decl(forStatements.ts, 20, 5))
+>M : Symbol(M, Decl(forStatements.ts, 15, 44))
+>F2 : Symbol(M.F2, Decl(forStatements.ts, 20, 5))
+>x : Symbol(x, Decl(forStatements.ts, 46, 42))
 
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index 3fbcf2dbfb2..95b198a7fec 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/forStatements/forStatements.ts ===
+
 interface I {
 >I : I
 
diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt b/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt
index 53ecb88363d..f1869ae7fca 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt
@@ -1,18 +1,19 @@
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(32,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'number'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(33,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'string'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(34,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'C'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(35,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'D<string>'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(36,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'typeof M'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(39,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'b' must be of type 'I', but here has type 'C'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(40,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'b' must be of type 'I', but here has type 'C2'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(43,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'f' must be of type '(x: string) => number', but here has type '(x: number) => string'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(46,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'arr' must be of type 'string[]', but here has type 'number[]'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(47,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'arr' must be of type 'string[]', but here has type '(C | D<string>)[]'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(50,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'arr2' must be of type 'D<string>[]', but here has type 'D<number>[]'.
-tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(53,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'm' must be of type 'typeof M', but here has type 'typeof A'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(33,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'number'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(34,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'string'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(35,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'C'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(36,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'D<string>'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(37,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a' must be of type 'any', but here has type 'typeof M'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(40,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'b' must be of type 'I', but here has type 'C'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(41,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'b' must be of type 'I', but here has type 'C2'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(44,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'f' must be of type '(x: string) => number', but here has type '(x: number) => string'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(47,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'arr' must be of type 'string[]', but here has type 'number[]'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(48,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'arr' must be of type 'string[]', but here has type '(C | D<string>)[]'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(51,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'arr2' must be of type 'D<string>[]', but here has type 'D<number>[]'.
+tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts(54,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'm' must be of type 'typeof M', but here has type 'typeof A'.
 
 
 ==== tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts (12 errors) ====
+    
     interface I {
         id: number;
     }
diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
index 1dde9981880..20639c687cb 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -1,4 +1,5 @@
 //// [forStatementsMultipleInvalidDecl.ts]
+
 interface I {
     id: number;
 }
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.js b/tests/baselines/reference/forStatementsMultipleValidDecl.js
index e95e37d63ac..6913894a15f 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.js
@@ -1,4 +1,5 @@
 //// [forStatementsMultipleValidDecl.ts]
+
 // all expected to be valid
 
 for (var x: number; ;) { }
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.symbols b/tests/baselines/reference/forStatementsMultipleValidDecl.symbols
index 1f131bb9701..d2d8ac01003 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.symbols
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.symbols
@@ -1,110 +1,111 @@
 === tests/cases/conformance/statements/forStatements/forStatementsMultipleValidDecl.ts ===
+
 // all expected to be valid
 
 for (var x: number; ;) { }
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 2, 8), Decl(forStatementsMultipleValidDecl.ts, 3, 8), Decl(forStatementsMultipleValidDecl.ts, 5, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 3, 8), Decl(forStatementsMultipleValidDecl.ts, 4, 8), Decl(forStatementsMultipleValidDecl.ts, 6, 8))
 
 for (var x = 2; ;) { }
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 2, 8), Decl(forStatementsMultipleValidDecl.ts, 3, 8), Decl(forStatementsMultipleValidDecl.ts, 5, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 3, 8), Decl(forStatementsMultipleValidDecl.ts, 4, 8), Decl(forStatementsMultipleValidDecl.ts, 6, 8))
 
 for (var x = <number>undefined; ;) { }
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 2, 8), Decl(forStatementsMultipleValidDecl.ts, 3, 8), Decl(forStatementsMultipleValidDecl.ts, 5, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 3, 8), Decl(forStatementsMultipleValidDecl.ts, 4, 8), Decl(forStatementsMultipleValidDecl.ts, 6, 8))
 >undefined : Symbol(undefined)
 
 // new declaration space, making redeclaring x as a string valid
 function declSpace() {
->declSpace : Symbol(declSpace, Decl(forStatementsMultipleValidDecl.ts, 5, 38))
+>declSpace : Symbol(declSpace, Decl(forStatementsMultipleValidDecl.ts, 6, 38))
 
     for (var x = 'this is a string'; ;) { }
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 8, 12))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 9, 12))
 }
 interface Point { x: number; y: number; }
->Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 9, 1))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 10, 17))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 10, 28))
+>Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 10, 1))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 11, 17))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 11, 28))
 
 for (var p: Point; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 9, 1))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 10, 1))
 
 for (var p = { x: 1, y: 2 }; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 13, 14))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 13, 20))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 14, 14))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 14, 20))
 
 for (var p: Point = { x: 0, y: undefined }; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 9, 1))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 14, 21))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 14, 27))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 10, 1))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 15, 21))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 15, 27))
 >undefined : Symbol(undefined)
 
 for (var p = { x: 1, y: <number>undefined }; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 15, 14))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 15, 20))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 16, 14))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 16, 20))
 >undefined : Symbol(undefined)
 
 for (var p: { x: number; y: number; } = { x: 1, y: 2 }; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 16, 13))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 16, 24))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 16, 41))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 16, 47))
-
-for (var p = <{ x: number; y: number; }>{ x: 0, y: undefined }; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 17, 15))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 17, 26))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 17, 13))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 17, 24))
 >x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 17, 41))
 >y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 17, 47))
+
+for (var p = <{ x: number; y: number; }>{ x: 0, y: undefined }; ;) { }
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 18, 15))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 18, 26))
+>x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 18, 41))
+>y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 18, 47))
 >undefined : Symbol(undefined)
 
 for (var p: typeof p; ;) { }
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
->p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 12, 8), Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
+>p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
 
 for (var fn = function (s: string) { return 42; }; ;) { }
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
->s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 20, 24))
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
+>s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 21, 24))
 
 for (var fn = (s: string) => 3; ;) { }
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
->s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 21, 15))
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
+>s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 22, 15))
 
 for (var fn: (s: string) => number; ;) { }
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
->s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 22, 14))
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
+>s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 23, 14))
 
 for (var fn: { (s: string): number }; ;) { }
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
->s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 23, 16))
-
-for (var fn = <(s: string) => number> null; ;) { }
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
 >s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 24, 16))
 
+for (var fn = <(s: string) => number> null; ;) { }
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
+>s : Symbol(s, Decl(forStatementsMultipleValidDecl.ts, 25, 16))
+
 for (var fn: typeof fn; ;) { }
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
->fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 20, 8), Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8))
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
+>fn : Symbol(fn, Decl(forStatementsMultipleValidDecl.ts, 21, 8), Decl(forStatementsMultipleValidDecl.ts, 22, 8), Decl(forStatementsMultipleValidDecl.ts, 23, 8), Decl(forStatementsMultipleValidDecl.ts, 24, 8), Decl(forStatementsMultipleValidDecl.ts, 25, 8), Decl(forStatementsMultipleValidDecl.ts, 26, 8))
 
 for (var a: string[]; ;) { }
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
 
 for (var a = ['a', 'b']; ;) { }
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
 
 for (var a = <string[]>[]; ;) { }
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
 
 for (var a: string[] = []; ;) { }
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
 
 for (var a = new Array<string>(); ;) { }
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 for (var a: typeof a; ;) { }
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
->a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 27, 8), Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
+>a : Symbol(a, Decl(forStatementsMultipleValidDecl.ts, 28, 8), Decl(forStatementsMultipleValidDecl.ts, 29, 8), Decl(forStatementsMultipleValidDecl.ts, 30, 8), Decl(forStatementsMultipleValidDecl.ts, 31, 8), Decl(forStatementsMultipleValidDecl.ts, 32, 8), Decl(forStatementsMultipleValidDecl.ts, 33, 8))
 
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index 9b9af5b850e..acb26f17312 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/forStatements/forStatementsMultipleValidDecl.ts ===
+
 // all expected to be valid
 
 for (var x: number; ;) { }
diff --git a/tests/baselines/reference/functionImplementationErrors.errors.txt b/tests/baselines/reference/functionImplementationErrors.errors.txt
index 0c74588c316..86ecb6a6057 100644
--- a/tests/baselines/reference/functionImplementationErrors.errors.txt
+++ b/tests/baselines/reference/functionImplementationErrors.errors.txt
@@ -1,20 +1,20 @@
-tests/cases/conformance/functions/functionImplementationErrors.ts(2,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(6,19): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(10,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(16,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(25,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/functions/functionImplementationErrors.ts(30,17): error TS2373: Initializer of parameter 'n' cannot reference identifier 'm' declared after it.
-tests/cases/conformance/functions/functionImplementationErrors.ts(35,17): error TS2373: Initializer of parameter 'n' cannot reference identifier 'm' declared after it.
-tests/cases/conformance/functions/functionImplementationErrors.ts(40,28): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/functions/functionImplementationErrors.ts(49,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(53,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(57,11): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(61,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(65,11): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(3,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(7,19): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(11,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(17,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(26,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/conformance/functions/functionImplementationErrors.ts(31,17): error TS2373: Initializer of parameter 'n' cannot reference identifier 'm' declared after it.
+tests/cases/conformance/functions/functionImplementationErrors.ts(36,17): error TS2373: Initializer of parameter 'n' cannot reference identifier 'm' declared after it.
+tests/cases/conformance/functions/functionImplementationErrors.ts(50,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(54,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(58,11): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(62,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(66,11): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/functions/functionImplementationErrors.ts(70,11): error TS2354: No best common type exists among return expressions.
 
 
-==== tests/cases/conformance/functions/functionImplementationErrors.ts (14 errors) ====
+==== tests/cases/conformance/functions/functionImplementationErrors.ts (13 errors) ====
+    
     // FunctionExpression with no return type annotation with multiple return statements with unrelated types
     var f1 = function () {
              ~~~~~~~~
@@ -52,7 +52,7 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error
     // Function implemetnation with non -void return type annotation with no return
     function f5(): number {
                    ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     }
     
     var m;
@@ -72,8 +72,6 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error
     // FunctionExpression with non -void return type annotation with a throw, no return, and other code
     // Should be error but isn't
     undefined === function (): number {
-                               ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
         throw undefined;
         var x = 4;
     };
diff --git a/tests/baselines/reference/functionImplementationErrors.js b/tests/baselines/reference/functionImplementationErrors.js
index 42be5f21458..4436f1bc94f 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -1,4 +1,5 @@
 //// [functionImplementationErrors.ts]
+
 // FunctionExpression with no return type annotation with multiple return statements with unrelated types
 var f1 = function () {
     return '';
diff --git a/tests/baselines/reference/functionImplementations.js b/tests/baselines/reference/functionImplementations.js
index 3fc040650e4..512da960b78 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -1,4 +1,5 @@
 //// [functionImplementations.ts]
+
 // FunctionExpression with no return type annotation and no return statement returns void
 var v: void = function () { } ();
 
diff --git a/tests/baselines/reference/functionImplementations.symbols b/tests/baselines/reference/functionImplementations.symbols
index 3932261b27c..07945b5f765 100644
--- a/tests/baselines/reference/functionImplementations.symbols
+++ b/tests/baselines/reference/functionImplementations.symbols
@@ -1,109 +1,110 @@
 === tests/cases/conformance/functions/functionImplementations.ts ===
+
 // FunctionExpression with no return type annotation and no return statement returns void
 var v: void = function () { } ();
->v : Symbol(v, Decl(functionImplementations.ts, 1, 3))
+>v : Symbol(v, Decl(functionImplementations.ts, 2, 3))
 
 // FunctionExpression f with no return type annotation and directly references f in its body returns any
 var a: any = function f() {
->a : Symbol(a, Decl(functionImplementations.ts, 4, 3), Decl(functionImplementations.ts, 7, 3), Decl(functionImplementations.ts, 12, 3), Decl(functionImplementations.ts, 24, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 84, 3))
->f : Symbol(f, Decl(functionImplementations.ts, 4, 12))
+>a : Symbol(a, Decl(functionImplementations.ts, 5, 3), Decl(functionImplementations.ts, 8, 3), Decl(functionImplementations.ts, 13, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 26, 3), Decl(functionImplementations.ts, 85, 3))
+>f : Symbol(f, Decl(functionImplementations.ts, 5, 12))
 
     return f;
->f : Symbol(f, Decl(functionImplementations.ts, 4, 12))
+>f : Symbol(f, Decl(functionImplementations.ts, 5, 12))
 
 };
 var a: any = function f() {
->a : Symbol(a, Decl(functionImplementations.ts, 4, 3), Decl(functionImplementations.ts, 7, 3), Decl(functionImplementations.ts, 12, 3), Decl(functionImplementations.ts, 24, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 84, 3))
->f : Symbol(f, Decl(functionImplementations.ts, 7, 12))
+>a : Symbol(a, Decl(functionImplementations.ts, 5, 3), Decl(functionImplementations.ts, 8, 3), Decl(functionImplementations.ts, 13, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 26, 3), Decl(functionImplementations.ts, 85, 3))
+>f : Symbol(f, Decl(functionImplementations.ts, 8, 12))
 
     return f();
->f : Symbol(f, Decl(functionImplementations.ts, 7, 12))
+>f : Symbol(f, Decl(functionImplementations.ts, 8, 12))
 
 };
 
 // FunctionExpression f with no return type annotation and indirectly references f in its body returns any
 var a: any = function f() {
->a : Symbol(a, Decl(functionImplementations.ts, 4, 3), Decl(functionImplementations.ts, 7, 3), Decl(functionImplementations.ts, 12, 3), Decl(functionImplementations.ts, 24, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 84, 3))
->f : Symbol(f, Decl(functionImplementations.ts, 12, 12))
+>a : Symbol(a, Decl(functionImplementations.ts, 5, 3), Decl(functionImplementations.ts, 8, 3), Decl(functionImplementations.ts, 13, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 26, 3), Decl(functionImplementations.ts, 85, 3))
+>f : Symbol(f, Decl(functionImplementations.ts, 13, 12))
 
     var x = f;
->x : Symbol(x, Decl(functionImplementations.ts, 13, 7))
->f : Symbol(f, Decl(functionImplementations.ts, 12, 12))
+>x : Symbol(x, Decl(functionImplementations.ts, 14, 7))
+>f : Symbol(f, Decl(functionImplementations.ts, 13, 12))
 
     return x;
->x : Symbol(x, Decl(functionImplementations.ts, 13, 7))
+>x : Symbol(x, Decl(functionImplementations.ts, 14, 7))
 
 };
 
 // Two mutually recursive function implementations with no return type annotations
 function rec1() {
->rec1 : Symbol(rec1, Decl(functionImplementations.ts, 15, 2))
+>rec1 : Symbol(rec1, Decl(functionImplementations.ts, 16, 2))
 
     return rec2();
->rec2 : Symbol(rec2, Decl(functionImplementations.ts, 20, 1))
+>rec2 : Symbol(rec2, Decl(functionImplementations.ts, 21, 1))
 }
 function rec2() {
->rec2 : Symbol(rec2, Decl(functionImplementations.ts, 20, 1))
+>rec2 : Symbol(rec2, Decl(functionImplementations.ts, 21, 1))
 
     return rec1();
->rec1 : Symbol(rec1, Decl(functionImplementations.ts, 15, 2))
+>rec1 : Symbol(rec1, Decl(functionImplementations.ts, 16, 2))
 }
 var a = rec1();
->a : Symbol(a, Decl(functionImplementations.ts, 4, 3), Decl(functionImplementations.ts, 7, 3), Decl(functionImplementations.ts, 12, 3), Decl(functionImplementations.ts, 24, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 84, 3))
->rec1 : Symbol(rec1, Decl(functionImplementations.ts, 15, 2))
+>a : Symbol(a, Decl(functionImplementations.ts, 5, 3), Decl(functionImplementations.ts, 8, 3), Decl(functionImplementations.ts, 13, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 26, 3), Decl(functionImplementations.ts, 85, 3))
+>rec1 : Symbol(rec1, Decl(functionImplementations.ts, 16, 2))
 
 var a = rec2();
->a : Symbol(a, Decl(functionImplementations.ts, 4, 3), Decl(functionImplementations.ts, 7, 3), Decl(functionImplementations.ts, 12, 3), Decl(functionImplementations.ts, 24, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 84, 3))
->rec2 : Symbol(rec2, Decl(functionImplementations.ts, 20, 1))
+>a : Symbol(a, Decl(functionImplementations.ts, 5, 3), Decl(functionImplementations.ts, 8, 3), Decl(functionImplementations.ts, 13, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 26, 3), Decl(functionImplementations.ts, 85, 3))
+>rec2 : Symbol(rec2, Decl(functionImplementations.ts, 21, 1))
 
 // Two mutually recursive function implementations with return type annotation in one
 function rec3(): number {
->rec3 : Symbol(rec3, Decl(functionImplementations.ts, 25, 15))
+>rec3 : Symbol(rec3, Decl(functionImplementations.ts, 26, 15))
 
     return rec4();
->rec4 : Symbol(rec4, Decl(functionImplementations.ts, 30, 1))
+>rec4 : Symbol(rec4, Decl(functionImplementations.ts, 31, 1))
 }
 function rec4() {
->rec4 : Symbol(rec4, Decl(functionImplementations.ts, 30, 1))
+>rec4 : Symbol(rec4, Decl(functionImplementations.ts, 31, 1))
 
     return rec3();
->rec3 : Symbol(rec3, Decl(functionImplementations.ts, 25, 15))
+>rec3 : Symbol(rec3, Decl(functionImplementations.ts, 26, 15))
 }
 var n: number;
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
 
 var n = rec3();
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
->rec3 : Symbol(rec3, Decl(functionImplementations.ts, 25, 15))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
+>rec3 : Symbol(rec3, Decl(functionImplementations.ts, 26, 15))
 
 var n = rec4();
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
->rec4 : Symbol(rec4, Decl(functionImplementations.ts, 30, 1))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
+>rec4 : Symbol(rec4, Decl(functionImplementations.ts, 31, 1))
 
 // FunctionExpression with no return type annotation and returns a number
 var n = function () {
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
 
     return 3;
 } ();
 
 // FunctionExpression with no return type annotation and returns null
 var nu = null;
->nu : Symbol(nu, Decl(functionImplementations.ts, 44, 3), Decl(functionImplementations.ts, 45, 3))
+>nu : Symbol(nu, Decl(functionImplementations.ts, 45, 3), Decl(functionImplementations.ts, 46, 3))
 
 var nu = function () {
->nu : Symbol(nu, Decl(functionImplementations.ts, 44, 3), Decl(functionImplementations.ts, 45, 3))
+>nu : Symbol(nu, Decl(functionImplementations.ts, 45, 3), Decl(functionImplementations.ts, 46, 3))
 
     return null;
 } ();
 
 // FunctionExpression with no return type annotation and returns undefined
 var un = undefined;
->un : Symbol(un, Decl(functionImplementations.ts, 50, 3), Decl(functionImplementations.ts, 51, 3))
+>un : Symbol(un, Decl(functionImplementations.ts, 51, 3), Decl(functionImplementations.ts, 52, 3))
 >undefined : Symbol(undefined)
 
 var un = function () {
->un : Symbol(un, Decl(functionImplementations.ts, 50, 3), Decl(functionImplementations.ts, 51, 3))
+>un : Symbol(un, Decl(functionImplementations.ts, 51, 3), Decl(functionImplementations.ts, 52, 3))
 
     return undefined;
 >undefined : Symbol(undefined)
@@ -112,31 +113,31 @@ var un = function () {
 
 // FunctionExpression with no return type annotation and returns a type parameter type
 var n = function <T>(x: T) {
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
->T : Symbol(T, Decl(functionImplementations.ts, 56, 18))
->x : Symbol(x, Decl(functionImplementations.ts, 56, 21))
->T : Symbol(T, Decl(functionImplementations.ts, 56, 18))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
+>T : Symbol(T, Decl(functionImplementations.ts, 57, 18))
+>x : Symbol(x, Decl(functionImplementations.ts, 57, 21))
+>T : Symbol(T, Decl(functionImplementations.ts, 57, 18))
 
     return x;
->x : Symbol(x, Decl(functionImplementations.ts, 56, 21))
+>x : Symbol(x, Decl(functionImplementations.ts, 57, 21))
 
 } (4);
 
 // FunctionExpression with no return type annotation and returns a constrained type parameter type
 var n = function <T extends {}>(x: T) {
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
->T : Symbol(T, Decl(functionImplementations.ts, 61, 18))
->x : Symbol(x, Decl(functionImplementations.ts, 61, 32))
->T : Symbol(T, Decl(functionImplementations.ts, 61, 18))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
+>T : Symbol(T, Decl(functionImplementations.ts, 62, 18))
+>x : Symbol(x, Decl(functionImplementations.ts, 62, 32))
+>T : Symbol(T, Decl(functionImplementations.ts, 62, 18))
 
     return x;
->x : Symbol(x, Decl(functionImplementations.ts, 61, 32))
+>x : Symbol(x, Decl(functionImplementations.ts, 62, 32))
 
 } (4);
 
 // FunctionExpression with no return type annotation with multiple return statements with identical types
 var n = function () {
->n : Symbol(n, Decl(functionImplementations.ts, 34, 3), Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 39, 3), Decl(functionImplementations.ts, 56, 3), Decl(functionImplementations.ts, 61, 3), Decl(functionImplementations.ts, 66, 3))
+>n : Symbol(n, Decl(functionImplementations.ts, 35, 3), Decl(functionImplementations.ts, 36, 3), Decl(functionImplementations.ts, 37, 3), Decl(functionImplementations.ts, 40, 3), Decl(functionImplementations.ts, 57, 3), Decl(functionImplementations.ts, 62, 3), Decl(functionImplementations.ts, 67, 3))
 
     return 3;
     return 5;
@@ -148,36 +149,36 @@ var n = function () {
 // A compile - time error occurs if no return statement expression has a type that is a supertype of each of the others.
 // FunctionExpression with no return type annotation with multiple return statements with subtype relation between returns
 class Base { private m; }
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
->m : Symbol(m, Decl(functionImplementations.ts, 76, 12))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
+>m : Symbol(m, Decl(functionImplementations.ts, 77, 12))
 
 class Derived extends Base { private q; }
->Derived : Symbol(Derived, Decl(functionImplementations.ts, 76, 25))
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
->q : Symbol(q, Decl(functionImplementations.ts, 77, 28))
+>Derived : Symbol(Derived, Decl(functionImplementations.ts, 77, 25))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
+>q : Symbol(q, Decl(functionImplementations.ts, 78, 28))
 
 var b: Base;
->b : Symbol(b, Decl(functionImplementations.ts, 78, 3), Decl(functionImplementations.ts, 79, 3))
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
+>b : Symbol(b, Decl(functionImplementations.ts, 79, 3), Decl(functionImplementations.ts, 80, 3))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
 
 var b = function () {
->b : Symbol(b, Decl(functionImplementations.ts, 78, 3), Decl(functionImplementations.ts, 79, 3))
+>b : Symbol(b, Decl(functionImplementations.ts, 79, 3), Decl(functionImplementations.ts, 80, 3))
 
     return new Base(); return new Derived();
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
->Derived : Symbol(Derived, Decl(functionImplementations.ts, 76, 25))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
+>Derived : Symbol(Derived, Decl(functionImplementations.ts, 77, 25))
 
 } ();
 
 // FunctionExpression with no return type annotation with multiple return statements with one a recursive call
 var a = function f() {
->a : Symbol(a, Decl(functionImplementations.ts, 4, 3), Decl(functionImplementations.ts, 7, 3), Decl(functionImplementations.ts, 12, 3), Decl(functionImplementations.ts, 24, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 84, 3))
->f : Symbol(f, Decl(functionImplementations.ts, 84, 7))
+>a : Symbol(a, Decl(functionImplementations.ts, 5, 3), Decl(functionImplementations.ts, 8, 3), Decl(functionImplementations.ts, 13, 3), Decl(functionImplementations.ts, 25, 3), Decl(functionImplementations.ts, 26, 3), Decl(functionImplementations.ts, 85, 3))
+>f : Symbol(f, Decl(functionImplementations.ts, 85, 7))
 
     return new Base(); return new Derived(); return f(); // ?
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
->Derived : Symbol(Derived, Decl(functionImplementations.ts, 76, 25))
->f : Symbol(f, Decl(functionImplementations.ts, 84, 7))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
+>Derived : Symbol(Derived, Decl(functionImplementations.ts, 77, 25))
+>f : Symbol(f, Decl(functionImplementations.ts, 85, 7))
 
 } ();
 
@@ -192,59 +193,59 @@ undefined === function (): number {
 
 // Type of 'this' in function implementation is 'any'
 function thisFunc() {
->thisFunc : Symbol(thisFunc, Decl(functionImplementations.ts, 91, 2))
+>thisFunc : Symbol(thisFunc, Decl(functionImplementations.ts, 92, 2))
 
     var x = this;
->x : Symbol(x, Decl(functionImplementations.ts, 95, 7), Decl(functionImplementations.ts, 96, 7))
+>x : Symbol(x, Decl(functionImplementations.ts, 96, 7), Decl(functionImplementations.ts, 97, 7))
 
     var x: any;
->x : Symbol(x, Decl(functionImplementations.ts, 95, 7), Decl(functionImplementations.ts, 96, 7))
+>x : Symbol(x, Decl(functionImplementations.ts, 96, 7), Decl(functionImplementations.ts, 97, 7))
 }
 
 // Function signature with optional parameter, no type annotation and initializer has initializer's type
 function opt1(n = 4) {
->opt1 : Symbol(opt1, Decl(functionImplementations.ts, 97, 1))
->n : Symbol(n, Decl(functionImplementations.ts, 100, 14))
+>opt1 : Symbol(opt1, Decl(functionImplementations.ts, 98, 1))
+>n : Symbol(n, Decl(functionImplementations.ts, 101, 14))
 
     var m = n;
->m : Symbol(m, Decl(functionImplementations.ts, 101, 7), Decl(functionImplementations.ts, 102, 7))
->n : Symbol(n, Decl(functionImplementations.ts, 100, 14))
+>m : Symbol(m, Decl(functionImplementations.ts, 102, 7), Decl(functionImplementations.ts, 103, 7))
+>n : Symbol(n, Decl(functionImplementations.ts, 101, 14))
 
     var m: number;
->m : Symbol(m, Decl(functionImplementations.ts, 101, 7), Decl(functionImplementations.ts, 102, 7))
+>m : Symbol(m, Decl(functionImplementations.ts, 102, 7), Decl(functionImplementations.ts, 103, 7))
 }
 
 // Function signature with optional parameter, no type annotation and initializer has initializer's widened type
 function opt2(n = { x: null, y: undefined }) {
->opt2 : Symbol(opt2, Decl(functionImplementations.ts, 103, 1))
->n : Symbol(n, Decl(functionImplementations.ts, 106, 14))
->x : Symbol(x, Decl(functionImplementations.ts, 106, 19))
->y : Symbol(y, Decl(functionImplementations.ts, 106, 28))
+>opt2 : Symbol(opt2, Decl(functionImplementations.ts, 104, 1))
+>n : Symbol(n, Decl(functionImplementations.ts, 107, 14))
+>x : Symbol(x, Decl(functionImplementations.ts, 107, 19))
+>y : Symbol(y, Decl(functionImplementations.ts, 107, 28))
 >undefined : Symbol(undefined)
 
     var m = n;
->m : Symbol(m, Decl(functionImplementations.ts, 107, 7), Decl(functionImplementations.ts, 108, 7))
->n : Symbol(n, Decl(functionImplementations.ts, 106, 14))
+>m : Symbol(m, Decl(functionImplementations.ts, 108, 7), Decl(functionImplementations.ts, 109, 7))
+>n : Symbol(n, Decl(functionImplementations.ts, 107, 14))
 
     var m: { x: any; y: any };
->m : Symbol(m, Decl(functionImplementations.ts, 107, 7), Decl(functionImplementations.ts, 108, 7))
->x : Symbol(x, Decl(functionImplementations.ts, 108, 12))
->y : Symbol(y, Decl(functionImplementations.ts, 108, 20))
+>m : Symbol(m, Decl(functionImplementations.ts, 108, 7), Decl(functionImplementations.ts, 109, 7))
+>x : Symbol(x, Decl(functionImplementations.ts, 109, 12))
+>y : Symbol(y, Decl(functionImplementations.ts, 109, 20))
 }
 
 // Function signature with initializer referencing other parameter to the left
 function opt3(n: number, m = n) {
->opt3 : Symbol(opt3, Decl(functionImplementations.ts, 109, 1))
->n : Symbol(n, Decl(functionImplementations.ts, 112, 14))
->m : Symbol(m, Decl(functionImplementations.ts, 112, 24))
->n : Symbol(n, Decl(functionImplementations.ts, 112, 14))
+>opt3 : Symbol(opt3, Decl(functionImplementations.ts, 110, 1))
+>n : Symbol(n, Decl(functionImplementations.ts, 113, 14))
+>m : Symbol(m, Decl(functionImplementations.ts, 113, 24))
+>n : Symbol(n, Decl(functionImplementations.ts, 113, 14))
 
     var y = m;
->y : Symbol(y, Decl(functionImplementations.ts, 113, 7), Decl(functionImplementations.ts, 114, 7))
->m : Symbol(m, Decl(functionImplementations.ts, 112, 24))
+>y : Symbol(y, Decl(functionImplementations.ts, 114, 7), Decl(functionImplementations.ts, 115, 7))
+>m : Symbol(m, Decl(functionImplementations.ts, 113, 24))
 
     var y: number;
->y : Symbol(y, Decl(functionImplementations.ts, 113, 7), Decl(functionImplementations.ts, 114, 7))
+>y : Symbol(y, Decl(functionImplementations.ts, 114, 7), Decl(functionImplementations.ts, 115, 7))
 }
 
 // Function signature with optional parameter has correct codegen 
@@ -252,93 +253,93 @@ function opt3(n: number, m = n) {
 
 // FunctionExpression with non -void return type annotation return with no expression
 function f6(): number {
->f6 : Symbol(f6, Decl(functionImplementations.ts, 115, 1))
+>f6 : Symbol(f6, Decl(functionImplementations.ts, 116, 1))
 
     return;
 }
 
 class Derived2 extends Base { private r: string; }
->Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 123, 1))
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
->r : Symbol(r, Decl(functionImplementations.ts, 125, 29))
+>Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 124, 1))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
+>r : Symbol(r, Decl(functionImplementations.ts, 126, 29))
 
 class AnotherClass { private x }
->AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 125, 50))
->x : Symbol(x, Decl(functionImplementations.ts, 126, 20))
+>AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 126, 50))
+>x : Symbol(x, Decl(functionImplementations.ts, 127, 20))
 
 // if f is a contextually typed function expression, the inferred return type is the union type
 // of the types of the return statement expressions in the function body, 
 // ignoring return statements with no expressions.
 var f7: (x: number) => string | number = x => { // should be (x: number) => number | string
->f7 : Symbol(f7, Decl(functionImplementations.ts, 130, 3))
->x : Symbol(x, Decl(functionImplementations.ts, 130, 9))
->x : Symbol(x, Decl(functionImplementations.ts, 130, 40))
+>f7 : Symbol(f7, Decl(functionImplementations.ts, 131, 3))
+>x : Symbol(x, Decl(functionImplementations.ts, 131, 9))
+>x : Symbol(x, Decl(functionImplementations.ts, 131, 40))
 
     if (x < 0) { return x; }
->x : Symbol(x, Decl(functionImplementations.ts, 130, 40))
->x : Symbol(x, Decl(functionImplementations.ts, 130, 40))
+>x : Symbol(x, Decl(functionImplementations.ts, 131, 40))
+>x : Symbol(x, Decl(functionImplementations.ts, 131, 40))
 
     return x.toString();
 >x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(functionImplementations.ts, 130, 40))
+>x : Symbol(x, Decl(functionImplementations.ts, 131, 40))
 >toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
 }
 var f8: (x: number) => any = x => { // should be (x: number) => Base
->f8 : Symbol(f8, Decl(functionImplementations.ts, 134, 3))
->x : Symbol(x, Decl(functionImplementations.ts, 134, 9))
->x : Symbol(x, Decl(functionImplementations.ts, 134, 28))
+>f8 : Symbol(f8, Decl(functionImplementations.ts, 135, 3))
+>x : Symbol(x, Decl(functionImplementations.ts, 135, 9))
+>x : Symbol(x, Decl(functionImplementations.ts, 135, 28))
 
     return new Base();
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
 
     return new Derived2();
->Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 123, 1))
+>Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 124, 1))
 }
 var f9: (x: number) => any = x => { // should be (x: number) => Base
->f9 : Symbol(f9, Decl(functionImplementations.ts, 138, 3))
->x : Symbol(x, Decl(functionImplementations.ts, 138, 9))
->x : Symbol(x, Decl(functionImplementations.ts, 138, 28))
+>f9 : Symbol(f9, Decl(functionImplementations.ts, 139, 3))
+>x : Symbol(x, Decl(functionImplementations.ts, 139, 9))
+>x : Symbol(x, Decl(functionImplementations.ts, 139, 28))
 
     return new Base();
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
 
     return new Derived();
->Derived : Symbol(Derived, Decl(functionImplementations.ts, 76, 25))
+>Derived : Symbol(Derived, Decl(functionImplementations.ts, 77, 25))
 
     return new Derived2();
->Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 123, 1))
+>Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 124, 1))
 }
 var f10: (x: number) => any = x => { // should be (x: number) => Derived | Derived1
->f10 : Symbol(f10, Decl(functionImplementations.ts, 143, 3))
->x : Symbol(x, Decl(functionImplementations.ts, 143, 10))
->x : Symbol(x, Decl(functionImplementations.ts, 143, 29))
+>f10 : Symbol(f10, Decl(functionImplementations.ts, 144, 3))
+>x : Symbol(x, Decl(functionImplementations.ts, 144, 10))
+>x : Symbol(x, Decl(functionImplementations.ts, 144, 29))
 
     return new Derived();
->Derived : Symbol(Derived, Decl(functionImplementations.ts, 76, 25))
+>Derived : Symbol(Derived, Decl(functionImplementations.ts, 77, 25))
 
     return new Derived2();
->Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 123, 1))
+>Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 124, 1))
 }
 var f11: (x: number) => any = x => { // should be (x: number) => Base | AnotherClass
->f11 : Symbol(f11, Decl(functionImplementations.ts, 147, 3))
->x : Symbol(x, Decl(functionImplementations.ts, 147, 10))
->x : Symbol(x, Decl(functionImplementations.ts, 147, 29))
+>f11 : Symbol(f11, Decl(functionImplementations.ts, 148, 3))
+>x : Symbol(x, Decl(functionImplementations.ts, 148, 10))
+>x : Symbol(x, Decl(functionImplementations.ts, 148, 29))
 
     return new Base();
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
 
     return new AnotherClass();
->AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 125, 50))
+>AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 126, 50))
 }
 var f12: (x: number) => any = x => { // should be (x: number) => Base | AnotherClass
->f12 : Symbol(f12, Decl(functionImplementations.ts, 151, 3))
->x : Symbol(x, Decl(functionImplementations.ts, 151, 10))
->x : Symbol(x, Decl(functionImplementations.ts, 151, 29))
+>f12 : Symbol(f12, Decl(functionImplementations.ts, 152, 3))
+>x : Symbol(x, Decl(functionImplementations.ts, 152, 10))
+>x : Symbol(x, Decl(functionImplementations.ts, 152, 29))
 
     return new Base();
->Base : Symbol(Base, Decl(functionImplementations.ts, 69, 4))
+>Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
 
     return; // should be ignored
     return new AnotherClass();
->AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 125, 50))
+>AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 126, 50))
 }
diff --git a/tests/baselines/reference/functionImplementations.types b/tests/baselines/reference/functionImplementations.types
index 1398e2974f0..6690ca68c98 100644
--- a/tests/baselines/reference/functionImplementations.types
+++ b/tests/baselines/reference/functionImplementations.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/functions/functionImplementations.ts ===
+
 // FunctionExpression with no return type annotation and no return statement returns void
 var v: void = function () { } ();
 >v : void
diff --git a/tests/baselines/reference/functionOverloads12.js b/tests/baselines/reference/functionOverloads12.js
index 4681e43ee5b..8d834e8180f 100644
--- a/tests/baselines/reference/functionOverloads12.js
+++ b/tests/baselines/reference/functionOverloads12.js
@@ -1,4 +1,5 @@
 //// [functionOverloads12.ts]
+
 function foo():string;
 function foo():number;
 function foo():any { if (true) return ""; else return 0;}
diff --git a/tests/baselines/reference/functionOverloads12.symbols b/tests/baselines/reference/functionOverloads12.symbols
index 583e7f5c045..4744f98c9f2 100644
--- a/tests/baselines/reference/functionOverloads12.symbols
+++ b/tests/baselines/reference/functionOverloads12.symbols
@@ -1,10 +1,11 @@
 === tests/cases/compiler/functionOverloads12.ts ===
+
 function foo():string;
->foo : Symbol(foo, Decl(functionOverloads12.ts, 0, 0), Decl(functionOverloads12.ts, 0, 22), Decl(functionOverloads12.ts, 1, 22))
+>foo : Symbol(foo, Decl(functionOverloads12.ts, 0, 0), Decl(functionOverloads12.ts, 1, 22), Decl(functionOverloads12.ts, 2, 22))
 
 function foo():number;
->foo : Symbol(foo, Decl(functionOverloads12.ts, 0, 0), Decl(functionOverloads12.ts, 0, 22), Decl(functionOverloads12.ts, 1, 22))
+>foo : Symbol(foo, Decl(functionOverloads12.ts, 0, 0), Decl(functionOverloads12.ts, 1, 22), Decl(functionOverloads12.ts, 2, 22))
 
 function foo():any { if (true) return ""; else return 0;}
->foo : Symbol(foo, Decl(functionOverloads12.ts, 0, 0), Decl(functionOverloads12.ts, 0, 22), Decl(functionOverloads12.ts, 1, 22))
+>foo : Symbol(foo, Decl(functionOverloads12.ts, 0, 0), Decl(functionOverloads12.ts, 1, 22), Decl(functionOverloads12.ts, 2, 22))
 
diff --git a/tests/baselines/reference/functionOverloads12.types b/tests/baselines/reference/functionOverloads12.types
index 20f5ee5d556..5db8ff68cd4 100644
--- a/tests/baselines/reference/functionOverloads12.types
+++ b/tests/baselines/reference/functionOverloads12.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/functionOverloads12.ts ===
+
 function foo():string;
 >foo : { (): string; (): number; }
 
diff --git a/tests/baselines/reference/functionReturn.js b/tests/baselines/reference/functionReturn.js
index c433eec190d..42d0de5fd7c 100644
--- a/tests/baselines/reference/functionReturn.js
+++ b/tests/baselines/reference/functionReturn.js
@@ -1,4 +1,5 @@
 //// [functionReturn.ts]
+
 function f0(): void { }
 function f1() {
     var n: any = f0();
diff --git a/tests/baselines/reference/functionReturn.symbols b/tests/baselines/reference/functionReturn.symbols
index 9c6b794b3d0..630e435635b 100644
--- a/tests/baselines/reference/functionReturn.symbols
+++ b/tests/baselines/reference/functionReturn.symbols
@@ -1,28 +1,29 @@
 === tests/cases/compiler/functionReturn.ts ===
+
 function f0(): void { }
 >f0 : Symbol(f0, Decl(functionReturn.ts, 0, 0))
 
 function f1() {
->f1 : Symbol(f1, Decl(functionReturn.ts, 0, 23))
+>f1 : Symbol(f1, Decl(functionReturn.ts, 1, 23))
 
     var n: any = f0();
->n : Symbol(n, Decl(functionReturn.ts, 2, 7))
+>n : Symbol(n, Decl(functionReturn.ts, 3, 7))
 >f0 : Symbol(f0, Decl(functionReturn.ts, 0, 0))
 }
 function f2(): any { }
->f2 : Symbol(f2, Decl(functionReturn.ts, 3, 1))
+>f2 : Symbol(f2, Decl(functionReturn.ts, 4, 1))
 
 function f3(): string { return; }
->f3 : Symbol(f3, Decl(functionReturn.ts, 4, 22))
+>f3 : Symbol(f3, Decl(functionReturn.ts, 5, 22))
 
 function f4(): string {
->f4 : Symbol(f4, Decl(functionReturn.ts, 5, 33))
+>f4 : Symbol(f4, Decl(functionReturn.ts, 6, 33))
 
     return '';
     return;
 }
 function f5(): string {
->f5 : Symbol(f5, Decl(functionReturn.ts, 9, 1))
+>f5 : Symbol(f5, Decl(functionReturn.ts, 10, 1))
 
     return '';
     return undefined;
diff --git a/tests/baselines/reference/functionReturn.types b/tests/baselines/reference/functionReturn.types
index 6fc9d680db9..f9c0b36fbc2 100644
--- a/tests/baselines/reference/functionReturn.types
+++ b/tests/baselines/reference/functionReturn.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/functionReturn.ts ===
+
 function f0(): void { }
 >f0 : () => void
 
diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt
new file mode 100644
index 00000000000..93a35292b70
--- /dev/null
+++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts(1,24): error TS2304: Cannot find name 'b'.
+
+
+==== tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts (1 errors) ====
+    function bar(): typeof b {
+                           ~
+!!! error TS2304: Cannot find name 'b'.
+        var b = 1;
+        return undefined;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.js b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.js
new file mode 100644
index 00000000000..191255e52c2
--- /dev/null
+++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.js
@@ -0,0 +1,11 @@
+//// [functionVariableInReturnTypeAnnotation.ts]
+function bar(): typeof b {
+    var b = 1;
+    return undefined;
+}
+
+//// [functionVariableInReturnTypeAnnotation.js]
+function bar() {
+    var b = 1;
+    return undefined;
+}
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt b/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt
index 8a57d8e08e6..a981d337093 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt
@@ -1,15 +1,16 @@
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(4,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(12,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(22,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(31,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(43,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(48,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(56,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(56,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(56,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(5,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(13,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(23,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(32,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(44,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(49,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(57,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(57,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(57,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
 
 
 ==== tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts (9 errors) ====
+    
     // return type of a function with multiple returns is the BCT of each return statement
     // it is an error if there is no single BCT, these are error cases
     
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements.js b/tests/baselines/reference/functionWithMultipleReturnStatements.js
index 347a05d0f33..d44c37ebbf0 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements.js
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements.js
@@ -1,4 +1,5 @@
 //// [functionWithMultipleReturnStatements.ts]
+
 // return type of a function with multiple returns is the BCT of each return statement
 // it is an error if there is no single BCT, these are error cases
 
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt b/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt
index bbaa5a85578..0399c7a79a6 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(58,10): error TS2354: No best common type exists among return expressions.
-tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(67,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(59,10): error TS2354: No best common type exists among return expressions.
+tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(68,10): error TS2354: No best common type exists among return expressions.
 
 
 ==== tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts (2 errors) ====
+    
     // return type of a function with multiple returns is the BCT of each return statement
     // no errors expected here
     
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.js b/tests/baselines/reference/functionWithMultipleReturnStatements2.js
index 4674c6db953..efee5816fb6 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements2.js
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.js
@@ -1,4 +1,5 @@
 //// [functionWithMultipleReturnStatements2.ts]
+
 // return type of a function with multiple returns is the BCT of each return statement
 // no errors expected here
 
diff --git a/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt b/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt
index 3c8fef3eb49..86234b7dd81 100644
--- a/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt
+++ b/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/functionWithNoBestCommonType1.ts(1,10): error TS2354: No best common type exists among return expressions.
+tests/cases/compiler/functionWithNoBestCommonType1.ts(2,10): error TS2354: No best common type exists among return expressions.
 
 
 ==== tests/cases/compiler/functionWithNoBestCommonType1.ts (1 errors) ====
+    
     function foo() {
              ~~~
 !!! error TS2354: No best common type exists among return expressions.
diff --git a/tests/baselines/reference/functionWithNoBestCommonType1.js b/tests/baselines/reference/functionWithNoBestCommonType1.js
index f7114fb40d8..4d197c24334 100644
--- a/tests/baselines/reference/functionWithNoBestCommonType1.js
+++ b/tests/baselines/reference/functionWithNoBestCommonType1.js
@@ -1,4 +1,5 @@
 //// [functionWithNoBestCommonType1.ts]
+
 function foo() {
     return true;
     return bar();
diff --git a/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt b/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt
index 981e330d9b5..6ce898e447c 100644
--- a/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt
+++ b/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/functionWithNoBestCommonType2.ts(1,9): error TS2354: No best common type exists among return expressions.
+tests/cases/compiler/functionWithNoBestCommonType2.ts(2,9): error TS2354: No best common type exists among return expressions.
 
 
 ==== tests/cases/compiler/functionWithNoBestCommonType2.ts (1 errors) ====
+    
     var v = function () {
             ~~~~~~~~
 !!! error TS2354: No best common type exists among return expressions.
diff --git a/tests/baselines/reference/functionWithNoBestCommonType2.js b/tests/baselines/reference/functionWithNoBestCommonType2.js
index 8e903518ec0..06a133b2db8 100644
--- a/tests/baselines/reference/functionWithNoBestCommonType2.js
+++ b/tests/baselines/reference/functionWithNoBestCommonType2.js
@@ -1,4 +1,5 @@
 //// [functionWithNoBestCommonType2.ts]
+
 var v = function () {
    return true;
    return bar();
diff --git a/tests/baselines/reference/functionWithThrowButNoReturn1.errors.txt b/tests/baselines/reference/functionWithThrowButNoReturn1.errors.txt
deleted file mode 100644
index 72f45da8d97..00000000000
--- a/tests/baselines/reference/functionWithThrowButNoReturn1.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/compiler/functionWithThrowButNoReturn1.ts(1,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-
-
-==== tests/cases/compiler/functionWithThrowButNoReturn1.ts (1 errors) ====
-    function fn(): number {
-                   ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-      throw new Error('NYI');
-      var t;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/functionWithThrowButNoReturn1.symbols b/tests/baselines/reference/functionWithThrowButNoReturn1.symbols
new file mode 100644
index 00000000000..ebc67c6f466
--- /dev/null
+++ b/tests/baselines/reference/functionWithThrowButNoReturn1.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/functionWithThrowButNoReturn1.ts ===
+function fn(): number {
+>fn : Symbol(fn, Decl(functionWithThrowButNoReturn1.ts, 0, 0))
+
+  throw new Error('NYI');
+>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+  var t;
+>t : Symbol(t, Decl(functionWithThrowButNoReturn1.ts, 2, 5))
+}
+
diff --git a/tests/baselines/reference/functionWithThrowButNoReturn1.types b/tests/baselines/reference/functionWithThrowButNoReturn1.types
new file mode 100644
index 00000000000..c136d8a4076
--- /dev/null
+++ b/tests/baselines/reference/functionWithThrowButNoReturn1.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/functionWithThrowButNoReturn1.ts ===
+function fn(): number {
+>fn : () => number
+
+  throw new Error('NYI');
+>new Error('NYI') : Error
+>Error : ErrorConstructor
+>'NYI' : string
+
+  var t;
+>t : any
+}
+
diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
index 2c5ff15f863..58ffd051d4d 100644
--- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
+++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
@@ -1,15 +1,14 @@
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(2,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(64,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(94,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(112,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(117,5): error TS1003: Identifier expected.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(3,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(95,16): error TS2378: A 'get' accessor must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(118,5): error TS1003: Identifier expected.
 
 
-==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (5 errors) ====
+==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (3 errors) ====
+    
     
     function f1(): string {
                    ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
         // errors because there are no return statements
     }
     
@@ -72,8 +71,6 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(117,5): e
     }
     
     function f14(): number {
-                    ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
         // Not fine, since we can *only* consist of a single throw statement
         // if no return statements are present but we are annotated.
         throw undefined;
@@ -105,7 +102,7 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(117,5): e
     class C {
         public get m1() {
                    ~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
             // Errors; get accessors must return a value.
         }
     
@@ -124,8 +121,6 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(117,5): e
         }
     
         public get m5() {
-                   ~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
             // Not fine, since we can *only* consist of a single throw statement
             // if no return statements are present but we are a get accessor.
             throw null;
diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js
index 592a03d7158..f76e5342aee 100644
--- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js
+++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js
@@ -1,5 +1,6 @@
 //// [functionsMissingReturnStatementsAndExpressions.ts]
 
+
 function f1(): string {
     // errors because there are no return statements
 }
diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index 72ac4c816f9..0aa8207ff98 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -4,6 +4,7 @@ tests/cases/compiler/fuzzy.ts(21,20): error TS2322: Type '{ anything: number; on
   Types of property 'oneI' are incompatible.
     Type 'this' is not assignable to type 'I'.
       Type 'C' is not assignable to type 'I'.
+        Property 'alsoWorks' is missing in type 'C'.
 tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this; }' nor type 'R' is assignable to the other.
   Property 'anything' is missing in type '{ oneI: this; }'.
 
@@ -38,6 +39,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this;
 !!! error TS2322:   Types of property 'oneI' are incompatible.
 !!! error TS2322:     Type 'this' is not assignable to type 'I'.
 !!! error TS2322:       Type 'C' is not assignable to type 'I'.
+!!! error TS2322:         Property 'alsoWorks' is missing in type 'C'.
             }
     
             worksToo():R {
diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js
index 1f7d2b8035f..a867d4b7629 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -1,4 +1,5 @@
 //// [generatedContextualTyping.ts]
+
 class Base { private p; }
 class Derived1 extends Base { private m; }
 class Derived2 extends Base { private n; }
diff --git a/tests/baselines/reference/generatedContextualTyping.symbols b/tests/baselines/reference/generatedContextualTyping.symbols
index df0bb33e02f..bc50fcc25c6 100644
--- a/tests/baselines/reference/generatedContextualTyping.symbols
+++ b/tests/baselines/reference/generatedContextualTyping.symbols
@@ -1,2831 +1,2832 @@
 === tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts ===
+
 class Base { private p; }
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->p : Symbol(p, Decl(generatedContextualTyping.ts, 0, 12))
+>p : Symbol(p, Decl(generatedContextualTyping.ts, 1, 12))
 
 class Derived1 extends Base { private m; }
->Derived1 : Symbol(Derived1, Decl(generatedContextualTyping.ts, 0, 25))
+>Derived1 : Symbol(Derived1, Decl(generatedContextualTyping.ts, 1, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->m : Symbol(m, Decl(generatedContextualTyping.ts, 1, 29))
+>m : Symbol(m, Decl(generatedContextualTyping.ts, 2, 29))
 
 class Derived2 extends Base { private n; }
->Derived2 : Symbol(Derived2, Decl(generatedContextualTyping.ts, 1, 42))
+>Derived2 : Symbol(Derived2, Decl(generatedContextualTyping.ts, 2, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 2, 29))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 3, 29))
 
 interface Genric<T> { func(n: T[]); }
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
->T : Symbol(T, Decl(generatedContextualTyping.ts, 3, 17))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 3, 21))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 3, 27))
->T : Symbol(T, Decl(generatedContextualTyping.ts, 3, 17))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
+>T : Symbol(T, Decl(generatedContextualTyping.ts, 4, 17))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 4, 21))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 4, 27))
+>T : Symbol(T, Decl(generatedContextualTyping.ts, 4, 17))
 
 var b = new Base(), d1 = new Derived1(), d2 = new Derived2();
->b : Symbol(b, Decl(generatedContextualTyping.ts, 4, 3))
+>b : Symbol(b, Decl(generatedContextualTyping.ts, 5, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->Derived1 : Symbol(Derived1, Decl(generatedContextualTyping.ts, 0, 25))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->Derived2 : Symbol(Derived2, Decl(generatedContextualTyping.ts, 1, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>Derived1 : Symbol(Derived1, Decl(generatedContextualTyping.ts, 1, 25))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>Derived2 : Symbol(Derived2, Decl(generatedContextualTyping.ts, 2, 42))
 
 var x1: () => Base[] = () => [d1, d2];
->x1 : Symbol(x1, Decl(generatedContextualTyping.ts, 5, 3))
+>x1 : Symbol(x1, Decl(generatedContextualTyping.ts, 6, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x2: () => Base[] = function() { return [d1, d2] };
->x2 : Symbol(x2, Decl(generatedContextualTyping.ts, 6, 3))
+>x2 : Symbol(x2, Decl(generatedContextualTyping.ts, 7, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x3: () => Base[] = function named() { return [d1, d2] };
->x3 : Symbol(x3, Decl(generatedContextualTyping.ts, 7, 3))
+>x3 : Symbol(x3, Decl(generatedContextualTyping.ts, 8, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 7, 22))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 8, 22))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x4: { (): Base[]; } = () => [d1, d2];
->x4 : Symbol(x4, Decl(generatedContextualTyping.ts, 8, 3))
+>x4 : Symbol(x4, Decl(generatedContextualTyping.ts, 9, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x5: { (): Base[]; } = function() { return [d1, d2] };
->x5 : Symbol(x5, Decl(generatedContextualTyping.ts, 9, 3))
+>x5 : Symbol(x5, Decl(generatedContextualTyping.ts, 10, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x6: { (): Base[]; } = function named() { return [d1, d2] };
->x6 : Symbol(x6, Decl(generatedContextualTyping.ts, 10, 3))
+>x6 : Symbol(x6, Decl(generatedContextualTyping.ts, 11, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 10, 25))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 11, 25))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x7: Base[] = [d1, d2];
->x7 : Symbol(x7, Decl(generatedContextualTyping.ts, 11, 3))
+>x7 : Symbol(x7, Decl(generatedContextualTyping.ts, 12, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x8: Array<Base> = [d1, d2];
->x8 : Symbol(x8, Decl(generatedContextualTyping.ts, 12, 3))
+>x8 : Symbol(x8, Decl(generatedContextualTyping.ts, 13, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x9: { [n: number]: Base; } = [d1, d2];
->x9 : Symbol(x9, Decl(generatedContextualTyping.ts, 13, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 13, 11))
+>x9 : Symbol(x9, Decl(generatedContextualTyping.ts, 14, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 14, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x10: {n: Base[]; }  = { n: [d1, d2] };
->x10 : Symbol(x10, Decl(generatedContextualTyping.ts, 14, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 14, 10))
+>x10 : Symbol(x10, Decl(generatedContextualTyping.ts, 15, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 15, 10))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 14, 27))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 15, 27))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x11: (s: Base[]) => any = n => { var n: Base[]; return null; };
->x11 : Symbol(x11, Decl(generatedContextualTyping.ts, 15, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 15, 10))
+>x11 : Symbol(x11, Decl(generatedContextualTyping.ts, 16, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 16, 10))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 15, 29), Decl(generatedContextualTyping.ts, 15, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 15, 29), Decl(generatedContextualTyping.ts, 15, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 16, 29), Decl(generatedContextualTyping.ts, 16, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 16, 29), Decl(generatedContextualTyping.ts, 16, 40))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x12: Genric<Base> = { func: n => { return [d1, d2]; } };
->x12 : Symbol(x12, Decl(generatedContextualTyping.ts, 16, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x12 : Symbol(x12, Decl(generatedContextualTyping.ts, 17, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 16, 25))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 16, 31))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 17, 25))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 17, 31))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x13 { member: () => Base[] = () => [d1, d2] }
->x13 : Symbol(x13, Decl(generatedContextualTyping.ts, 16, 60))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 17, 11))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x14 { member: () => Base[] = function() { return [d1, d2] } }
->x14 : Symbol(x14, Decl(generatedContextualTyping.ts, 17, 51))
+>x13 : Symbol(x13, Decl(generatedContextualTyping.ts, 17, 60))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 18, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x15 { member: () => Base[] = function named() { return [d1, d2] } }
->x15 : Symbol(x15, Decl(generatedContextualTyping.ts, 18, 67))
+class x14 { member: () => Base[] = function() { return [d1, d2] } }
+>x14 : Symbol(x14, Decl(generatedContextualTyping.ts, 18, 51))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 19, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 19, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x16 { member: { (): Base[]; } = () => [d1, d2] }
->x16 : Symbol(x16, Decl(generatedContextualTyping.ts, 19, 73))
+class x15 { member: () => Base[] = function named() { return [d1, d2] } }
+>x15 : Symbol(x15, Decl(generatedContextualTyping.ts, 19, 67))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 20, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 20, 34))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x17 { member: { (): Base[]; } = function() { return [d1, d2] } }
->x17 : Symbol(x17, Decl(generatedContextualTyping.ts, 20, 54))
+class x16 { member: { (): Base[]; } = () => [d1, d2] }
+>x16 : Symbol(x16, Decl(generatedContextualTyping.ts, 20, 73))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 21, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x18 { member: { (): Base[]; } = function named() { return [d1, d2] } }
->x18 : Symbol(x18, Decl(generatedContextualTyping.ts, 21, 70))
+class x17 { member: { (): Base[]; } = function() { return [d1, d2] } }
+>x17 : Symbol(x17, Decl(generatedContextualTyping.ts, 21, 54))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 22, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 22, 37))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x19 { member: Base[] = [d1, d2] }
->x19 : Symbol(x19, Decl(generatedContextualTyping.ts, 22, 76))
+class x18 { member: { (): Base[]; } = function named() { return [d1, d2] } }
+>x18 : Symbol(x18, Decl(generatedContextualTyping.ts, 22, 70))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 23, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 23, 37))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x19 { member: Base[] = [d1, d2] }
+>x19 : Symbol(x19, Decl(generatedContextualTyping.ts, 23, 76))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 24, 11))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x20 { member: Array<Base> = [d1, d2] }
->x20 : Symbol(x20, Decl(generatedContextualTyping.ts, 23, 39))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 24, 11))
+>x20 : Symbol(x20, Decl(generatedContextualTyping.ts, 24, 39))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 25, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x21 { member: { [n: number]: Base; } = [d1, d2] }
->x21 : Symbol(x21, Decl(generatedContextualTyping.ts, 24, 44))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 25, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 25, 23))
+>x21 : Symbol(x21, Decl(generatedContextualTyping.ts, 25, 44))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 26, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 26, 23))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x22 { member: {n: Base[]; }  = { n: [d1, d2] } }
->x22 : Symbol(x22, Decl(generatedContextualTyping.ts, 25, 55))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 26, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 26, 21))
+>x22 : Symbol(x22, Decl(generatedContextualTyping.ts, 26, 55))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 27, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 21))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 26, 38))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 38))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
->x23 : Symbol(x23, Decl(generatedContextualTyping.ts, 26, 54))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 27, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 27, 21))
+>x23 : Symbol(x23, Decl(generatedContextualTyping.ts, 27, 54))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 28, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 28, 21))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 40), Decl(generatedContextualTyping.ts, 27, 51))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 40), Decl(generatedContextualTyping.ts, 27, 51))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 28, 40), Decl(generatedContextualTyping.ts, 28, 51))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 28, 40), Decl(generatedContextualTyping.ts, 28, 51))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x24 { member: Genric<Base> = { func: n => { return [d1, d2]; } } }
->x24 : Symbol(x24, Decl(generatedContextualTyping.ts, 27, 79))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 28, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x24 : Symbol(x24, Decl(generatedContextualTyping.ts, 28, 79))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 29, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 28, 36))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 28, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 29, 36))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 29, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x25 { private member: () => Base[] = () => [d1, d2] }
->x25 : Symbol(x25, Decl(generatedContextualTyping.ts, 28, 72))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 29, 11))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x26 { private member: () => Base[] = function() { return [d1, d2] } }
->x26 : Symbol(x26, Decl(generatedContextualTyping.ts, 29, 59))
+>x25 : Symbol(x25, Decl(generatedContextualTyping.ts, 29, 72))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 30, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x27 { private member: () => Base[] = function named() { return [d1, d2] } }
->x27 : Symbol(x27, Decl(generatedContextualTyping.ts, 30, 75))
+class x26 { private member: () => Base[] = function() { return [d1, d2] } }
+>x26 : Symbol(x26, Decl(generatedContextualTyping.ts, 30, 59))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 31, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 31, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x28 { private member: { (): Base[]; } = () => [d1, d2] }
->x28 : Symbol(x28, Decl(generatedContextualTyping.ts, 31, 81))
+class x27 { private member: () => Base[] = function named() { return [d1, d2] } }
+>x27 : Symbol(x27, Decl(generatedContextualTyping.ts, 31, 75))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 32, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 32, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x29 { private member: { (): Base[]; } = function() { return [d1, d2] } }
->x29 : Symbol(x29, Decl(generatedContextualTyping.ts, 32, 62))
+class x28 { private member: { (): Base[]; } = () => [d1, d2] }
+>x28 : Symbol(x28, Decl(generatedContextualTyping.ts, 32, 81))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 33, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x30 { private member: { (): Base[]; } = function named() { return [d1, d2] } }
->x30 : Symbol(x30, Decl(generatedContextualTyping.ts, 33, 78))
+class x29 { private member: { (): Base[]; } = function() { return [d1, d2] } }
+>x29 : Symbol(x29, Decl(generatedContextualTyping.ts, 33, 62))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 34, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 34, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x31 { private member: Base[] = [d1, d2] }
->x31 : Symbol(x31, Decl(generatedContextualTyping.ts, 34, 84))
+class x30 { private member: { (): Base[]; } = function named() { return [d1, d2] } }
+>x30 : Symbol(x30, Decl(generatedContextualTyping.ts, 34, 78))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 35, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 35, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x31 { private member: Base[] = [d1, d2] }
+>x31 : Symbol(x31, Decl(generatedContextualTyping.ts, 35, 84))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 36, 11))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x32 { private member: Array<Base> = [d1, d2] }
->x32 : Symbol(x32, Decl(generatedContextualTyping.ts, 35, 47))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 36, 11))
+>x32 : Symbol(x32, Decl(generatedContextualTyping.ts, 36, 47))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 37, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x33 { private member: { [n: number]: Base; } = [d1, d2] }
->x33 : Symbol(x33, Decl(generatedContextualTyping.ts, 36, 52))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 37, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 37, 31))
+>x33 : Symbol(x33, Decl(generatedContextualTyping.ts, 37, 52))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 38, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 38, 31))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x34 { private member: {n: Base[]; }  = { n: [d1, d2] } }
->x34 : Symbol(x34, Decl(generatedContextualTyping.ts, 37, 63))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 38, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 38, 29))
+>x34 : Symbol(x34, Decl(generatedContextualTyping.ts, 38, 63))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 39, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 29))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 38, 46))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 46))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
->x35 : Symbol(x35, Decl(generatedContextualTyping.ts, 38, 62))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 39, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 39, 29))
+>x35 : Symbol(x35, Decl(generatedContextualTyping.ts, 39, 62))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 40, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 40, 29))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 48), Decl(generatedContextualTyping.ts, 39, 59))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 48), Decl(generatedContextualTyping.ts, 39, 59))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 40, 48), Decl(generatedContextualTyping.ts, 40, 59))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 40, 48), Decl(generatedContextualTyping.ts, 40, 59))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x36 { private member: Genric<Base> = { func: n => { return [d1, d2]; } } }
->x36 : Symbol(x36, Decl(generatedContextualTyping.ts, 39, 87))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 40, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x36 : Symbol(x36, Decl(generatedContextualTyping.ts, 40, 87))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 41, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 40, 44))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 40, 50))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 41, 44))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 41, 50))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x37 { public member: () => Base[] = () => [d1, d2] }
->x37 : Symbol(x37, Decl(generatedContextualTyping.ts, 40, 80))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 41, 11))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x38 { public member: () => Base[] = function() { return [d1, d2] } }
->x38 : Symbol(x38, Decl(generatedContextualTyping.ts, 41, 58))
+>x37 : Symbol(x37, Decl(generatedContextualTyping.ts, 41, 80))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 42, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x39 { public member: () => Base[] = function named() { return [d1, d2] } }
->x39 : Symbol(x39, Decl(generatedContextualTyping.ts, 42, 74))
+class x38 { public member: () => Base[] = function() { return [d1, d2] } }
+>x38 : Symbol(x38, Decl(generatedContextualTyping.ts, 42, 58))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 43, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 43, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x40 { public member: { (): Base[]; } = () => [d1, d2] }
->x40 : Symbol(x40, Decl(generatedContextualTyping.ts, 43, 80))
+class x39 { public member: () => Base[] = function named() { return [d1, d2] } }
+>x39 : Symbol(x39, Decl(generatedContextualTyping.ts, 43, 74))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 44, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 44, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x41 { public member: { (): Base[]; } = function() { return [d1, d2] } }
->x41 : Symbol(x41, Decl(generatedContextualTyping.ts, 44, 61))
+class x40 { public member: { (): Base[]; } = () => [d1, d2] }
+>x40 : Symbol(x40, Decl(generatedContextualTyping.ts, 44, 80))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 45, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x42 { public member: { (): Base[]; } = function named() { return [d1, d2] } }
->x42 : Symbol(x42, Decl(generatedContextualTyping.ts, 45, 77))
+class x41 { public member: { (): Base[]; } = function() { return [d1, d2] } }
+>x41 : Symbol(x41, Decl(generatedContextualTyping.ts, 45, 61))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 46, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 46, 44))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x43 { public member: Base[] = [d1, d2] }
->x43 : Symbol(x43, Decl(generatedContextualTyping.ts, 46, 83))
+class x42 { public member: { (): Base[]; } = function named() { return [d1, d2] } }
+>x42 : Symbol(x42, Decl(generatedContextualTyping.ts, 46, 77))
 >member : Symbol(member, Decl(generatedContextualTyping.ts, 47, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 47, 44))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x43 { public member: Base[] = [d1, d2] }
+>x43 : Symbol(x43, Decl(generatedContextualTyping.ts, 47, 83))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 48, 11))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x44 { public member: Array<Base> = [d1, d2] }
->x44 : Symbol(x44, Decl(generatedContextualTyping.ts, 47, 46))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 48, 11))
+>x44 : Symbol(x44, Decl(generatedContextualTyping.ts, 48, 46))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 49, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x45 { public member: { [n: number]: Base; } = [d1, d2] }
->x45 : Symbol(x45, Decl(generatedContextualTyping.ts, 48, 51))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 49, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 49, 30))
+>x45 : Symbol(x45, Decl(generatedContextualTyping.ts, 49, 51))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 50, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 50, 30))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x46 { public member: {n: Base[]; }  = { n: [d1, d2] } }
->x46 : Symbol(x46, Decl(generatedContextualTyping.ts, 49, 62))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 50, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 50, 28))
+>x46 : Symbol(x46, Decl(generatedContextualTyping.ts, 50, 62))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 51, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 28))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 50, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
->x47 : Symbol(x47, Decl(generatedContextualTyping.ts, 50, 61))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 51, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 51, 28))
+>x47 : Symbol(x47, Decl(generatedContextualTyping.ts, 51, 61))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 52, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 52, 28))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 47), Decl(generatedContextualTyping.ts, 51, 58))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 47), Decl(generatedContextualTyping.ts, 51, 58))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 52, 47), Decl(generatedContextualTyping.ts, 52, 58))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 52, 47), Decl(generatedContextualTyping.ts, 52, 58))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x48 { public member: Genric<Base> = { func: n => { return [d1, d2]; } } }
->x48 : Symbol(x48, Decl(generatedContextualTyping.ts, 51, 86))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 52, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x48 : Symbol(x48, Decl(generatedContextualTyping.ts, 52, 86))
+>member : Symbol(member, Decl(generatedContextualTyping.ts, 53, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 52, 43))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 52, 49))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 53, 43))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 53, 49))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x49 { static member: () => Base[] = () => [d1, d2] }
->x49 : Symbol(x49, Decl(generatedContextualTyping.ts, 52, 79))
->member : Symbol(x49.member, Decl(generatedContextualTyping.ts, 53, 11))
+>x49 : Symbol(x49, Decl(generatedContextualTyping.ts, 53, 79))
+>member : Symbol(x49.member, Decl(generatedContextualTyping.ts, 54, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x50 { static member: () => Base[] = function() { return [d1, d2] } }
->x50 : Symbol(x50, Decl(generatedContextualTyping.ts, 53, 58))
->member : Symbol(x50.member, Decl(generatedContextualTyping.ts, 54, 11))
+>x50 : Symbol(x50, Decl(generatedContextualTyping.ts, 54, 58))
+>member : Symbol(x50.member, Decl(generatedContextualTyping.ts, 55, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x51 { static member: () => Base[] = function named() { return [d1, d2] } }
->x51 : Symbol(x51, Decl(generatedContextualTyping.ts, 54, 74))
->member : Symbol(x51.member, Decl(generatedContextualTyping.ts, 55, 11))
+>x51 : Symbol(x51, Decl(generatedContextualTyping.ts, 55, 74))
+>member : Symbol(x51.member, Decl(generatedContextualTyping.ts, 56, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 55, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 56, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x52 { static member: { (): Base[]; } = () => [d1, d2] }
->x52 : Symbol(x52, Decl(generatedContextualTyping.ts, 55, 80))
->member : Symbol(x52.member, Decl(generatedContextualTyping.ts, 56, 11))
+>x52 : Symbol(x52, Decl(generatedContextualTyping.ts, 56, 80))
+>member : Symbol(x52.member, Decl(generatedContextualTyping.ts, 57, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x53 { static member: { (): Base[]; } = function() { return [d1, d2] } }
->x53 : Symbol(x53, Decl(generatedContextualTyping.ts, 56, 61))
->member : Symbol(x53.member, Decl(generatedContextualTyping.ts, 57, 11))
+>x53 : Symbol(x53, Decl(generatedContextualTyping.ts, 57, 61))
+>member : Symbol(x53.member, Decl(generatedContextualTyping.ts, 58, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x54 { static member: { (): Base[]; } = function named() { return [d1, d2] } }
->x54 : Symbol(x54, Decl(generatedContextualTyping.ts, 57, 77))
->member : Symbol(x54.member, Decl(generatedContextualTyping.ts, 58, 11))
+>x54 : Symbol(x54, Decl(generatedContextualTyping.ts, 58, 77))
+>member : Symbol(x54.member, Decl(generatedContextualTyping.ts, 59, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 58, 44))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 59, 44))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x55 { static member: Base[] = [d1, d2] }
->x55 : Symbol(x55, Decl(generatedContextualTyping.ts, 58, 83))
->member : Symbol(x55.member, Decl(generatedContextualTyping.ts, 59, 11))
+>x55 : Symbol(x55, Decl(generatedContextualTyping.ts, 59, 83))
+>member : Symbol(x55.member, Decl(generatedContextualTyping.ts, 60, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x56 { static member: Array<Base> = [d1, d2] }
->x56 : Symbol(x56, Decl(generatedContextualTyping.ts, 59, 46))
->member : Symbol(x56.member, Decl(generatedContextualTyping.ts, 60, 11))
+>x56 : Symbol(x56, Decl(generatedContextualTyping.ts, 60, 46))
+>member : Symbol(x56.member, Decl(generatedContextualTyping.ts, 61, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x57 { static member: { [n: number]: Base; } = [d1, d2] }
->x57 : Symbol(x57, Decl(generatedContextualTyping.ts, 60, 51))
->member : Symbol(x57.member, Decl(generatedContextualTyping.ts, 61, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 61, 30))
+>x57 : Symbol(x57, Decl(generatedContextualTyping.ts, 61, 51))
+>member : Symbol(x57.member, Decl(generatedContextualTyping.ts, 62, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 62, 30))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x58 { static member: {n: Base[]; }  = { n: [d1, d2] } }
->x58 : Symbol(x58, Decl(generatedContextualTyping.ts, 61, 62))
->member : Symbol(x58.member, Decl(generatedContextualTyping.ts, 62, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 62, 28))
+>x58 : Symbol(x58, Decl(generatedContextualTyping.ts, 62, 62))
+>member : Symbol(x58.member, Decl(generatedContextualTyping.ts, 63, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 63, 28))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 62, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 63, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
->x59 : Symbol(x59, Decl(generatedContextualTyping.ts, 62, 61))
->member : Symbol(x59.member, Decl(generatedContextualTyping.ts, 63, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 63, 28))
+>x59 : Symbol(x59, Decl(generatedContextualTyping.ts, 63, 61))
+>member : Symbol(x59.member, Decl(generatedContextualTyping.ts, 64, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 64, 28))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 63, 47), Decl(generatedContextualTyping.ts, 63, 58))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 63, 47), Decl(generatedContextualTyping.ts, 63, 58))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 64, 47), Decl(generatedContextualTyping.ts, 64, 58))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 64, 47), Decl(generatedContextualTyping.ts, 64, 58))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x60 { static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
->x60 : Symbol(x60, Decl(generatedContextualTyping.ts, 63, 86))
->member : Symbol(x60.member, Decl(generatedContextualTyping.ts, 64, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x60 : Symbol(x60, Decl(generatedContextualTyping.ts, 64, 86))
+>member : Symbol(x60.member, Decl(generatedContextualTyping.ts, 65, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 64, 43))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 64, 49))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 65, 43))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 65, 49))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x61 { private static member: () => Base[] = () => [d1, d2] }
->x61 : Symbol(x61, Decl(generatedContextualTyping.ts, 64, 79))
->member : Symbol(x61.member, Decl(generatedContextualTyping.ts, 65, 11))
+>x61 : Symbol(x61, Decl(generatedContextualTyping.ts, 65, 79))
+>member : Symbol(x61.member, Decl(generatedContextualTyping.ts, 66, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x62 { private static member: () => Base[] = function() { return [d1, d2] } }
->x62 : Symbol(x62, Decl(generatedContextualTyping.ts, 65, 66))
->member : Symbol(x62.member, Decl(generatedContextualTyping.ts, 66, 11))
+>x62 : Symbol(x62, Decl(generatedContextualTyping.ts, 66, 66))
+>member : Symbol(x62.member, Decl(generatedContextualTyping.ts, 67, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x63 { private static member: () => Base[] = function named() { return [d1, d2] } }
->x63 : Symbol(x63, Decl(generatedContextualTyping.ts, 66, 82))
->member : Symbol(x63.member, Decl(generatedContextualTyping.ts, 67, 11))
+>x63 : Symbol(x63, Decl(generatedContextualTyping.ts, 67, 82))
+>member : Symbol(x63.member, Decl(generatedContextualTyping.ts, 68, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 67, 49))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 68, 49))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x64 { private static member: { (): Base[]; } = () => [d1, d2] }
->x64 : Symbol(x64, Decl(generatedContextualTyping.ts, 67, 88))
->member : Symbol(x64.member, Decl(generatedContextualTyping.ts, 68, 11))
+>x64 : Symbol(x64, Decl(generatedContextualTyping.ts, 68, 88))
+>member : Symbol(x64.member, Decl(generatedContextualTyping.ts, 69, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x65 { private static member: { (): Base[]; } = function() { return [d1, d2] } }
->x65 : Symbol(x65, Decl(generatedContextualTyping.ts, 68, 69))
->member : Symbol(x65.member, Decl(generatedContextualTyping.ts, 69, 11))
+>x65 : Symbol(x65, Decl(generatedContextualTyping.ts, 69, 69))
+>member : Symbol(x65.member, Decl(generatedContextualTyping.ts, 70, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x66 { private static member: { (): Base[]; } = function named() { return [d1, d2] } }
->x66 : Symbol(x66, Decl(generatedContextualTyping.ts, 69, 85))
->member : Symbol(x66.member, Decl(generatedContextualTyping.ts, 70, 11))
+>x66 : Symbol(x66, Decl(generatedContextualTyping.ts, 70, 85))
+>member : Symbol(x66.member, Decl(generatedContextualTyping.ts, 71, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 70, 52))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 71, 52))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x67 { private static member: Base[] = [d1, d2] }
->x67 : Symbol(x67, Decl(generatedContextualTyping.ts, 70, 91))
->member : Symbol(x67.member, Decl(generatedContextualTyping.ts, 71, 11))
+>x67 : Symbol(x67, Decl(generatedContextualTyping.ts, 71, 91))
+>member : Symbol(x67.member, Decl(generatedContextualTyping.ts, 72, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x68 { private static member: Array<Base> = [d1, d2] }
->x68 : Symbol(x68, Decl(generatedContextualTyping.ts, 71, 54))
->member : Symbol(x68.member, Decl(generatedContextualTyping.ts, 72, 11))
+>x68 : Symbol(x68, Decl(generatedContextualTyping.ts, 72, 54))
+>member : Symbol(x68.member, Decl(generatedContextualTyping.ts, 73, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x69 { private static member: { [n: number]: Base; } = [d1, d2] }
->x69 : Symbol(x69, Decl(generatedContextualTyping.ts, 72, 59))
->member : Symbol(x69.member, Decl(generatedContextualTyping.ts, 73, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 73, 38))
+>x69 : Symbol(x69, Decl(generatedContextualTyping.ts, 73, 59))
+>member : Symbol(x69.member, Decl(generatedContextualTyping.ts, 74, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 74, 38))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x70 { private static member: {n: Base[]; }  = { n: [d1, d2] } }
->x70 : Symbol(x70, Decl(generatedContextualTyping.ts, 73, 70))
->member : Symbol(x70.member, Decl(generatedContextualTyping.ts, 74, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 74, 36))
+>x70 : Symbol(x70, Decl(generatedContextualTyping.ts, 74, 70))
+>member : Symbol(x70.member, Decl(generatedContextualTyping.ts, 75, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 75, 36))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 74, 53))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 75, 53))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
->x71 : Symbol(x71, Decl(generatedContextualTyping.ts, 74, 69))
->member : Symbol(x71.member, Decl(generatedContextualTyping.ts, 75, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 75, 36))
+>x71 : Symbol(x71, Decl(generatedContextualTyping.ts, 75, 69))
+>member : Symbol(x71.member, Decl(generatedContextualTyping.ts, 76, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 76, 36))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 75, 55), Decl(generatedContextualTyping.ts, 75, 66))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 75, 55), Decl(generatedContextualTyping.ts, 75, 66))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 76, 55), Decl(generatedContextualTyping.ts, 76, 66))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 76, 55), Decl(generatedContextualTyping.ts, 76, 66))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x72 { private static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
->x72 : Symbol(x72, Decl(generatedContextualTyping.ts, 75, 94))
->member : Symbol(x72.member, Decl(generatedContextualTyping.ts, 76, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x72 : Symbol(x72, Decl(generatedContextualTyping.ts, 76, 94))
+>member : Symbol(x72.member, Decl(generatedContextualTyping.ts, 77, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 76, 51))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 76, 57))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 77, 51))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 77, 57))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x73 { public static member: () => Base[] = () => [d1, d2] }
->x73 : Symbol(x73, Decl(generatedContextualTyping.ts, 76, 87))
->member : Symbol(x73.member, Decl(generatedContextualTyping.ts, 77, 11))
+>x73 : Symbol(x73, Decl(generatedContextualTyping.ts, 77, 87))
+>member : Symbol(x73.member, Decl(generatedContextualTyping.ts, 78, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x74 { public static member: () => Base[] = function() { return [d1, d2] } }
->x74 : Symbol(x74, Decl(generatedContextualTyping.ts, 77, 65))
->member : Symbol(x74.member, Decl(generatedContextualTyping.ts, 78, 11))
+>x74 : Symbol(x74, Decl(generatedContextualTyping.ts, 78, 65))
+>member : Symbol(x74.member, Decl(generatedContextualTyping.ts, 79, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x75 { public static member: () => Base[] = function named() { return [d1, d2] } }
->x75 : Symbol(x75, Decl(generatedContextualTyping.ts, 78, 81))
->member : Symbol(x75.member, Decl(generatedContextualTyping.ts, 79, 11))
+>x75 : Symbol(x75, Decl(generatedContextualTyping.ts, 79, 81))
+>member : Symbol(x75.member, Decl(generatedContextualTyping.ts, 80, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 79, 48))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 80, 48))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x76 { public static member: { (): Base[]; } = () => [d1, d2] }
->x76 : Symbol(x76, Decl(generatedContextualTyping.ts, 79, 87))
->member : Symbol(x76.member, Decl(generatedContextualTyping.ts, 80, 11))
+>x76 : Symbol(x76, Decl(generatedContextualTyping.ts, 80, 87))
+>member : Symbol(x76.member, Decl(generatedContextualTyping.ts, 81, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x77 { public static member: { (): Base[]; } = function() { return [d1, d2] } }
->x77 : Symbol(x77, Decl(generatedContextualTyping.ts, 80, 68))
->member : Symbol(x77.member, Decl(generatedContextualTyping.ts, 81, 11))
+>x77 : Symbol(x77, Decl(generatedContextualTyping.ts, 81, 68))
+>member : Symbol(x77.member, Decl(generatedContextualTyping.ts, 82, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x78 { public static member: { (): Base[]; } = function named() { return [d1, d2] } }
->x78 : Symbol(x78, Decl(generatedContextualTyping.ts, 81, 84))
->member : Symbol(x78.member, Decl(generatedContextualTyping.ts, 82, 11))
+>x78 : Symbol(x78, Decl(generatedContextualTyping.ts, 82, 84))
+>member : Symbol(x78.member, Decl(generatedContextualTyping.ts, 83, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 82, 51))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 83, 51))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x79 { public static member: Base[] = [d1, d2] }
->x79 : Symbol(x79, Decl(generatedContextualTyping.ts, 82, 90))
->member : Symbol(x79.member, Decl(generatedContextualTyping.ts, 83, 11))
+>x79 : Symbol(x79, Decl(generatedContextualTyping.ts, 83, 90))
+>member : Symbol(x79.member, Decl(generatedContextualTyping.ts, 84, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x80 { public static member: Array<Base> = [d1, d2] }
->x80 : Symbol(x80, Decl(generatedContextualTyping.ts, 83, 53))
->member : Symbol(x80.member, Decl(generatedContextualTyping.ts, 84, 11))
+>x80 : Symbol(x80, Decl(generatedContextualTyping.ts, 84, 53))
+>member : Symbol(x80.member, Decl(generatedContextualTyping.ts, 85, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x81 { public static member: { [n: number]: Base; } = [d1, d2] }
->x81 : Symbol(x81, Decl(generatedContextualTyping.ts, 84, 58))
->member : Symbol(x81.member, Decl(generatedContextualTyping.ts, 85, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 85, 37))
+>x81 : Symbol(x81, Decl(generatedContextualTyping.ts, 85, 58))
+>member : Symbol(x81.member, Decl(generatedContextualTyping.ts, 86, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 86, 37))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x82 { public static member: {n: Base[]; }  = { n: [d1, d2] } }
->x82 : Symbol(x82, Decl(generatedContextualTyping.ts, 85, 69))
->member : Symbol(x82.member, Decl(generatedContextualTyping.ts, 86, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 86, 35))
+>x82 : Symbol(x82, Decl(generatedContextualTyping.ts, 86, 69))
+>member : Symbol(x82.member, Decl(generatedContextualTyping.ts, 87, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 87, 35))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 86, 52))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 87, 52))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
->x83 : Symbol(x83, Decl(generatedContextualTyping.ts, 86, 68))
->member : Symbol(x83.member, Decl(generatedContextualTyping.ts, 87, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 87, 35))
+>x83 : Symbol(x83, Decl(generatedContextualTyping.ts, 87, 68))
+>member : Symbol(x83.member, Decl(generatedContextualTyping.ts, 88, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 88, 35))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 87, 54), Decl(generatedContextualTyping.ts, 87, 65))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 87, 54), Decl(generatedContextualTyping.ts, 87, 65))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 88, 54), Decl(generatedContextualTyping.ts, 88, 65))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 88, 54), Decl(generatedContextualTyping.ts, 88, 65))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x84 { public static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
->x84 : Symbol(x84, Decl(generatedContextualTyping.ts, 87, 93))
->member : Symbol(x84.member, Decl(generatedContextualTyping.ts, 88, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x84 : Symbol(x84, Decl(generatedContextualTyping.ts, 88, 93))
+>member : Symbol(x84.member, Decl(generatedContextualTyping.ts, 89, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 88, 50))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 88, 56))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 89, 50))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 89, 56))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x85 { constructor(parm: () => Base[] = () => [d1, d2]) { } }
->x85 : Symbol(x85, Decl(generatedContextualTyping.ts, 88, 86))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 89, 24))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { } }
->x86 : Symbol(x86, Decl(generatedContextualTyping.ts, 89, 66))
+>x85 : Symbol(x85, Decl(generatedContextualTyping.ts, 89, 86))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 90, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2] }) { } }
->x87 : Symbol(x87, Decl(generatedContextualTyping.ts, 90, 82))
+class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { } }
+>x86 : Symbol(x86, Decl(generatedContextualTyping.ts, 90, 66))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 91, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 91, 44))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x88 { constructor(parm: { (): Base[]; } = () => [d1, d2]) { } }
->x88 : Symbol(x88, Decl(generatedContextualTyping.ts, 91, 88))
+class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2] }) { } }
+>x87 : Symbol(x87, Decl(generatedContextualTyping.ts, 91, 82))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 92, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 92, 44))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x89 { constructor(parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
->x89 : Symbol(x89, Decl(generatedContextualTyping.ts, 92, 69))
+class x88 { constructor(parm: { (): Base[]; } = () => [d1, d2]) { } }
+>x88 : Symbol(x88, Decl(generatedContextualTyping.ts, 92, 88))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 93, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x90 { constructor(parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
->x90 : Symbol(x90, Decl(generatedContextualTyping.ts, 93, 85))
+class x89 { constructor(parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
+>x89 : Symbol(x89, Decl(generatedContextualTyping.ts, 93, 69))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 94, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 94, 47))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x91 { constructor(parm: Base[] = [d1, d2]) { } }
->x91 : Symbol(x91, Decl(generatedContextualTyping.ts, 94, 91))
+class x90 { constructor(parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
+>x90 : Symbol(x90, Decl(generatedContextualTyping.ts, 94, 85))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 95, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 95, 47))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x91 { constructor(parm: Base[] = [d1, d2]) { } }
+>x91 : Symbol(x91, Decl(generatedContextualTyping.ts, 95, 91))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 96, 24))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x92 { constructor(parm: Array<Base> = [d1, d2]) { } }
->x92 : Symbol(x92, Decl(generatedContextualTyping.ts, 95, 54))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 96, 24))
+>x92 : Symbol(x92, Decl(generatedContextualTyping.ts, 96, 54))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 97, 24))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x93 { constructor(parm: { [n: number]: Base; } = [d1, d2]) { } }
->x93 : Symbol(x93, Decl(generatedContextualTyping.ts, 96, 59))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 97, 24))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 97, 33))
+>x93 : Symbol(x93, Decl(generatedContextualTyping.ts, 97, 59))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 98, 24))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 98, 33))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x94 { constructor(parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
->x94 : Symbol(x94, Decl(generatedContextualTyping.ts, 97, 70))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 98, 24))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 98, 31))
+>x94 : Symbol(x94, Decl(generatedContextualTyping.ts, 98, 70))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 99, 24))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 99, 31))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 98, 48))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 99, 48))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } }
->x95 : Symbol(x95, Decl(generatedContextualTyping.ts, 98, 69))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 99, 24))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 99, 31))
+>x95 : Symbol(x95, Decl(generatedContextualTyping.ts, 99, 69))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 100, 24))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 100, 31))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 99, 50), Decl(generatedContextualTyping.ts, 99, 61))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 99, 50), Decl(generatedContextualTyping.ts, 99, 61))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 100, 50), Decl(generatedContextualTyping.ts, 100, 61))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 100, 50), Decl(generatedContextualTyping.ts, 100, 61))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x96 { constructor(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
->x96 : Symbol(x96, Decl(generatedContextualTyping.ts, 99, 94))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 100, 24))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x96 : Symbol(x96, Decl(generatedContextualTyping.ts, 100, 94))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 101, 24))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 100, 46))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 100, 52))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 101, 46))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 101, 52))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } }
->x97 : Symbol(x97, Decl(generatedContextualTyping.ts, 100, 87))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 101, 24))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } }
->x98 : Symbol(x98, Decl(generatedContextualTyping.ts, 101, 73))
+>x97 : Symbol(x97, Decl(generatedContextualTyping.ts, 101, 87))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 102, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } }
->x99 : Symbol(x99, Decl(generatedContextualTyping.ts, 102, 89))
+class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } }
+>x98 : Symbol(x98, Decl(generatedContextualTyping.ts, 102, 73))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 103, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 103, 51))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } }
+>x99 : Symbol(x99, Decl(generatedContextualTyping.ts, 103, 89))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 104, 24))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 104, 51))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x100 { constructor(public parm: { (): Base[]; } = () => [d1, d2]) { } }
->x100 : Symbol(x100, Decl(generatedContextualTyping.ts, 103, 95))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 104, 25))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x101 { constructor(public parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
->x101 : Symbol(x101, Decl(generatedContextualTyping.ts, 104, 77))
+>x100 : Symbol(x100, Decl(generatedContextualTyping.ts, 104, 95))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 105, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x102 { constructor(public parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
->x102 : Symbol(x102, Decl(generatedContextualTyping.ts, 105, 93))
+class x101 { constructor(public parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
+>x101 : Symbol(x101, Decl(generatedContextualTyping.ts, 105, 77))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 106, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 106, 55))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
->x103 : Symbol(x103, Decl(generatedContextualTyping.ts, 106, 99))
+class x102 { constructor(public parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
+>x102 : Symbol(x102, Decl(generatedContextualTyping.ts, 106, 93))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 107, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 107, 55))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
+>x103 : Symbol(x103, Decl(generatedContextualTyping.ts, 107, 99))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 108, 25))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
->x104 : Symbol(x104, Decl(generatedContextualTyping.ts, 107, 62))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 108, 25))
+>x104 : Symbol(x104, Decl(generatedContextualTyping.ts, 108, 62))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 109, 25))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } }
->x105 : Symbol(x105, Decl(generatedContextualTyping.ts, 108, 67))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 109, 25))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 109, 41))
+>x105 : Symbol(x105, Decl(generatedContextualTyping.ts, 109, 67))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 110, 25))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 110, 41))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x106 { constructor(public parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
->x106 : Symbol(x106, Decl(generatedContextualTyping.ts, 109, 78))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 110, 25))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 110, 39))
+>x106 : Symbol(x106, Decl(generatedContextualTyping.ts, 110, 78))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 111, 25))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 39))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 110, 56))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 56))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } }
->x107 : Symbol(x107, Decl(generatedContextualTyping.ts, 110, 77))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 111, 25))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 111, 39))
+>x107 : Symbol(x107, Decl(generatedContextualTyping.ts, 111, 77))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 112, 25))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 112, 39))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 58), Decl(generatedContextualTyping.ts, 111, 69))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 58), Decl(generatedContextualTyping.ts, 111, 69))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 112, 58), Decl(generatedContextualTyping.ts, 112, 69))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 112, 58), Decl(generatedContextualTyping.ts, 112, 69))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x108 { constructor(public parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
->x108 : Symbol(x108, Decl(generatedContextualTyping.ts, 111, 102))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 112, 25))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x108 : Symbol(x108, Decl(generatedContextualTyping.ts, 112, 102))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 113, 25))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 112, 54))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 112, 60))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 113, 54))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 113, 60))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } }
->x109 : Symbol(x109, Decl(generatedContextualTyping.ts, 112, 95))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 113, 25))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } }
->x110 : Symbol(x110, Decl(generatedContextualTyping.ts, 113, 75))
+>x109 : Symbol(x109, Decl(generatedContextualTyping.ts, 113, 95))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 114, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } }
->x111 : Symbol(x111, Decl(generatedContextualTyping.ts, 114, 91))
+class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } }
+>x110 : Symbol(x110, Decl(generatedContextualTyping.ts, 114, 75))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 115, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 115, 53))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x112 { constructor(private parm: { (): Base[]; } = () => [d1, d2]) { } }
->x112 : Symbol(x112, Decl(generatedContextualTyping.ts, 115, 97))
+class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } }
+>x111 : Symbol(x111, Decl(generatedContextualTyping.ts, 115, 91))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 116, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 116, 53))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x113 { constructor(private parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
->x113 : Symbol(x113, Decl(generatedContextualTyping.ts, 116, 78))
+class x112 { constructor(private parm: { (): Base[]; } = () => [d1, d2]) { } }
+>x112 : Symbol(x112, Decl(generatedContextualTyping.ts, 116, 97))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 117, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x114 { constructor(private parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
->x114 : Symbol(x114, Decl(generatedContextualTyping.ts, 117, 94))
+class x113 { constructor(private parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
+>x113 : Symbol(x113, Decl(generatedContextualTyping.ts, 117, 78))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 118, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 118, 56))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
->x115 : Symbol(x115, Decl(generatedContextualTyping.ts, 118, 100))
+class x114 { constructor(private parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
+>x114 : Symbol(x114, Decl(generatedContextualTyping.ts, 118, 94))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 119, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 119, 56))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
+>x115 : Symbol(x115, Decl(generatedContextualTyping.ts, 119, 100))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 120, 25))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
->x116 : Symbol(x116, Decl(generatedContextualTyping.ts, 119, 63))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 120, 25))
+>x116 : Symbol(x116, Decl(generatedContextualTyping.ts, 120, 63))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 121, 25))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } }
->x117 : Symbol(x117, Decl(generatedContextualTyping.ts, 120, 68))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 121, 25))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 121, 42))
+>x117 : Symbol(x117, Decl(generatedContextualTyping.ts, 121, 68))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 122, 25))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 122, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x118 { constructor(private parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
->x118 : Symbol(x118, Decl(generatedContextualTyping.ts, 121, 79))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 122, 25))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 122, 40))
+>x118 : Symbol(x118, Decl(generatedContextualTyping.ts, 122, 79))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 123, 25))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 40))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 122, 57))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 57))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } }
->x119 : Symbol(x119, Decl(generatedContextualTyping.ts, 122, 78))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 123, 25))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 123, 40))
+>x119 : Symbol(x119, Decl(generatedContextualTyping.ts, 123, 78))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 124, 25))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 124, 40))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 59), Decl(generatedContextualTyping.ts, 123, 70))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 59), Decl(generatedContextualTyping.ts, 123, 70))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 124, 59), Decl(generatedContextualTyping.ts, 124, 70))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 124, 59), Decl(generatedContextualTyping.ts, 124, 70))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
->x120 : Symbol(x120, Decl(generatedContextualTyping.ts, 123, 103))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 124, 25))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x120 : Symbol(x120, Decl(generatedContextualTyping.ts, 124, 103))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 125, 25))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 124, 55))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 124, 61))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 125, 55))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 125, 61))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x121(parm: () => Base[] = () => [d1, d2]) { }
->x121 : Symbol(x121, Decl(generatedContextualTyping.ts, 124, 96))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 125, 14))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
->x122 : Symbol(x122, Decl(generatedContextualTyping.ts, 125, 54))
+>x121 : Symbol(x121, Decl(generatedContextualTyping.ts, 125, 96))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 126, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
->x123 : Symbol(x123, Decl(generatedContextualTyping.ts, 126, 70))
+function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
+>x122 : Symbol(x122, Decl(generatedContextualTyping.ts, 126, 54))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 127, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 127, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
->x124 : Symbol(x124, Decl(generatedContextualTyping.ts, 127, 76))
+function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
+>x123 : Symbol(x123, Decl(generatedContextualTyping.ts, 127, 70))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 128, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 128, 34))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
->x125 : Symbol(x125, Decl(generatedContextualTyping.ts, 128, 57))
+function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
+>x124 : Symbol(x124, Decl(generatedContextualTyping.ts, 128, 76))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 129, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
->x126 : Symbol(x126, Decl(generatedContextualTyping.ts, 129, 73))
+function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
+>x125 : Symbol(x125, Decl(generatedContextualTyping.ts, 129, 57))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 130, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 130, 37))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x127(parm: Base[] = [d1, d2]) { }
->x127 : Symbol(x127, Decl(generatedContextualTyping.ts, 130, 79))
+function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
+>x126 : Symbol(x126, Decl(generatedContextualTyping.ts, 130, 73))
 >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 131, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 131, 37))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+function x127(parm: Base[] = [d1, d2]) { }
+>x127 : Symbol(x127, Decl(generatedContextualTyping.ts, 131, 79))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 132, 14))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x128(parm: Array<Base> = [d1, d2]) { }
->x128 : Symbol(x128, Decl(generatedContextualTyping.ts, 131, 42))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 132, 14))
+>x128 : Symbol(x128, Decl(generatedContextualTyping.ts, 132, 42))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 133, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
->x129 : Symbol(x129, Decl(generatedContextualTyping.ts, 132, 47))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 133, 14))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 133, 23))
+>x129 : Symbol(x129, Decl(generatedContextualTyping.ts, 133, 47))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 134, 14))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 134, 23))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x130(parm: {n: Base[]; }  = { n: [d1, d2] }) { }
->x130 : Symbol(x130, Decl(generatedContextualTyping.ts, 133, 58))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 134, 14))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 134, 21))
+>x130 : Symbol(x130, Decl(generatedContextualTyping.ts, 134, 58))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 135, 14))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 135, 21))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 134, 38))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 135, 38))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { }
->x131 : Symbol(x131, Decl(generatedContextualTyping.ts, 134, 57))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 135, 14))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 135, 21))
+>x131 : Symbol(x131, Decl(generatedContextualTyping.ts, 135, 57))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 136, 14))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 136, 21))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 135, 40), Decl(generatedContextualTyping.ts, 135, 51))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 135, 40), Decl(generatedContextualTyping.ts, 135, 51))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 136, 40), Decl(generatedContextualTyping.ts, 136, 51))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 136, 40), Decl(generatedContextualTyping.ts, 136, 51))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
->x132 : Symbol(x132, Decl(generatedContextualTyping.ts, 135, 82))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 136, 14))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x132 : Symbol(x132, Decl(generatedContextualTyping.ts, 136, 82))
+>parm : Symbol(parm, Decl(generatedContextualTyping.ts, 137, 14))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 136, 36))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 136, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 137, 36))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 137, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x133(): () => Base[] { return () => [d1, d2]; }
->x133 : Symbol(x133, Decl(generatedContextualTyping.ts, 136, 75))
+>x133 : Symbol(x133, Decl(generatedContextualTyping.ts, 137, 75))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x134(): () => Base[] { return function() { return [d1, d2] }; }
->x134 : Symbol(x134, Decl(generatedContextualTyping.ts, 137, 56))
+>x134 : Symbol(x134, Decl(generatedContextualTyping.ts, 138, 56))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x135(): () => Base[] { return function named() { return [d1, d2] }; }
->x135 : Symbol(x135, Decl(generatedContextualTyping.ts, 138, 72))
+>x135 : Symbol(x135, Decl(generatedContextualTyping.ts, 139, 72))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 139, 38))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 140, 38))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x136(): { (): Base[]; } { return () => [d1, d2]; }
->x136 : Symbol(x136, Decl(generatedContextualTyping.ts, 139, 78))
+>x136 : Symbol(x136, Decl(generatedContextualTyping.ts, 140, 78))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
->x137 : Symbol(x137, Decl(generatedContextualTyping.ts, 140, 59))
+>x137 : Symbol(x137, Decl(generatedContextualTyping.ts, 141, 59))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x138(): { (): Base[]; } { return function named() { return [d1, d2] }; }
->x138 : Symbol(x138, Decl(generatedContextualTyping.ts, 141, 75))
+>x138 : Symbol(x138, Decl(generatedContextualTyping.ts, 142, 75))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 142, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 143, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x139(): Base[] { return [d1, d2]; }
->x139 : Symbol(x139, Decl(generatedContextualTyping.ts, 142, 81))
+>x139 : Symbol(x139, Decl(generatedContextualTyping.ts, 143, 81))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x140(): Array<Base> { return [d1, d2]; }
->x140 : Symbol(x140, Decl(generatedContextualTyping.ts, 143, 44))
+>x140 : Symbol(x140, Decl(generatedContextualTyping.ts, 144, 44))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x141(): { [n: number]: Base; } { return [d1, d2]; }
->x141 : Symbol(x141, Decl(generatedContextualTyping.ts, 144, 49))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 145, 20))
+>x141 : Symbol(x141, Decl(generatedContextualTyping.ts, 145, 49))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 146, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
->x142 : Symbol(x142, Decl(generatedContextualTyping.ts, 145, 60))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 146, 18))
+>x142 : Symbol(x142, Decl(generatedContextualTyping.ts, 146, 60))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 147, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 146, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 147, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; }
->x143 : Symbol(x143, Decl(generatedContextualTyping.ts, 146, 59))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 147, 18))
+>x143 : Symbol(x143, Decl(generatedContextualTyping.ts, 147, 59))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 148, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 147, 44), Decl(generatedContextualTyping.ts, 147, 55))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 147, 44), Decl(generatedContextualTyping.ts, 147, 55))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 148, 44), Decl(generatedContextualTyping.ts, 148, 55))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 148, 44), Decl(generatedContextualTyping.ts, 148, 55))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
->x144 : Symbol(x144, Decl(generatedContextualTyping.ts, 147, 84))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x144 : Symbol(x144, Decl(generatedContextualTyping.ts, 148, 84))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 148, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 148, 46))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 149, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 149, 46))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
->x145 : Symbol(x145, Decl(generatedContextualTyping.ts, 148, 77))
+>x145 : Symbol(x145, Decl(generatedContextualTyping.ts, 149, 77))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
->x146 : Symbol(x146, Decl(generatedContextualTyping.ts, 149, 79))
+>x146 : Symbol(x146, Decl(generatedContextualTyping.ts, 150, 79))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
->x147 : Symbol(x147, Decl(generatedContextualTyping.ts, 150, 111))
+>x147 : Symbol(x147, Decl(generatedContextualTyping.ts, 151, 111))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 151, 38))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 151, 83))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 152, 38))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 152, 83))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2]; }
->x148 : Symbol(x148, Decl(generatedContextualTyping.ts, 151, 123))
+>x148 : Symbol(x148, Decl(generatedContextualTyping.ts, 152, 123))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
->x149 : Symbol(x149, Decl(generatedContextualTyping.ts, 152, 82))
+>x149 : Symbol(x149, Decl(generatedContextualTyping.ts, 153, 82))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x150(): { (): Base[]; } { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
->x150 : Symbol(x150, Decl(generatedContextualTyping.ts, 153, 114))
+>x150 : Symbol(x150, Decl(generatedContextualTyping.ts, 154, 114))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 154, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 154, 86))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 155, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 155, 86))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
->x151 : Symbol(x151, Decl(generatedContextualTyping.ts, 154, 126))
+>x151 : Symbol(x151, Decl(generatedContextualTyping.ts, 155, 126))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
->x152 : Symbol(x152, Decl(generatedContextualTyping.ts, 155, 61))
+>x152 : Symbol(x152, Decl(generatedContextualTyping.ts, 156, 61))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
->x153 : Symbol(x153, Decl(generatedContextualTyping.ts, 156, 66))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 157, 20))
+>x153 : Symbol(x153, Decl(generatedContextualTyping.ts, 157, 66))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 158, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }; }
->x154 : Symbol(x154, Decl(generatedContextualTyping.ts, 157, 77))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 158, 18))
+>x154 : Symbol(x154, Decl(generatedContextualTyping.ts, 158, 77))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 158, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 158, 66))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 66))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; }
->x155 : Symbol(x155, Decl(generatedContextualTyping.ts, 158, 83))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 159, 18))
+>x155 : Symbol(x155, Decl(generatedContextualTyping.ts, 159, 83))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 160, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 44), Decl(generatedContextualTyping.ts, 159, 55))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 44), Decl(generatedContextualTyping.ts, 159, 55))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 44), Decl(generatedContextualTyping.ts, 160, 55))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 44), Decl(generatedContextualTyping.ts, 160, 55))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 89), Decl(generatedContextualTyping.ts, 159, 100))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 89), Decl(generatedContextualTyping.ts, 159, 100))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 89), Decl(generatedContextualTyping.ts, 160, 100))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 89), Decl(generatedContextualTyping.ts, 160, 100))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 function x156(): Genric<Base> { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; }
->x156 : Symbol(x156, Decl(generatedContextualTyping.ts, 159, 129))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x156 : Symbol(x156, Decl(generatedContextualTyping.ts, 160, 129))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 160, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 46))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 160, 84))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 90))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 161, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 161, 46))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 161, 84))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 161, 90))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x157: () => () => Base[] = () => { return () => [d1, d2]; };
->x157 : Symbol(x157, Decl(generatedContextualTyping.ts, 161, 3))
+>x157 : Symbol(x157, Decl(generatedContextualTyping.ts, 162, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x158: () => () => Base[] = () => { return function() { return [d1, d2] }; };
->x158 : Symbol(x158, Decl(generatedContextualTyping.ts, 162, 3))
+>x158 : Symbol(x158, Decl(generatedContextualTyping.ts, 163, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x159: () => () => Base[] = () => { return function named() { return [d1, d2] }; };
->x159 : Symbol(x159, Decl(generatedContextualTyping.ts, 163, 3))
+>x159 : Symbol(x159, Decl(generatedContextualTyping.ts, 164, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 163, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 164, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x160: () => { (): Base[]; } = () => { return () => [d1, d2]; };
->x160 : Symbol(x160, Decl(generatedContextualTyping.ts, 164, 3))
+>x160 : Symbol(x160, Decl(generatedContextualTyping.ts, 165, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x161: () => { (): Base[]; } = () => { return function() { return [d1, d2] }; };
->x161 : Symbol(x161, Decl(generatedContextualTyping.ts, 165, 3))
+>x161 : Symbol(x161, Decl(generatedContextualTyping.ts, 166, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x162: () => { (): Base[]; } = () => { return function named() { return [d1, d2] }; };
->x162 : Symbol(x162, Decl(generatedContextualTyping.ts, 166, 3))
+>x162 : Symbol(x162, Decl(generatedContextualTyping.ts, 167, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 166, 48))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 167, 48))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x163: () => Base[] = () => { return [d1, d2]; };
->x163 : Symbol(x163, Decl(generatedContextualTyping.ts, 167, 3))
+>x163 : Symbol(x163, Decl(generatedContextualTyping.ts, 168, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x164: () => Array<Base> = () => { return [d1, d2]; };
->x164 : Symbol(x164, Decl(generatedContextualTyping.ts, 168, 3))
+>x164 : Symbol(x164, Decl(generatedContextualTyping.ts, 169, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; };
->x165 : Symbol(x165, Decl(generatedContextualTyping.ts, 169, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 169, 19))
+>x165 : Symbol(x165, Decl(generatedContextualTyping.ts, 170, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 170, 19))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x166: () => {n: Base[]; }  = () => { return { n: [d1, d2] }; };
->x166 : Symbol(x166, Decl(generatedContextualTyping.ts, 170, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 170, 17))
+>x166 : Symbol(x166, Decl(generatedContextualTyping.ts, 171, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 171, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 170, 49))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 171, 49))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return null; }; };
->x167 : Symbol(x167, Decl(generatedContextualTyping.ts, 171, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 171, 17))
+>x167 : Symbol(x167, Decl(generatedContextualTyping.ts, 172, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 172, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 171, 51), Decl(generatedContextualTyping.ts, 171, 62))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 171, 51), Decl(generatedContextualTyping.ts, 171, 62))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 172, 51), Decl(generatedContextualTyping.ts, 172, 62))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 172, 51), Decl(generatedContextualTyping.ts, 172, 62))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x168: () => Genric<Base> = () => { return { func: n => { return [d1, d2]; } }; };
->x168 : Symbol(x168, Decl(generatedContextualTyping.ts, 172, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x168 : Symbol(x168, Decl(generatedContextualTyping.ts, 173, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 172, 47))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 172, 53))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 173, 47))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 173, 53))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x169: () => () => Base[] = function() { return () => [d1, d2]; };
->x169 : Symbol(x169, Decl(generatedContextualTyping.ts, 173, 3))
+>x169 : Symbol(x169, Decl(generatedContextualTyping.ts, 174, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x170: () => () => Base[] = function() { return function() { return [d1, d2] }; };
->x170 : Symbol(x170, Decl(generatedContextualTyping.ts, 174, 3))
+>x170 : Symbol(x170, Decl(generatedContextualTyping.ts, 175, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x171: () => () => Base[] = function() { return function named() { return [d1, d2] }; };
->x171 : Symbol(x171, Decl(generatedContextualTyping.ts, 175, 3))
+>x171 : Symbol(x171, Decl(generatedContextualTyping.ts, 176, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 175, 50))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 176, 50))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x172: () => { (): Base[]; } = function() { return () => [d1, d2]; };
->x172 : Symbol(x172, Decl(generatedContextualTyping.ts, 176, 3))
+>x172 : Symbol(x172, Decl(generatedContextualTyping.ts, 177, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x173: () => { (): Base[]; } = function() { return function() { return [d1, d2] }; };
->x173 : Symbol(x173, Decl(generatedContextualTyping.ts, 177, 3))
+>x173 : Symbol(x173, Decl(generatedContextualTyping.ts, 178, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x174: () => { (): Base[]; } = function() { return function named() { return [d1, d2] }; };
->x174 : Symbol(x174, Decl(generatedContextualTyping.ts, 178, 3))
+>x174 : Symbol(x174, Decl(generatedContextualTyping.ts, 179, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 178, 53))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 179, 53))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x175: () => Base[] = function() { return [d1, d2]; };
->x175 : Symbol(x175, Decl(generatedContextualTyping.ts, 179, 3))
+>x175 : Symbol(x175, Decl(generatedContextualTyping.ts, 180, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x176: () => Array<Base> = function() { return [d1, d2]; };
->x176 : Symbol(x176, Decl(generatedContextualTyping.ts, 180, 3))
+>x176 : Symbol(x176, Decl(generatedContextualTyping.ts, 181, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; };
->x177 : Symbol(x177, Decl(generatedContextualTyping.ts, 181, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 181, 19))
+>x177 : Symbol(x177, Decl(generatedContextualTyping.ts, 182, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 182, 19))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x178: () => {n: Base[]; }  = function() { return { n: [d1, d2] }; };
->x178 : Symbol(x178, Decl(generatedContextualTyping.ts, 182, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 182, 17))
+>x178 : Symbol(x178, Decl(generatedContextualTyping.ts, 183, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 183, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 182, 54))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 183, 54))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; };
->x179 : Symbol(x179, Decl(generatedContextualTyping.ts, 183, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 183, 17))
+>x179 : Symbol(x179, Decl(generatedContextualTyping.ts, 184, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 184, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 183, 56), Decl(generatedContextualTyping.ts, 183, 67))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 183, 56), Decl(generatedContextualTyping.ts, 183, 67))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 184, 56), Decl(generatedContextualTyping.ts, 184, 67))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 184, 56), Decl(generatedContextualTyping.ts, 184, 67))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x180: () => Genric<Base> = function() { return { func: n => { return [d1, d2]; } }; };
->x180 : Symbol(x180, Decl(generatedContextualTyping.ts, 184, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x180 : Symbol(x180, Decl(generatedContextualTyping.ts, 185, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 184, 52))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 184, 58))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 185, 52))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 185, 58))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x181 { var t: () => Base[] = () => [d1, d2]; }
->x181 : Symbol(x181, Decl(generatedContextualTyping.ts, 184, 90))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 185, 17))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
->x182 : Symbol(x182, Decl(generatedContextualTyping.ts, 185, 53))
+>x181 : Symbol(x181, Decl(generatedContextualTyping.ts, 185, 90))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 186, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
->x183 : Symbol(x183, Decl(generatedContextualTyping.ts, 186, 69))
+module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
+>x182 : Symbol(x182, Decl(generatedContextualTyping.ts, 186, 53))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 187, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 187, 35))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
->x184 : Symbol(x184, Decl(generatedContextualTyping.ts, 187, 75))
+module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
+>x183 : Symbol(x183, Decl(generatedContextualTyping.ts, 187, 69))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 188, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 188, 35))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
->x185 : Symbol(x185, Decl(generatedContextualTyping.ts, 188, 56))
+module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
+>x184 : Symbol(x184, Decl(generatedContextualTyping.ts, 188, 75))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 189, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
->x186 : Symbol(x186, Decl(generatedContextualTyping.ts, 189, 72))
+module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
+>x185 : Symbol(x185, Decl(generatedContextualTyping.ts, 189, 56))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 190, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 190, 38))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x187 { var t: Base[] = [d1, d2]; }
->x187 : Symbol(x187, Decl(generatedContextualTyping.ts, 190, 78))
+module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
+>x186 : Symbol(x186, Decl(generatedContextualTyping.ts, 190, 72))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 191, 17))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 191, 38))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+module x187 { var t: Base[] = [d1, d2]; }
+>x187 : Symbol(x187, Decl(generatedContextualTyping.ts, 191, 78))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 192, 17))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x188 { var t: Array<Base> = [d1, d2]; }
->x188 : Symbol(x188, Decl(generatedContextualTyping.ts, 191, 41))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 192, 17))
+>x188 : Symbol(x188, Decl(generatedContextualTyping.ts, 192, 41))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 193, 17))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x189 { var t: { [n: number]: Base; } = [d1, d2]; }
->x189 : Symbol(x189, Decl(generatedContextualTyping.ts, 192, 46))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 193, 17))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 193, 24))
+>x189 : Symbol(x189, Decl(generatedContextualTyping.ts, 193, 46))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 194, 17))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x190 { var t: {n: Base[]; }  = { n: [d1, d2] }; }
->x190 : Symbol(x190, Decl(generatedContextualTyping.ts, 193, 57))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 194, 17))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 22))
+>x190 : Symbol(x190, Decl(generatedContextualTyping.ts, 194, 57))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 195, 17))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 22))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 39))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 39))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; }
->x191 : Symbol(x191, Decl(generatedContextualTyping.ts, 194, 56))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 195, 17))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 195, 22))
+>x191 : Symbol(x191, Decl(generatedContextualTyping.ts, 195, 56))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 196, 17))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 196, 22))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 41), Decl(generatedContextualTyping.ts, 195, 52))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 41), Decl(generatedContextualTyping.ts, 195, 52))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 196, 41), Decl(generatedContextualTyping.ts, 196, 52))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 196, 41), Decl(generatedContextualTyping.ts, 196, 52))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
->x192 : Symbol(x192, Decl(generatedContextualTyping.ts, 195, 81))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 196, 17))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x192 : Symbol(x192, Decl(generatedContextualTyping.ts, 196, 81))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 197, 17))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 196, 37))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 196, 43))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 197, 37))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 197, 43))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x193 { export var t: () => Base[] = () => [d1, d2]; }
->x193 : Symbol(x193, Decl(generatedContextualTyping.ts, 196, 74))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 197, 24))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
->x194 : Symbol(x194, Decl(generatedContextualTyping.ts, 197, 60))
+>x193 : Symbol(x193, Decl(generatedContextualTyping.ts, 197, 74))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 198, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; }
->x195 : Symbol(x195, Decl(generatedContextualTyping.ts, 198, 76))
+module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
+>x194 : Symbol(x194, Decl(generatedContextualTyping.ts, 198, 60))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 199, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 199, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
->x196 : Symbol(x196, Decl(generatedContextualTyping.ts, 199, 82))
+module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; }
+>x195 : Symbol(x195, Decl(generatedContextualTyping.ts, 199, 76))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 200, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 200, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
->x197 : Symbol(x197, Decl(generatedContextualTyping.ts, 200, 63))
+module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
+>x196 : Symbol(x196, Decl(generatedContextualTyping.ts, 200, 82))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 201, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; }
->x198 : Symbol(x198, Decl(generatedContextualTyping.ts, 201, 79))
+module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
+>x197 : Symbol(x197, Decl(generatedContextualTyping.ts, 201, 63))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 202, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 202, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-module x199 { export var t: Base[] = [d1, d2]; }
->x199 : Symbol(x199, Decl(generatedContextualTyping.ts, 202, 85))
+module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; }
+>x198 : Symbol(x198, Decl(generatedContextualTyping.ts, 202, 79))
 >t : Symbol(t, Decl(generatedContextualTyping.ts, 203, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 203, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+module x199 { export var t: Base[] = [d1, d2]; }
+>x199 : Symbol(x199, Decl(generatedContextualTyping.ts, 203, 85))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 204, 24))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x200 { export var t: Array<Base> = [d1, d2]; }
->x200 : Symbol(x200, Decl(generatedContextualTyping.ts, 203, 48))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 204, 24))
+>x200 : Symbol(x200, Decl(generatedContextualTyping.ts, 204, 48))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 205, 24))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x201 { export var t: { [n: number]: Base; } = [d1, d2]; }
->x201 : Symbol(x201, Decl(generatedContextualTyping.ts, 204, 53))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 205, 24))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 205, 31))
+>x201 : Symbol(x201, Decl(generatedContextualTyping.ts, 205, 53))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 206, 24))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 31))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x202 { export var t: {n: Base[]; }  = { n: [d1, d2] }; }
->x202 : Symbol(x202, Decl(generatedContextualTyping.ts, 205, 64))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 206, 24))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 29))
+>x202 : Symbol(x202, Decl(generatedContextualTyping.ts, 206, 64))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 207, 24))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 29))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 46))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 46))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; }
->x203 : Symbol(x203, Decl(generatedContextualTyping.ts, 206, 63))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 207, 24))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 207, 29))
+>x203 : Symbol(x203, Decl(generatedContextualTyping.ts, 207, 63))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 208, 24))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 208, 29))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 48), Decl(generatedContextualTyping.ts, 207, 59))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 48), Decl(generatedContextualTyping.ts, 207, 59))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 208, 48), Decl(generatedContextualTyping.ts, 208, 59))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 208, 48), Decl(generatedContextualTyping.ts, 208, 59))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 module x204 { export var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
->x204 : Symbol(x204, Decl(generatedContextualTyping.ts, 207, 88))
->t : Symbol(t, Decl(generatedContextualTyping.ts, 208, 24))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x204 : Symbol(x204, Decl(generatedContextualTyping.ts, 208, 88))
+>t : Symbol(t, Decl(generatedContextualTyping.ts, 209, 24))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 208, 44))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 208, 50))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 209, 44))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 209, 50))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x206 = <() => Base[]>function() { return [d1, d2] };
->x206 : Symbol(x206, Decl(generatedContextualTyping.ts, 209, 3))
+>x206 : Symbol(x206, Decl(generatedContextualTyping.ts, 210, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x207 = <() => Base[]>function named() { return [d1, d2] };
->x207 : Symbol(x207, Decl(generatedContextualTyping.ts, 210, 3))
+>x207 : Symbol(x207, Decl(generatedContextualTyping.ts, 211, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 210, 25))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 211, 25))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x209 = <{ (): Base[]; }>function() { return [d1, d2] };
->x209 : Symbol(x209, Decl(generatedContextualTyping.ts, 211, 3))
+>x209 : Symbol(x209, Decl(generatedContextualTyping.ts, 212, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x210 = <{ (): Base[]; }>function named() { return [d1, d2] };
->x210 : Symbol(x210, Decl(generatedContextualTyping.ts, 212, 3))
+>x210 : Symbol(x210, Decl(generatedContextualTyping.ts, 213, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 212, 28))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 213, 28))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x211 = <Base[]>[d1, d2];
->x211 : Symbol(x211, Decl(generatedContextualTyping.ts, 213, 3))
+>x211 : Symbol(x211, Decl(generatedContextualTyping.ts, 214, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x212 = <Array<Base>>[d1, d2];
->x212 : Symbol(x212, Decl(generatedContextualTyping.ts, 214, 3))
+>x212 : Symbol(x212, Decl(generatedContextualTyping.ts, 215, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x213 = <{ [n: number]: Base; }>[d1, d2];
->x213 : Symbol(x213, Decl(generatedContextualTyping.ts, 215, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 215, 15))
+>x213 : Symbol(x213, Decl(generatedContextualTyping.ts, 216, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 216, 15))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x214 = <{n: Base[]; } >{ n: [d1, d2] };
->x214 : Symbol(x214, Decl(generatedContextualTyping.ts, 216, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 216, 13))
+>x214 : Symbol(x214, Decl(generatedContextualTyping.ts, 217, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 217, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 216, 28))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 217, 28))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x216 = <Genric<Base>>{ func: n => { return [d1, d2]; } };
->x216 : Symbol(x216, Decl(generatedContextualTyping.ts, 217, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x216 : Symbol(x216, Decl(generatedContextualTyping.ts, 218, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 217, 26))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 217, 32))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 218, 26))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 218, 32))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x217 = (<() => Base[]>undefined) || function() { return [d1, d2] };
->x217 : Symbol(x217, Decl(generatedContextualTyping.ts, 218, 3))
+>x217 : Symbol(x217, Decl(generatedContextualTyping.ts, 219, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x218 = (<() => Base[]>undefined) || function named() { return [d1, d2] };
->x218 : Symbol(x218, Decl(generatedContextualTyping.ts, 219, 3))
+>x218 : Symbol(x218, Decl(generatedContextualTyping.ts, 220, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->named : Symbol(named, Decl(generatedContextualTyping.ts, 219, 39))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 220, 39))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x219 = (<{ (): Base[]; }>undefined) || function() { return [d1, d2] };
->x219 : Symbol(x219, Decl(generatedContextualTyping.ts, 220, 3))
+>x219 : Symbol(x219, Decl(generatedContextualTyping.ts, 221, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x220 = (<{ (): Base[]; }>undefined) || function named() { return [d1, d2] };
->x220 : Symbol(x220, Decl(generatedContextualTyping.ts, 221, 3))
+>x220 : Symbol(x220, Decl(generatedContextualTyping.ts, 222, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->named : Symbol(named, Decl(generatedContextualTyping.ts, 221, 42))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 222, 42))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x221 = (<Base[]>undefined) || [d1, d2];
->x221 : Symbol(x221, Decl(generatedContextualTyping.ts, 222, 3))
+>x221 : Symbol(x221, Decl(generatedContextualTyping.ts, 223, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x222 = (<Array<Base>>undefined) || [d1, d2];
->x222 : Symbol(x222, Decl(generatedContextualTyping.ts, 223, 3))
+>x222 : Symbol(x222, Decl(generatedContextualTyping.ts, 224, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x223 = (<{ [n: number]: Base; }>undefined) || [d1, d2];
->x223 : Symbol(x223, Decl(generatedContextualTyping.ts, 224, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 224, 16))
+>x223 : Symbol(x223, Decl(generatedContextualTyping.ts, 225, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 225, 16))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x224 = (<{n: Base[]; } >undefined) || { n: [d1, d2] };
->x224 : Symbol(x224, Decl(generatedContextualTyping.ts, 225, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 225, 14))
+>x224 : Symbol(x224, Decl(generatedContextualTyping.ts, 226, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 226, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->n : Symbol(n, Decl(generatedContextualTyping.ts, 225, 43))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 226, 43))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x225: () => Base[]; x225 = () => [d1, d2];
->x225 : Symbol(x225, Decl(generatedContextualTyping.ts, 226, 3))
+>x225 : Symbol(x225, Decl(generatedContextualTyping.ts, 227, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x225 : Symbol(x225, Decl(generatedContextualTyping.ts, 226, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x225 : Symbol(x225, Decl(generatedContextualTyping.ts, 227, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x226: () => Base[]; x226 = function() { return [d1, d2] };
->x226 : Symbol(x226, Decl(generatedContextualTyping.ts, 227, 3))
+>x226 : Symbol(x226, Decl(generatedContextualTyping.ts, 228, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x226 : Symbol(x226, Decl(generatedContextualTyping.ts, 227, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x226 : Symbol(x226, Decl(generatedContextualTyping.ts, 228, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x227: () => Base[]; x227 = function named() { return [d1, d2] };
->x227 : Symbol(x227, Decl(generatedContextualTyping.ts, 228, 3))
+>x227 : Symbol(x227, Decl(generatedContextualTyping.ts, 229, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x227 : Symbol(x227, Decl(generatedContextualTyping.ts, 228, 3))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 228, 30))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x227 : Symbol(x227, Decl(generatedContextualTyping.ts, 229, 3))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 229, 30))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x228: { (): Base[]; }; x228 = () => [d1, d2];
->x228 : Symbol(x228, Decl(generatedContextualTyping.ts, 229, 3))
+>x228 : Symbol(x228, Decl(generatedContextualTyping.ts, 230, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x228 : Symbol(x228, Decl(generatedContextualTyping.ts, 229, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x228 : Symbol(x228, Decl(generatedContextualTyping.ts, 230, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x229: { (): Base[]; }; x229 = function() { return [d1, d2] };
->x229 : Symbol(x229, Decl(generatedContextualTyping.ts, 230, 3))
+>x229 : Symbol(x229, Decl(generatedContextualTyping.ts, 231, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x229 : Symbol(x229, Decl(generatedContextualTyping.ts, 230, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x229 : Symbol(x229, Decl(generatedContextualTyping.ts, 231, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x230: { (): Base[]; }; x230 = function named() { return [d1, d2] };
->x230 : Symbol(x230, Decl(generatedContextualTyping.ts, 231, 3))
+>x230 : Symbol(x230, Decl(generatedContextualTyping.ts, 232, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x230 : Symbol(x230, Decl(generatedContextualTyping.ts, 231, 3))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 231, 33))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x230 : Symbol(x230, Decl(generatedContextualTyping.ts, 232, 3))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 232, 33))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x231: Base[]; x231 = [d1, d2];
->x231 : Symbol(x231, Decl(generatedContextualTyping.ts, 232, 3))
+>x231 : Symbol(x231, Decl(generatedContextualTyping.ts, 233, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x231 : Symbol(x231, Decl(generatedContextualTyping.ts, 232, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x231 : Symbol(x231, Decl(generatedContextualTyping.ts, 233, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x232: Array<Base>; x232 = [d1, d2];
->x232 : Symbol(x232, Decl(generatedContextualTyping.ts, 233, 3))
+>x232 : Symbol(x232, Decl(generatedContextualTyping.ts, 234, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x232 : Symbol(x232, Decl(generatedContextualTyping.ts, 233, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x232 : Symbol(x232, Decl(generatedContextualTyping.ts, 234, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x233: { [n: number]: Base; }; x233 = [d1, d2];
->x233 : Symbol(x233, Decl(generatedContextualTyping.ts, 234, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 234, 13))
+>x233 : Symbol(x233, Decl(generatedContextualTyping.ts, 235, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 235, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x233 : Symbol(x233, Decl(generatedContextualTyping.ts, 234, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x233 : Symbol(x233, Decl(generatedContextualTyping.ts, 235, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x234: {n: Base[]; } ; x234 = { n: [d1, d2] };
->x234 : Symbol(x234, Decl(generatedContextualTyping.ts, 235, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 235, 11))
+>x234 : Symbol(x234, Decl(generatedContextualTyping.ts, 236, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 236, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x234 : Symbol(x234, Decl(generatedContextualTyping.ts, 235, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 235, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x234 : Symbol(x234, Decl(generatedContextualTyping.ts, 236, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 236, 34))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; };
->x235 : Symbol(x235, Decl(generatedContextualTyping.ts, 236, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 236, 11))
+>x235 : Symbol(x235, Decl(generatedContextualTyping.ts, 237, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 237, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x235 : Symbol(x235, Decl(generatedContextualTyping.ts, 236, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 236, 36), Decl(generatedContextualTyping.ts, 236, 47))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 236, 36), Decl(generatedContextualTyping.ts, 236, 47))
+>x235 : Symbol(x235, Decl(generatedContextualTyping.ts, 237, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 237, 36), Decl(generatedContextualTyping.ts, 237, 47))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 237, 36), Decl(generatedContextualTyping.ts, 237, 47))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x236: Genric<Base>; x236 = { func: n => { return [d1, d2]; } };
->x236 : Symbol(x236, Decl(generatedContextualTyping.ts, 237, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x236 : Symbol(x236, Decl(generatedContextualTyping.ts, 238, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x236 : Symbol(x236, Decl(generatedContextualTyping.ts, 237, 3))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 237, 32))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 237, 38))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x236 : Symbol(x236, Decl(generatedContextualTyping.ts, 238, 3))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 238, 32))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 238, 38))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x237: { n: () => Base[]; } = { n: () => [d1, d2] };
->x237 : Symbol(x237, Decl(generatedContextualTyping.ts, 238, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 238, 11))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 238, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } };
->x238 : Symbol(x238, Decl(generatedContextualTyping.ts, 239, 3))
+>x237 : Symbol(x237, Decl(generatedContextualTyping.ts, 239, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 239, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 239, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } };
->x239 : Symbol(x239, Decl(generatedContextualTyping.ts, 240, 3))
+var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } };
+>x238 : Symbol(x238, Decl(generatedContextualTyping.ts, 240, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 240, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 240, 34))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 240, 37))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x240: { n: { (): Base[]; }; } = { n: () => [d1, d2] };
->x240 : Symbol(x240, Decl(generatedContextualTyping.ts, 241, 3))
+var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } };
+>x239 : Symbol(x239, Decl(generatedContextualTyping.ts, 241, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 241, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 241, 37))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 241, 34))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 241, 37))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x241: { n: { (): Base[]; }; } = { n: function() { return [d1, d2] } };
->x241 : Symbol(x241, Decl(generatedContextualTyping.ts, 242, 3))
+var x240: { n: { (): Base[]; }; } = { n: () => [d1, d2] };
+>x240 : Symbol(x240, Decl(generatedContextualTyping.ts, 242, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 242, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 242, 37))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x242: { n: { (): Base[]; }; } = { n: function named() { return [d1, d2] } };
->x242 : Symbol(x242, Decl(generatedContextualTyping.ts, 243, 3))
+var x241: { n: { (): Base[]; }; } = { n: function() { return [d1, d2] } };
+>x241 : Symbol(x241, Decl(generatedContextualTyping.ts, 243, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 243, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 243, 37))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 243, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x243: { n: Base[]; } = { n: [d1, d2] };
->x243 : Symbol(x243, Decl(generatedContextualTyping.ts, 244, 3))
+var x242: { n: { (): Base[]; }; } = { n: function named() { return [d1, d2] } };
+>x242 : Symbol(x242, Decl(generatedContextualTyping.ts, 244, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 244, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 244, 28))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 244, 37))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 244, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+var x243: { n: Base[]; } = { n: [d1, d2] };
+>x243 : Symbol(x243, Decl(generatedContextualTyping.ts, 245, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 245, 11))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 245, 28))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x244: { n: Array<Base>; } = { n: [d1, d2] };
->x244 : Symbol(x244, Decl(generatedContextualTyping.ts, 245, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 245, 11))
+>x244 : Symbol(x244, Decl(generatedContextualTyping.ts, 246, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 246, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 245, 33))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 246, 33))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x245: { n: { [n: number]: Base; }; } = { n: [d1, d2] };
->x245 : Symbol(x245, Decl(generatedContextualTyping.ts, 246, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 246, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 246, 18))
+>x245 : Symbol(x245, Decl(generatedContextualTyping.ts, 247, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 246, 44))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 44))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x246: { n: {n: Base[]; } ; } = { n: { n: [d1, d2] } };
->x246 : Symbol(x246, Decl(generatedContextualTyping.ts, 247, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 11))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 16))
+>x246 : Symbol(x246, Decl(generatedContextualTyping.ts, 248, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 11))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 16))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 36))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 247, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 36))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; } };
->x247 : Symbol(x247, Decl(generatedContextualTyping.ts, 248, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 11))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 248, 16))
+>x247 : Symbol(x247, Decl(generatedContextualTyping.ts, 249, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 11))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 249, 16))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 43), Decl(generatedContextualTyping.ts, 248, 54))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 43), Decl(generatedContextualTyping.ts, 248, 54))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 43), Decl(generatedContextualTyping.ts, 249, 54))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 43), Decl(generatedContextualTyping.ts, 249, 54))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x248: { n: Genric<Base>; } = { n: { func: n => { return [d1, d2]; } } };
->x248 : Symbol(x248, Decl(generatedContextualTyping.ts, 249, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 11))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x248 : Symbol(x248, Decl(generatedContextualTyping.ts, 250, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 250, 11))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 34))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 249, 39))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 250, 34))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 250, 39))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 250, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x252: { (): Base[]; }[] = [() => [d1, d2]];
->x252 : Symbol(x252, Decl(generatedContextualTyping.ts, 250, 3))
+>x252 : Symbol(x252, Decl(generatedContextualTyping.ts, 251, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x253: { (): Base[]; }[] = [function() { return [d1, d2] }];
->x253 : Symbol(x253, Decl(generatedContextualTyping.ts, 251, 3))
+>x253 : Symbol(x253, Decl(generatedContextualTyping.ts, 252, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x254: { (): Base[]; }[] = [function named() { return [d1, d2] }];
->x254 : Symbol(x254, Decl(generatedContextualTyping.ts, 252, 3))
+>x254 : Symbol(x254, Decl(generatedContextualTyping.ts, 253, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 252, 31))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 253, 31))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x255: Base[][] = [[d1, d2]];
->x255 : Symbol(x255, Decl(generatedContextualTyping.ts, 253, 3))
+>x255 : Symbol(x255, Decl(generatedContextualTyping.ts, 254, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x256: Array<Base>[] = [[d1, d2]];
->x256 : Symbol(x256, Decl(generatedContextualTyping.ts, 254, 3))
+>x256 : Symbol(x256, Decl(generatedContextualTyping.ts, 255, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x257: { [n: number]: Base; }[] = [[d1, d2]];
->x257 : Symbol(x257, Decl(generatedContextualTyping.ts, 255, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 255, 13))
+>x257 : Symbol(x257, Decl(generatedContextualTyping.ts, 256, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 256, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x258: {n: Base[]; } [] = [{ n: [d1, d2] }];
->x258 : Symbol(x258, Decl(generatedContextualTyping.ts, 256, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 256, 11))
+>x258 : Symbol(x258, Decl(generatedContextualTyping.ts, 257, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 257, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 256, 31))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 257, 31))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x260: Genric<Base>[] = [{ func: n => { return [d1, d2]; } }];
->x260 : Symbol(x260, Decl(generatedContextualTyping.ts, 257, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x260 : Symbol(x260, Decl(generatedContextualTyping.ts, 258, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 257, 29))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 257, 35))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 258, 29))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 258, 35))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x261: () => Base[] = function() { return [d1, d2] } || undefined;
->x261 : Symbol(x261, Decl(generatedContextualTyping.ts, 258, 3))
+>x261 : Symbol(x261, Decl(generatedContextualTyping.ts, 259, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x262: () => Base[] = function named() { return [d1, d2] } || undefined;
->x262 : Symbol(x262, Decl(generatedContextualTyping.ts, 259, 3))
+>x262 : Symbol(x262, Decl(generatedContextualTyping.ts, 260, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 259, 24))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 260, 24))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x263: { (): Base[]; } = function() { return [d1, d2] } || undefined;
->x263 : Symbol(x263, Decl(generatedContextualTyping.ts, 260, 3))
+>x263 : Symbol(x263, Decl(generatedContextualTyping.ts, 261, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x264: { (): Base[]; } = function named() { return [d1, d2] } || undefined;
->x264 : Symbol(x264, Decl(generatedContextualTyping.ts, 261, 3))
+>x264 : Symbol(x264, Decl(generatedContextualTyping.ts, 262, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 261, 27))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 262, 27))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x265: Base[] = [d1, d2] || undefined;
->x265 : Symbol(x265, Decl(generatedContextualTyping.ts, 262, 3))
+>x265 : Symbol(x265, Decl(generatedContextualTyping.ts, 263, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x266: Array<Base> = [d1, d2] || undefined;
->x266 : Symbol(x266, Decl(generatedContextualTyping.ts, 263, 3))
+>x266 : Symbol(x266, Decl(generatedContextualTyping.ts, 264, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x267: { [n: number]: Base; } = [d1, d2] || undefined;
->x267 : Symbol(x267, Decl(generatedContextualTyping.ts, 264, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 264, 13))
+>x267 : Symbol(x267, Decl(generatedContextualTyping.ts, 265, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 265, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x268: {n: Base[]; }  = { n: [d1, d2] } || undefined;
->x268 : Symbol(x268, Decl(generatedContextualTyping.ts, 265, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 265, 11))
+>x268 : Symbol(x268, Decl(generatedContextualTyping.ts, 266, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 266, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 265, 28))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 266, 28))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x269: () => Base[] = undefined || function() { return [d1, d2] };
->x269 : Symbol(x269, Decl(generatedContextualTyping.ts, 266, 3))
+>x269 : Symbol(x269, Decl(generatedContextualTyping.ts, 267, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x270: () => Base[] = undefined || function named() { return [d1, d2] };
->x270 : Symbol(x270, Decl(generatedContextualTyping.ts, 267, 3))
+>x270 : Symbol(x270, Decl(generatedContextualTyping.ts, 268, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->named : Symbol(named, Decl(generatedContextualTyping.ts, 267, 37))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 268, 37))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x271: { (): Base[]; } = undefined || function() { return [d1, d2] };
->x271 : Symbol(x271, Decl(generatedContextualTyping.ts, 268, 3))
+>x271 : Symbol(x271, Decl(generatedContextualTyping.ts, 269, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x272: { (): Base[]; } = undefined || function named() { return [d1, d2] };
->x272 : Symbol(x272, Decl(generatedContextualTyping.ts, 269, 3))
+>x272 : Symbol(x272, Decl(generatedContextualTyping.ts, 270, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->named : Symbol(named, Decl(generatedContextualTyping.ts, 269, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 270, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x273: Base[] = undefined || [d1, d2];
->x273 : Symbol(x273, Decl(generatedContextualTyping.ts, 270, 3))
+>x273 : Symbol(x273, Decl(generatedContextualTyping.ts, 271, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x274: Array<Base> = undefined || [d1, d2];
->x274 : Symbol(x274, Decl(generatedContextualTyping.ts, 271, 3))
+>x274 : Symbol(x274, Decl(generatedContextualTyping.ts, 272, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x275: { [n: number]: Base; } = undefined || [d1, d2];
->x275 : Symbol(x275, Decl(generatedContextualTyping.ts, 272, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 272, 13))
+>x275 : Symbol(x275, Decl(generatedContextualTyping.ts, 273, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 273, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x276: {n: Base[]; }  = undefined || { n: [d1, d2] };
->x276 : Symbol(x276, Decl(generatedContextualTyping.ts, 273, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 273, 11))
+>x276 : Symbol(x276, Decl(generatedContextualTyping.ts, 274, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 274, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->n : Symbol(n, Decl(generatedContextualTyping.ts, 273, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 274, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x277: () => Base[] = function() { return [d1, d2] } || function() { return [d1, d2] };
->x277 : Symbol(x277, Decl(generatedContextualTyping.ts, 274, 3))
+>x277 : Symbol(x277, Decl(generatedContextualTyping.ts, 275, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x278: () => Base[] = function named() { return [d1, d2] } || function named() { return [d1, d2] };
->x278 : Symbol(x278, Decl(generatedContextualTyping.ts, 275, 3))
+>x278 : Symbol(x278, Decl(generatedContextualTyping.ts, 276, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 275, 24))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 275, 64))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 276, 24))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 276, 64))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x279: { (): Base[]; } = function() { return [d1, d2] } || function() { return [d1, d2] };
->x279 : Symbol(x279, Decl(generatedContextualTyping.ts, 276, 3))
+>x279 : Symbol(x279, Decl(generatedContextualTyping.ts, 277, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x280: { (): Base[]; } = function named() { return [d1, d2] } || function named() { return [d1, d2] };
->x280 : Symbol(x280, Decl(generatedContextualTyping.ts, 277, 3))
+>x280 : Symbol(x280, Decl(generatedContextualTyping.ts, 278, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 277, 27))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 277, 67))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 278, 27))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 278, 67))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x281: Base[] = [d1, d2] || [d1, d2];
->x281 : Symbol(x281, Decl(generatedContextualTyping.ts, 278, 3))
+>x281 : Symbol(x281, Decl(generatedContextualTyping.ts, 279, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x282: Array<Base> = [d1, d2] || [d1, d2];
->x282 : Symbol(x282, Decl(generatedContextualTyping.ts, 279, 3))
+>x282 : Symbol(x282, Decl(generatedContextualTyping.ts, 280, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x283: { [n: number]: Base; } = [d1, d2] || [d1, d2];
->x283 : Symbol(x283, Decl(generatedContextualTyping.ts, 280, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 280, 13))
+>x283 : Symbol(x283, Decl(generatedContextualTyping.ts, 281, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 281, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x284: {n: Base[]; }  = { n: [d1, d2] } || { n: [d1, d2] };
->x284 : Symbol(x284, Decl(generatedContextualTyping.ts, 281, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 281, 11))
+>x284 : Symbol(x284, Decl(generatedContextualTyping.ts, 282, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 282, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 281, 28))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 281, 47))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 282, 28))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 282, 47))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x285: () => Base[] = true ? () => [d1, d2] : () => [d1, d2];
->x285 : Symbol(x285, Decl(generatedContextualTyping.ts, 282, 3))
+>x285 : Symbol(x285, Decl(generatedContextualTyping.ts, 283, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x286: () => Base[] = true ? function() { return [d1, d2] } : function() { return [d1, d2] };
->x286 : Symbol(x286, Decl(generatedContextualTyping.ts, 283, 3))
+>x286 : Symbol(x286, Decl(generatedContextualTyping.ts, 284, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x287: () => Base[] = true ? function named() { return [d1, d2] } : function named() { return [d1, d2] };
->x287 : Symbol(x287, Decl(generatedContextualTyping.ts, 284, 3))
+>x287 : Symbol(x287, Decl(generatedContextualTyping.ts, 285, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 284, 31))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 284, 70))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 285, 31))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 285, 70))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x288: { (): Base[]; } = true ? () => [d1, d2] : () => [d1, d2];
->x288 : Symbol(x288, Decl(generatedContextualTyping.ts, 285, 3))
+>x288 : Symbol(x288, Decl(generatedContextualTyping.ts, 286, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x289: { (): Base[]; } = true ? function() { return [d1, d2] } : function() { return [d1, d2] };
->x289 : Symbol(x289, Decl(generatedContextualTyping.ts, 286, 3))
+>x289 : Symbol(x289, Decl(generatedContextualTyping.ts, 287, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x290: { (): Base[]; } = true ? function named() { return [d1, d2] } : function named() { return [d1, d2] };
->x290 : Symbol(x290, Decl(generatedContextualTyping.ts, 287, 3))
+>x290 : Symbol(x290, Decl(generatedContextualTyping.ts, 288, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 287, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 287, 73))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 288, 34))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 288, 73))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x291: Base[] = true ? [d1, d2] : [d1, d2];
->x291 : Symbol(x291, Decl(generatedContextualTyping.ts, 288, 3))
+>x291 : Symbol(x291, Decl(generatedContextualTyping.ts, 289, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x292: Array<Base> = true ? [d1, d2] : [d1, d2];
->x292 : Symbol(x292, Decl(generatedContextualTyping.ts, 289, 3))
+>x292 : Symbol(x292, Decl(generatedContextualTyping.ts, 290, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2];
->x293 : Symbol(x293, Decl(generatedContextualTyping.ts, 290, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 290, 13))
+>x293 : Symbol(x293, Decl(generatedContextualTyping.ts, 291, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 291, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x294: {n: Base[]; }  = true ? { n: [d1, d2] } : { n: [d1, d2] };
->x294 : Symbol(x294, Decl(generatedContextualTyping.ts, 291, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 291, 11))
+>x294 : Symbol(x294, Decl(generatedContextualTyping.ts, 292, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 291, 35))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 291, 53))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 35))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 53))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; };
->x295 : Symbol(x295, Decl(generatedContextualTyping.ts, 292, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 292, 11))
+>x295 : Symbol(x295, Decl(generatedContextualTyping.ts, 293, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 293, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 37), Decl(generatedContextualTyping.ts, 292, 48))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 37), Decl(generatedContextualTyping.ts, 292, 48))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 37), Decl(generatedContextualTyping.ts, 293, 48))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 37), Decl(generatedContextualTyping.ts, 293, 48))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 76), Decl(generatedContextualTyping.ts, 292, 87))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 76), Decl(generatedContextualTyping.ts, 292, 87))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 76), Decl(generatedContextualTyping.ts, 293, 87))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 76), Decl(generatedContextualTyping.ts, 293, 87))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x296: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } };
->x296 : Symbol(x296, Decl(generatedContextualTyping.ts, 293, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x296 : Symbol(x296, Decl(generatedContextualTyping.ts, 294, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 293, 33))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 39))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 293, 71))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 77))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 294, 33))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 294, 39))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 294, 71))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 294, 77))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x297: () => Base[] = true ? undefined : () => [d1, d2];
->x297 : Symbol(x297, Decl(generatedContextualTyping.ts, 294, 3))
+>x297 : Symbol(x297, Decl(generatedContextualTyping.ts, 295, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x298: () => Base[] = true ? undefined : function() { return [d1, d2] };
->x298 : Symbol(x298, Decl(generatedContextualTyping.ts, 295, 3))
+>x298 : Symbol(x298, Decl(generatedContextualTyping.ts, 296, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x299: () => Base[] = true ? undefined : function named() { return [d1, d2] };
->x299 : Symbol(x299, Decl(generatedContextualTyping.ts, 296, 3))
+>x299 : Symbol(x299, Decl(generatedContextualTyping.ts, 297, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->named : Symbol(named, Decl(generatedContextualTyping.ts, 296, 43))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 297, 43))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x300: { (): Base[]; } = true ? undefined : () => [d1, d2];
->x300 : Symbol(x300, Decl(generatedContextualTyping.ts, 297, 3))
+>x300 : Symbol(x300, Decl(generatedContextualTyping.ts, 298, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x301: { (): Base[]; } = true ? undefined : function() { return [d1, d2] };
->x301 : Symbol(x301, Decl(generatedContextualTyping.ts, 298, 3))
+>x301 : Symbol(x301, Decl(generatedContextualTyping.ts, 299, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x302: { (): Base[]; } = true ? undefined : function named() { return [d1, d2] };
->x302 : Symbol(x302, Decl(generatedContextualTyping.ts, 299, 3))
+>x302 : Symbol(x302, Decl(generatedContextualTyping.ts, 300, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->named : Symbol(named, Decl(generatedContextualTyping.ts, 299, 46))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 300, 46))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x303: Base[] = true ? undefined : [d1, d2];
->x303 : Symbol(x303, Decl(generatedContextualTyping.ts, 300, 3))
+>x303 : Symbol(x303, Decl(generatedContextualTyping.ts, 301, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x304: Array<Base> = true ? undefined : [d1, d2];
->x304 : Symbol(x304, Decl(generatedContextualTyping.ts, 301, 3))
+>x304 : Symbol(x304, Decl(generatedContextualTyping.ts, 302, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x305: { [n: number]: Base; } = true ? undefined : [d1, d2];
->x305 : Symbol(x305, Decl(generatedContextualTyping.ts, 302, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 302, 13))
+>x305 : Symbol(x305, Decl(generatedContextualTyping.ts, 303, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 303, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x306: {n: Base[]; }  = true ? undefined : { n: [d1, d2] };
->x306 : Symbol(x306, Decl(generatedContextualTyping.ts, 303, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 303, 11))
+>x306 : Symbol(x306, Decl(generatedContextualTyping.ts, 304, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 304, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->n : Symbol(n, Decl(generatedContextualTyping.ts, 303, 47))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 304, 47))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return null; };
->x307 : Symbol(x307, Decl(generatedContextualTyping.ts, 304, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 304, 11))
+>x307 : Symbol(x307, Decl(generatedContextualTyping.ts, 305, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 305, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->n : Symbol(n, Decl(generatedContextualTyping.ts, 304, 49), Decl(generatedContextualTyping.ts, 304, 60))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 304, 49), Decl(generatedContextualTyping.ts, 304, 60))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 305, 49), Decl(generatedContextualTyping.ts, 305, 60))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 305, 49), Decl(generatedContextualTyping.ts, 305, 60))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x308: Genric<Base> = true ? undefined : { func: n => { return [d1, d2]; } };
->x308 : Symbol(x308, Decl(generatedContextualTyping.ts, 305, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x308 : Symbol(x308, Decl(generatedContextualTyping.ts, 306, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
->func : Symbol(func, Decl(generatedContextualTyping.ts, 305, 45))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 305, 51))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 306, 45))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 306, 51))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x309: () => Base[] = true ? () => [d1, d2] : undefined;
->x309 : Symbol(x309, Decl(generatedContextualTyping.ts, 306, 3))
+>x309 : Symbol(x309, Decl(generatedContextualTyping.ts, 307, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x310: () => Base[] = true ? function() { return [d1, d2] } : undefined;
->x310 : Symbol(x310, Decl(generatedContextualTyping.ts, 307, 3))
+>x310 : Symbol(x310, Decl(generatedContextualTyping.ts, 308, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x311: () => Base[] = true ? function named() { return [d1, d2] } : undefined;
->x311 : Symbol(x311, Decl(generatedContextualTyping.ts, 308, 3))
+>x311 : Symbol(x311, Decl(generatedContextualTyping.ts, 309, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 308, 31))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 309, 31))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x312: { (): Base[]; } = true ? () => [d1, d2] : undefined;
->x312 : Symbol(x312, Decl(generatedContextualTyping.ts, 309, 3))
+>x312 : Symbol(x312, Decl(generatedContextualTyping.ts, 310, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x313: { (): Base[]; } = true ? function() { return [d1, d2] } : undefined;
->x313 : Symbol(x313, Decl(generatedContextualTyping.ts, 310, 3))
+>x313 : Symbol(x313, Decl(generatedContextualTyping.ts, 311, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x314: { (): Base[]; } = true ? function named() { return [d1, d2] } : undefined;
->x314 : Symbol(x314, Decl(generatedContextualTyping.ts, 311, 3))
+>x314 : Symbol(x314, Decl(generatedContextualTyping.ts, 312, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 311, 34))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 312, 34))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x315: Base[] = true ? [d1, d2] : undefined;
->x315 : Symbol(x315, Decl(generatedContextualTyping.ts, 312, 3))
+>x315 : Symbol(x315, Decl(generatedContextualTyping.ts, 313, 3))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x316: Array<Base> = true ? [d1, d2] : undefined;
->x316 : Symbol(x316, Decl(generatedContextualTyping.ts, 313, 3))
+>x316 : Symbol(x316, Decl(generatedContextualTyping.ts, 314, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined;
->x317 : Symbol(x317, Decl(generatedContextualTyping.ts, 314, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 314, 13))
+>x317 : Symbol(x317, Decl(generatedContextualTyping.ts, 315, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 315, 13))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x318: {n: Base[]; }  = true ? { n: [d1, d2] } : undefined;
->x318 : Symbol(x318, Decl(generatedContextualTyping.ts, 315, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 315, 11))
+>x318 : Symbol(x318, Decl(generatedContextualTyping.ts, 316, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 316, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 315, 35))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 316, 35))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : undefined;
->x319 : Symbol(x319, Decl(generatedContextualTyping.ts, 316, 3))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 316, 11))
+>x319 : Symbol(x319, Decl(generatedContextualTyping.ts, 317, 3))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 317, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 316, 37), Decl(generatedContextualTyping.ts, 316, 48))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 316, 37), Decl(generatedContextualTyping.ts, 316, 48))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 317, 37), Decl(generatedContextualTyping.ts, 317, 48))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 317, 37), Decl(generatedContextualTyping.ts, 317, 48))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >undefined : Symbol(undefined)
 
 var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
->x320 : Symbol(x320, Decl(generatedContextualTyping.ts, 317, 3))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x320 : Symbol(x320, Decl(generatedContextualTyping.ts, 318, 3))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 317, 33))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 317, 39))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 318, 33))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 318, 39))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 >undefined : Symbol(undefined)
 
 function x321(n: () => Base[]) { }; x321(() => [d1, d2]);
->x321 : Symbol(x321, Decl(generatedContextualTyping.ts, 317, 80))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 318, 14))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x321 : Symbol(x321, Decl(generatedContextualTyping.ts, 317, 80))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] });
->x322 : Symbol(x322, Decl(generatedContextualTyping.ts, 318, 57))
+>x321 : Symbol(x321, Decl(generatedContextualTyping.ts, 318, 80))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 319, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x322 : Symbol(x322, Decl(generatedContextualTyping.ts, 318, 57))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x321 : Symbol(x321, Decl(generatedContextualTyping.ts, 318, 80))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
->x323 : Symbol(x323, Decl(generatedContextualTyping.ts, 319, 73))
+function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] });
+>x322 : Symbol(x322, Decl(generatedContextualTyping.ts, 319, 57))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 320, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x323 : Symbol(x323, Decl(generatedContextualTyping.ts, 319, 73))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 320, 41))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x322 : Symbol(x322, Decl(generatedContextualTyping.ts, 319, 57))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x324(n: { (): Base[]; }) { }; x324(() => [d1, d2]);
->x324 : Symbol(x324, Decl(generatedContextualTyping.ts, 320, 79))
+function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
+>x323 : Symbol(x323, Decl(generatedContextualTyping.ts, 320, 73))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 321, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x324 : Symbol(x324, Decl(generatedContextualTyping.ts, 320, 79))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x323 : Symbol(x323, Decl(generatedContextualTyping.ts, 320, 73))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 321, 41))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x325(n: { (): Base[]; }) { }; x325(function() { return [d1, d2] });
->x325 : Symbol(x325, Decl(generatedContextualTyping.ts, 321, 60))
+function x324(n: { (): Base[]; }) { }; x324(() => [d1, d2]);
+>x324 : Symbol(x324, Decl(generatedContextualTyping.ts, 321, 79))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 322, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x325 : Symbol(x325, Decl(generatedContextualTyping.ts, 321, 60))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x324 : Symbol(x324, Decl(generatedContextualTyping.ts, 321, 79))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] });
->x326 : Symbol(x326, Decl(generatedContextualTyping.ts, 322, 76))
+function x325(n: { (): Base[]; }) { }; x325(function() { return [d1, d2] });
+>x325 : Symbol(x325, Decl(generatedContextualTyping.ts, 322, 60))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 323, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x326 : Symbol(x326, Decl(generatedContextualTyping.ts, 322, 76))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 323, 44))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x325 : Symbol(x325, Decl(generatedContextualTyping.ts, 322, 60))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-function x327(n: Base[]) { }; x327([d1, d2]);
->x327 : Symbol(x327, Decl(generatedContextualTyping.ts, 323, 82))
+function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] });
+>x326 : Symbol(x326, Decl(generatedContextualTyping.ts, 323, 76))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 324, 14))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x327 : Symbol(x327, Decl(generatedContextualTyping.ts, 323, 82))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x326 : Symbol(x326, Decl(generatedContextualTyping.ts, 323, 76))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 324, 44))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+function x327(n: Base[]) { }; x327([d1, d2]);
+>x327 : Symbol(x327, Decl(generatedContextualTyping.ts, 324, 82))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 325, 14))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>x327 : Symbol(x327, Decl(generatedContextualTyping.ts, 324, 82))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x328(n: Array<Base>) { }; x328([d1, d2]);
->x328 : Symbol(x328, Decl(generatedContextualTyping.ts, 324, 45))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 325, 14))
+>x328 : Symbol(x328, Decl(generatedContextualTyping.ts, 325, 45))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 326, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x328 : Symbol(x328, Decl(generatedContextualTyping.ts, 324, 45))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x328 : Symbol(x328, Decl(generatedContextualTyping.ts, 325, 45))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]);
->x329 : Symbol(x329, Decl(generatedContextualTyping.ts, 325, 50))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 326, 14))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 326, 20))
+>x329 : Symbol(x329, Decl(generatedContextualTyping.ts, 326, 50))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 327, 14))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 327, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x329 : Symbol(x329, Decl(generatedContextualTyping.ts, 325, 50))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x329 : Symbol(x329, Decl(generatedContextualTyping.ts, 326, 50))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] });
->x330 : Symbol(x330, Decl(generatedContextualTyping.ts, 326, 61))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 327, 14))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 327, 18))
+>x330 : Symbol(x330, Decl(generatedContextualTyping.ts, 327, 61))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 14))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x330 : Symbol(x330, Decl(generatedContextualTyping.ts, 326, 61))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 327, 44))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x330 : Symbol(x330, Decl(generatedContextualTyping.ts, 327, 61))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 44))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null; });
->x331 : Symbol(x331, Decl(generatedContextualTyping.ts, 327, 60))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 14))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 328, 18))
+>x331 : Symbol(x331, Decl(generatedContextualTyping.ts, 328, 60))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 329, 14))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 329, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x331 : Symbol(x331, Decl(generatedContextualTyping.ts, 327, 60))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 47), Decl(generatedContextualTyping.ts, 328, 57))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 47), Decl(generatedContextualTyping.ts, 328, 57))
+>x331 : Symbol(x331, Decl(generatedContextualTyping.ts, 328, 60))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 329, 47), Decl(generatedContextualTyping.ts, 329, 57))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 329, 47), Decl(generatedContextualTyping.ts, 329, 57))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 function x332(n: Genric<Base>) { }; x332({ func: n => { return [d1, d2]; } });
->x332 : Symbol(x332, Decl(generatedContextualTyping.ts, 328, 85))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 329, 14))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x332 : Symbol(x332, Decl(generatedContextualTyping.ts, 329, 85))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 330, 14))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x332 : Symbol(x332, Decl(generatedContextualTyping.ts, 328, 85))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 329, 42))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 329, 48))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x332 : Symbol(x332, Decl(generatedContextualTyping.ts, 329, 85))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 330, 42))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 330, 48))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x333 = (n: () => Base[]) => n; x333(() => [d1, d2]);
->x333 : Symbol(x333, Decl(generatedContextualTyping.ts, 330, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 330, 12))
+>x333 : Symbol(x333, Decl(generatedContextualTyping.ts, 331, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 331, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 330, 12))
->x333 : Symbol(x333, Decl(generatedContextualTyping.ts, 330, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 331, 12))
+>x333 : Symbol(x333, Decl(generatedContextualTyping.ts, 331, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x334 = (n: () => Base[]) => n; x334(function() { return [d1, d2] });
->x334 : Symbol(x334, Decl(generatedContextualTyping.ts, 331, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 331, 12))
+>x334 : Symbol(x334, Decl(generatedContextualTyping.ts, 332, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 332, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 331, 12))
->x334 : Symbol(x334, Decl(generatedContextualTyping.ts, 331, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 332, 12))
+>x334 : Symbol(x334, Decl(generatedContextualTyping.ts, 332, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x335 = (n: () => Base[]) => n; x335(function named() { return [d1, d2] });
->x335 : Symbol(x335, Decl(generatedContextualTyping.ts, 332, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 332, 12))
+>x335 : Symbol(x335, Decl(generatedContextualTyping.ts, 333, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 333, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 332, 12))
->x335 : Symbol(x335, Decl(generatedContextualTyping.ts, 332, 3))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 332, 40))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 333, 12))
+>x335 : Symbol(x335, Decl(generatedContextualTyping.ts, 333, 3))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 333, 40))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x336 = (n: { (): Base[]; }) => n; x336(() => [d1, d2]);
->x336 : Symbol(x336, Decl(generatedContextualTyping.ts, 333, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 333, 12))
+>x336 : Symbol(x336, Decl(generatedContextualTyping.ts, 334, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 334, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 333, 12))
->x336 : Symbol(x336, Decl(generatedContextualTyping.ts, 333, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 334, 12))
+>x336 : Symbol(x336, Decl(generatedContextualTyping.ts, 334, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x337 = (n: { (): Base[]; }) => n; x337(function() { return [d1, d2] });
->x337 : Symbol(x337, Decl(generatedContextualTyping.ts, 334, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 334, 12))
+>x337 : Symbol(x337, Decl(generatedContextualTyping.ts, 335, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 335, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 334, 12))
->x337 : Symbol(x337, Decl(generatedContextualTyping.ts, 334, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 335, 12))
+>x337 : Symbol(x337, Decl(generatedContextualTyping.ts, 335, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x338 = (n: { (): Base[]; }) => n; x338(function named() { return [d1, d2] });
->x338 : Symbol(x338, Decl(generatedContextualTyping.ts, 335, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 335, 12))
+>x338 : Symbol(x338, Decl(generatedContextualTyping.ts, 336, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 336, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 335, 12))
->x338 : Symbol(x338, Decl(generatedContextualTyping.ts, 335, 3))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 335, 43))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 336, 12))
+>x338 : Symbol(x338, Decl(generatedContextualTyping.ts, 336, 3))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 336, 43))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x339 = (n: Base[]) => n; x339([d1, d2]);
->x339 : Symbol(x339, Decl(generatedContextualTyping.ts, 336, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 336, 12))
+>x339 : Symbol(x339, Decl(generatedContextualTyping.ts, 337, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 337, 12))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 336, 12))
->x339 : Symbol(x339, Decl(generatedContextualTyping.ts, 336, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 337, 12))
+>x339 : Symbol(x339, Decl(generatedContextualTyping.ts, 337, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x340 = (n: Array<Base>) => n; x340([d1, d2]);
->x340 : Symbol(x340, Decl(generatedContextualTyping.ts, 337, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 337, 12))
+>x340 : Symbol(x340, Decl(generatedContextualTyping.ts, 338, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 338, 12))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 337, 12))
->x340 : Symbol(x340, Decl(generatedContextualTyping.ts, 337, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 338, 12))
+>x340 : Symbol(x340, Decl(generatedContextualTyping.ts, 338, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]);
->x341 : Symbol(x341, Decl(generatedContextualTyping.ts, 338, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 338, 12))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 338, 18))
+>x341 : Symbol(x341, Decl(generatedContextualTyping.ts, 339, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 12))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 18))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 338, 12))
->x341 : Symbol(x341, Decl(generatedContextualTyping.ts, 338, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 12))
+>x341 : Symbol(x341, Decl(generatedContextualTyping.ts, 339, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x342 = (n: {n: Base[]; } ) => n; x342({ n: [d1, d2] });
->x342 : Symbol(x342, Decl(generatedContextualTyping.ts, 339, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 12))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 16))
+>x342 : Symbol(x342, Decl(generatedContextualTyping.ts, 340, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 12))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 16))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 12))
->x342 : Symbol(x342, Decl(generatedContextualTyping.ts, 339, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 339, 43))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 12))
+>x342 : Symbol(x342, Decl(generatedContextualTyping.ts, 340, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 43))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null; });
->x343 : Symbol(x343, Decl(generatedContextualTyping.ts, 340, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 12))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 340, 16))
+>x343 : Symbol(x343, Decl(generatedContextualTyping.ts, 341, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 12))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 341, 16))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 12))
->x343 : Symbol(x343, Decl(generatedContextualTyping.ts, 340, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 46), Decl(generatedContextualTyping.ts, 340, 56))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 46), Decl(generatedContextualTyping.ts, 340, 56))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 12))
+>x343 : Symbol(x343, Decl(generatedContextualTyping.ts, 341, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 46), Decl(generatedContextualTyping.ts, 341, 56))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 46), Decl(generatedContextualTyping.ts, 341, 56))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x344 = (n: Genric<Base>) => n; x344({ func: n => { return [d1, d2]; } });
->x344 : Symbol(x344, Decl(generatedContextualTyping.ts, 341, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 12))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x344 : Symbol(x344, Decl(generatedContextualTyping.ts, 342, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 342, 12))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 12))
->x344 : Symbol(x344, Decl(generatedContextualTyping.ts, 341, 3))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 341, 41))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 47))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 342, 12))
+>x344 : Symbol(x344, Decl(generatedContextualTyping.ts, 342, 3))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 342, 41))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 342, 47))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x345 = function(n: () => Base[]) { }; x345(() => [d1, d2]);
->x345 : Symbol(x345, Decl(generatedContextualTyping.ts, 342, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 342, 20))
->Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x345 : Symbol(x345, Decl(generatedContextualTyping.ts, 342, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
-
-var x346 = function(n: () => Base[]) { }; x346(function() { return [d1, d2] });
->x346 : Symbol(x346, Decl(generatedContextualTyping.ts, 343, 3))
+>x345 : Symbol(x345, Decl(generatedContextualTyping.ts, 343, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 343, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x346 : Symbol(x346, Decl(generatedContextualTyping.ts, 343, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x345 : Symbol(x345, Decl(generatedContextualTyping.ts, 343, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x347 = function(n: () => Base[]) { }; x347(function named() { return [d1, d2] });
->x347 : Symbol(x347, Decl(generatedContextualTyping.ts, 344, 3))
+var x346 = function(n: () => Base[]) { }; x346(function() { return [d1, d2] });
+>x346 : Symbol(x346, Decl(generatedContextualTyping.ts, 344, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 344, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x347 : Symbol(x347, Decl(generatedContextualTyping.ts, 344, 3))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 344, 47))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x346 : Symbol(x346, Decl(generatedContextualTyping.ts, 344, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x348 = function(n: { (): Base[]; }) { }; x348(() => [d1, d2]);
->x348 : Symbol(x348, Decl(generatedContextualTyping.ts, 345, 3))
+var x347 = function(n: () => Base[]) { }; x347(function named() { return [d1, d2] });
+>x347 : Symbol(x347, Decl(generatedContextualTyping.ts, 345, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 345, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x348 : Symbol(x348, Decl(generatedContextualTyping.ts, 345, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x347 : Symbol(x347, Decl(generatedContextualTyping.ts, 345, 3))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 345, 47))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x349 = function(n: { (): Base[]; }) { }; x349(function() { return [d1, d2] });
->x349 : Symbol(x349, Decl(generatedContextualTyping.ts, 346, 3))
+var x348 = function(n: { (): Base[]; }) { }; x348(() => [d1, d2]);
+>x348 : Symbol(x348, Decl(generatedContextualTyping.ts, 346, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 346, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x349 : Symbol(x349, Decl(generatedContextualTyping.ts, 346, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x348 : Symbol(x348, Decl(generatedContextualTyping.ts, 346, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x350 = function(n: { (): Base[]; }) { }; x350(function named() { return [d1, d2] });
->x350 : Symbol(x350, Decl(generatedContextualTyping.ts, 347, 3))
+var x349 = function(n: { (): Base[]; }) { }; x349(function() { return [d1, d2] });
+>x349 : Symbol(x349, Decl(generatedContextualTyping.ts, 347, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 347, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x350 : Symbol(x350, Decl(generatedContextualTyping.ts, 347, 3))
->named : Symbol(named, Decl(generatedContextualTyping.ts, 347, 50))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x349 : Symbol(x349, Decl(generatedContextualTyping.ts, 347, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
-var x351 = function(n: Base[]) { }; x351([d1, d2]);
->x351 : Symbol(x351, Decl(generatedContextualTyping.ts, 348, 3))
+var x350 = function(n: { (): Base[]; }) { }; x350(function named() { return [d1, d2] });
+>x350 : Symbol(x350, Decl(generatedContextualTyping.ts, 348, 3))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 348, 20))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x351 : Symbol(x351, Decl(generatedContextualTyping.ts, 348, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x350 : Symbol(x350, Decl(generatedContextualTyping.ts, 348, 3))
+>named : Symbol(named, Decl(generatedContextualTyping.ts, 348, 50))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
+
+var x351 = function(n: Base[]) { }; x351([d1, d2]);
+>x351 : Symbol(x351, Decl(generatedContextualTyping.ts, 349, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 349, 20))
+>Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
+>x351 : Symbol(x351, Decl(generatedContextualTyping.ts, 349, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x352 = function(n: Array<Base>) { }; x352([d1, d2]);
->x352 : Symbol(x352, Decl(generatedContextualTyping.ts, 349, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 349, 20))
+>x352 : Symbol(x352, Decl(generatedContextualTyping.ts, 350, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 350, 20))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x352 : Symbol(x352, Decl(generatedContextualTyping.ts, 349, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x352 : Symbol(x352, Decl(generatedContextualTyping.ts, 350, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]);
->x353 : Symbol(x353, Decl(generatedContextualTyping.ts, 350, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 350, 20))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 350, 26))
+>x353 : Symbol(x353, Decl(generatedContextualTyping.ts, 351, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 351, 20))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 351, 26))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x353 : Symbol(x353, Decl(generatedContextualTyping.ts, 350, 3))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x353 : Symbol(x353, Decl(generatedContextualTyping.ts, 351, 3))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x354 = function(n: {n: Base[]; } ) { }; x354({ n: [d1, d2] });
->x354 : Symbol(x354, Decl(generatedContextualTyping.ts, 351, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 351, 20))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 351, 24))
+>x354 : Symbol(x354, Decl(generatedContextualTyping.ts, 352, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 20))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x354 : Symbol(x354, Decl(generatedContextualTyping.ts, 351, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 351, 50))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x354 : Symbol(x354, Decl(generatedContextualTyping.ts, 352, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 50))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; return null; });
->x355 : Symbol(x355, Decl(generatedContextualTyping.ts, 352, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 20))
->s : Symbol(s, Decl(generatedContextualTyping.ts, 352, 24))
+>x355 : Symbol(x355, Decl(generatedContextualTyping.ts, 353, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 353, 20))
+>s : Symbol(s, Decl(generatedContextualTyping.ts, 353, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x355 : Symbol(x355, Decl(generatedContextualTyping.ts, 352, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 53), Decl(generatedContextualTyping.ts, 352, 63))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 53), Decl(generatedContextualTyping.ts, 352, 63))
+>x355 : Symbol(x355, Decl(generatedContextualTyping.ts, 353, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 353, 53), Decl(generatedContextualTyping.ts, 353, 63))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 353, 53), Decl(generatedContextualTyping.ts, 353, 63))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 
 var x356 = function(n: Genric<Base>) { }; x356({ func: n => { return [d1, d2]; } });
->x356 : Symbol(x356, Decl(generatedContextualTyping.ts, 353, 3))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 353, 20))
->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42))
+>x356 : Symbol(x356, Decl(generatedContextualTyping.ts, 354, 3))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 354, 20))
+>Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->x356 : Symbol(x356, Decl(generatedContextualTyping.ts, 353, 3))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 353, 48))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 353, 54))
->d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19))
->d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40))
+>x356 : Symbol(x356, Decl(generatedContextualTyping.ts, 354, 3))
+>func : Symbol(func, Decl(generatedContextualTyping.ts, 354, 48))
+>n : Symbol(n, Decl(generatedContextualTyping.ts, 354, 54))
+>d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
+>d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index e8f434d31a8..2e9625cdb8b 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts ===
+
 class Base { private p; }
 >Base : Base
 >p : any
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.js b/tests/baselines/reference/genericClassExpressionInFunction.js
new file mode 100644
index 00000000000..bb45587eea1
--- /dev/null
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -0,0 +1,104 @@
+//// [genericClassExpressionInFunction.ts]
+class A<T> {
+    genericVar: T
+}
+function B1<U>() {
+    // class expression can use T
+    return class extends A<U> { }
+}
+class B2<V> {
+    anon = class extends A<V> { }
+}
+function B3<W>() {
+    return class Inner<TInner> extends A<W> { }
+}
+// extends can call B
+class K extends B1<number>() {
+    namae: string;
+}
+class C extends (new B2<number>().anon) {
+    name: string;
+}
+let b3Number = B3<number>();
+class S extends b3Number<string> {
+    nom: string;
+}
+var c = new C();
+var k = new K();
+var s = new S();
+c.genericVar = 12;
+k.genericVar = 12;
+s.genericVar = 12;
+
+
+//// [genericClassExpressionInFunction.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var A = (function () {
+    function A() {
+    }
+    return A;
+})();
+function B1() {
+    // class expression can use T
+    return (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            _super.apply(this, arguments);
+        }
+        return class_1;
+    })(A);
+}
+var B2 = (function () {
+    function B2() {
+        this.anon = (function (_super) {
+            __extends(class_2, _super);
+            function class_2() {
+                _super.apply(this, arguments);
+            }
+            return class_2;
+        })(A);
+    }
+    return B2;
+})();
+function B3() {
+    return (function (_super) {
+        __extends(Inner, _super);
+        function Inner() {
+            _super.apply(this, arguments);
+        }
+        return Inner;
+    })(A);
+}
+// extends can call B
+var K = (function (_super) {
+    __extends(K, _super);
+    function K() {
+        _super.apply(this, arguments);
+    }
+    return K;
+})(B1());
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    return C;
+})((new B2().anon));
+var b3Number = B3();
+var S = (function (_super) {
+    __extends(S, _super);
+    function S() {
+        _super.apply(this, arguments);
+    }
+    return S;
+})(b3Number);
+var c = new C();
+var k = new K();
+var s = new S();
+c.genericVar = 12;
+k.genericVar = 12;
+s.genericVar = 12;
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.symbols b/tests/baselines/reference/genericClassExpressionInFunction.symbols
new file mode 100644
index 00000000000..b5a6b8c6c70
--- /dev/null
+++ b/tests/baselines/reference/genericClassExpressionInFunction.symbols
@@ -0,0 +1,92 @@
+=== tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts ===
+class A<T> {
+>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0))
+>T : Symbol(T, Decl(genericClassExpressionInFunction.ts, 0, 8))
+
+    genericVar: T
+>genericVar : Symbol(genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+>T : Symbol(T, Decl(genericClassExpressionInFunction.ts, 0, 8))
+}
+function B1<U>() {
+>B1 : Symbol(B1, Decl(genericClassExpressionInFunction.ts, 2, 1))
+>U : Symbol(U, Decl(genericClassExpressionInFunction.ts, 3, 12))
+
+    // class expression can use T
+    return class extends A<U> { }
+>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0))
+>U : Symbol(U, Decl(genericClassExpressionInFunction.ts, 3, 12))
+}
+class B2<V> {
+>B2 : Symbol(B2, Decl(genericClassExpressionInFunction.ts, 6, 1))
+>V : Symbol(V, Decl(genericClassExpressionInFunction.ts, 7, 9))
+
+    anon = class extends A<V> { }
+>anon : Symbol(anon, Decl(genericClassExpressionInFunction.ts, 7, 13))
+>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0))
+>V : Symbol(V, Decl(genericClassExpressionInFunction.ts, 7, 9))
+}
+function B3<W>() {
+>B3 : Symbol(B3, Decl(genericClassExpressionInFunction.ts, 9, 1))
+>W : Symbol(W, Decl(genericClassExpressionInFunction.ts, 10, 12))
+
+    return class Inner<TInner> extends A<W> { }
+>Inner : Symbol(Inner, Decl(genericClassExpressionInFunction.ts, 11, 10))
+>TInner : Symbol(TInner, Decl(genericClassExpressionInFunction.ts, 11, 23))
+>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0))
+>W : Symbol(W, Decl(genericClassExpressionInFunction.ts, 10, 12))
+}
+// extends can call B
+class K extends B1<number>() {
+>K : Symbol(K, Decl(genericClassExpressionInFunction.ts, 12, 1))
+>B1 : Symbol(B1, Decl(genericClassExpressionInFunction.ts, 2, 1))
+
+    namae: string;
+>namae : Symbol(namae, Decl(genericClassExpressionInFunction.ts, 14, 30))
+}
+class C extends (new B2<number>().anon) {
+>C : Symbol(C, Decl(genericClassExpressionInFunction.ts, 16, 1))
+>new B2<number>().anon : Symbol(B2.anon, Decl(genericClassExpressionInFunction.ts, 7, 13))
+>B2 : Symbol(B2, Decl(genericClassExpressionInFunction.ts, 6, 1))
+>anon : Symbol(B2.anon, Decl(genericClassExpressionInFunction.ts, 7, 13))
+
+    name: string;
+>name : Symbol(name, Decl(genericClassExpressionInFunction.ts, 17, 41))
+}
+let b3Number = B3<number>();
+>b3Number : Symbol(b3Number, Decl(genericClassExpressionInFunction.ts, 20, 3))
+>B3 : Symbol(B3, Decl(genericClassExpressionInFunction.ts, 9, 1))
+
+class S extends b3Number<string> {
+>S : Symbol(S, Decl(genericClassExpressionInFunction.ts, 20, 28))
+>b3Number : Symbol(b3Number, Decl(genericClassExpressionInFunction.ts, 20, 3))
+
+    nom: string;
+>nom : Symbol(nom, Decl(genericClassExpressionInFunction.ts, 21, 34))
+}
+var c = new C();
+>c : Symbol(c, Decl(genericClassExpressionInFunction.ts, 24, 3))
+>C : Symbol(C, Decl(genericClassExpressionInFunction.ts, 16, 1))
+
+var k = new K();
+>k : Symbol(k, Decl(genericClassExpressionInFunction.ts, 25, 3))
+>K : Symbol(K, Decl(genericClassExpressionInFunction.ts, 12, 1))
+
+var s = new S();
+>s : Symbol(s, Decl(genericClassExpressionInFunction.ts, 26, 3))
+>S : Symbol(S, Decl(genericClassExpressionInFunction.ts, 20, 28))
+
+c.genericVar = 12;
+>c.genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+>c : Symbol(c, Decl(genericClassExpressionInFunction.ts, 24, 3))
+>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+
+k.genericVar = 12;
+>k.genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+>k : Symbol(k, Decl(genericClassExpressionInFunction.ts, 25, 3))
+>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+
+s.genericVar = 12;
+>s.genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+>s : Symbol(s, Decl(genericClassExpressionInFunction.ts, 26, 3))
+>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.types b/tests/baselines/reference/genericClassExpressionInFunction.types
new file mode 100644
index 00000000000..943391fdd59
--- /dev/null
+++ b/tests/baselines/reference/genericClassExpressionInFunction.types
@@ -0,0 +1,108 @@
+=== tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts ===
+class A<T> {
+>A : A<T>
+>T : T
+
+    genericVar: T
+>genericVar : T
+>T : T
+}
+function B1<U>() {
+>B1 : <U>() => typeof (Anonymous class)
+>U : U
+
+    // class expression can use T
+    return class extends A<U> { }
+>class extends A<U> { } : typeof (Anonymous class)
+>A : A<U>
+>U : U
+}
+class B2<V> {
+>B2 : B2<V>
+>V : V
+
+    anon = class extends A<V> { }
+>anon : typeof (Anonymous class)
+>class extends A<V> { } : typeof (Anonymous class)
+>A : A<V>
+>V : V
+}
+function B3<W>() {
+>B3 : <W>() => typeof Inner
+>W : W
+
+    return class Inner<TInner> extends A<W> { }
+>class Inner<TInner> extends A<W> { } : typeof Inner
+>Inner : typeof Inner
+>TInner : TInner
+>A : A<W>
+>W : W
+}
+// extends can call B
+class K extends B1<number>() {
+>K : K
+>B1<number>() : B1<number>.(Anonymous class)
+>B1 : <U>() => typeof (Anonymous class)
+
+    namae: string;
+>namae : string
+}
+class C extends (new B2<number>().anon) {
+>C : C
+>(new B2<number>().anon) : B2<number>.(Anonymous class)
+>new B2<number>().anon : typeof (Anonymous class)
+>new B2<number>() : B2<number>
+>B2 : typeof B2
+>anon : typeof (Anonymous class)
+
+    name: string;
+>name : string
+}
+let b3Number = B3<number>();
+>b3Number : typeof Inner
+>B3<number>() : typeof Inner
+>B3 : <W>() => typeof Inner
+
+class S extends b3Number<string> {
+>S : S
+>b3Number : B3<number>.Inner<string>
+
+    nom: string;
+>nom : string
+}
+var c = new C();
+>c : C
+>new C() : C
+>C : typeof C
+
+var k = new K();
+>k : K
+>new K() : K
+>K : typeof K
+
+var s = new S();
+>s : S
+>new S() : S
+>S : typeof S
+
+c.genericVar = 12;
+>c.genericVar = 12 : number
+>c.genericVar : number
+>c : C
+>genericVar : number
+>12 : number
+
+k.genericVar = 12;
+>k.genericVar = 12 : number
+>k.genericVar : number
+>k : K
+>genericVar : number
+>12 : number
+
+s.genericVar = 12;
+>s.genericVar = 12 : number
+>s.genericVar : number
+>s : S
+>genericVar : number
+>12 : number
+
diff --git a/tests/baselines/reference/getEmitOutputMapRoots.baseline b/tests/baselines/reference/getEmitOutputMapRoots.baseline
index b4a4ace4d42..66130347d2d 100644
--- a/tests/baselines/reference/getEmitOutputMapRoots.baseline
+++ b/tests/baselines/reference/getEmitOutputMapRoots.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : declSingleFile.js.map
-{"version":3,"file":"declSingleFile.js","sourceRoot":"","sources":["../tests/cases/fourslash/inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : declSingleFile.js
+{"version":3,"file":"declSingleFile.js","sourceRoot":"","sources":["../inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : declSingleFile.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {
@@ -8,4 +8,4 @@ var M = (function () {
     }
     return M;
 })();
-//# sourceMappingURL=mapRootDir/declSingleFile.js.map
+//# sourceMappingURL=tests/cases/fourslash/mapRootDir/declSingleFile.js.map
diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
index c796f8e78bc..57b55c8a1f8 100644
--- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
+++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
@@ -17,9 +17,9 @@ declare class Bar {
 
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile2.js.map
-{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,KAAC,IAAI,GAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js
+{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,IAAC,IAAI,EAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js
 var y = "my div";
-var x = React.createElement("div", {"name": y});
+var x = React.createElement("div", {name: y});
 //# sourceMappingURL=inputFile2.js.mapFileName : tests/cases/fourslash/inputFile2.d.ts
 declare var y: string;
 declare var x: any;
diff --git a/tests/baselines/reference/getterMissingReturnError.errors.txt b/tests/baselines/reference/getterMissingReturnError.errors.txt
index 8900cc5e78f..e504de07ef4 100644
--- a/tests/baselines/reference/getterMissingReturnError.errors.txt
+++ b/tests/baselines/reference/getterMissingReturnError.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/getterMissingReturnError.ts(2,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/getterMissingReturnError.ts(2,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/getterMissingReturnError.ts(2,16): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/compiler/getterMissingReturnError.ts (2 errors) ====
@@ -8,7 +8,7 @@ tests/cases/compiler/getterMissingReturnError.ts(2,16): error TS2378: A 'get' ac
                    ~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
                    ~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     
         }
     }
diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js
index 020d3f053d1..a2553c674b0 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -1,4 +1,5 @@
 //// [ifDoWhileStatements.ts]
+
 interface I {
     id: number;
 }
diff --git a/tests/baselines/reference/ifDoWhileStatements.symbols b/tests/baselines/reference/ifDoWhileStatements.symbols
index e2b375cb54b..80c8fc7f1d8 100644
--- a/tests/baselines/reference/ifDoWhileStatements.symbols
+++ b/tests/baselines/reference/ifDoWhileStatements.symbols
@@ -1,92 +1,93 @@
 === tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts ===
+
 interface I {
 >I : Symbol(I, Decl(ifDoWhileStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(ifDoWhileStatements.ts, 0, 13))
+>id : Symbol(id, Decl(ifDoWhileStatements.ts, 1, 13))
 }
 
 class C implements I {
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 >I : Symbol(I, Decl(ifDoWhileStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(ifDoWhileStatements.ts, 4, 22))
+>id : Symbol(id, Decl(ifDoWhileStatements.ts, 5, 22))
 
     name: string;
->name : Symbol(name, Decl(ifDoWhileStatements.ts, 5, 15))
+>name : Symbol(name, Decl(ifDoWhileStatements.ts, 6, 15))
 }
 
 class C2 extends C {
->C2 : Symbol(C2, Decl(ifDoWhileStatements.ts, 7, 1))
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>C2 : Symbol(C2, Decl(ifDoWhileStatements.ts, 8, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
     valid: boolean;
->valid : Symbol(valid, Decl(ifDoWhileStatements.ts, 9, 20))
+>valid : Symbol(valid, Decl(ifDoWhileStatements.ts, 10, 20))
 }
 
 class D<T>{
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->T : Symbol(T, Decl(ifDoWhileStatements.ts, 13, 8))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 
     source: T;
->source : Symbol(source, Decl(ifDoWhileStatements.ts, 13, 11))
->T : Symbol(T, Decl(ifDoWhileStatements.ts, 13, 8))
+>source : Symbol(source, Decl(ifDoWhileStatements.ts, 14, 11))
+>T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(ifDoWhileStatements.ts, 14, 14))
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->T : Symbol(T, Decl(ifDoWhileStatements.ts, 13, 8))
+>recurse : Symbol(recurse, Decl(ifDoWhileStatements.ts, 15, 14))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(ifDoWhileStatements.ts, 15, 18))
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->T : Symbol(T, Decl(ifDoWhileStatements.ts, 13, 8))
+>wrapped : Symbol(wrapped, Decl(ifDoWhileStatements.ts, 16, 18))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 }
 
 function F(x: string): number { return 42; }
->F : Symbol(F, Decl(ifDoWhileStatements.ts, 17, 1))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 19, 11))
+>F : Symbol(F, Decl(ifDoWhileStatements.ts, 18, 1))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 20, 11))
 
 function F2(x: number): boolean { return x < 42; }
->F2 : Symbol(F2, Decl(ifDoWhileStatements.ts, 19, 44))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 20, 12))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 20, 12))
+>F2 : Symbol(F2, Decl(ifDoWhileStatements.ts, 20, 44))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 21, 12))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 21, 12))
 
 module M {
->M : Symbol(M, Decl(ifDoWhileStatements.ts, 20, 50))
+>M : Symbol(M, Decl(ifDoWhileStatements.ts, 21, 50))
 
     export class A {
->A : Symbol(A, Decl(ifDoWhileStatements.ts, 22, 10))
+>A : Symbol(A, Decl(ifDoWhileStatements.ts, 23, 10))
 
         name: string;
->name : Symbol(name, Decl(ifDoWhileStatements.ts, 23, 20))
+>name : Symbol(name, Decl(ifDoWhileStatements.ts, 24, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : Symbol(F2, Decl(ifDoWhileStatements.ts, 25, 5))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 27, 23))
+>F2 : Symbol(F2, Decl(ifDoWhileStatements.ts, 26, 5))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 28, 23))
 >x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 27, 23))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 28, 23))
 >toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
 }
 
 module N {
->N : Symbol(N, Decl(ifDoWhileStatements.ts, 28, 1))
+>N : Symbol(N, Decl(ifDoWhileStatements.ts, 29, 1))
 
     export class A {
->A : Symbol(A, Decl(ifDoWhileStatements.ts, 30, 10))
+>A : Symbol(A, Decl(ifDoWhileStatements.ts, 31, 10))
 
         id: number;
->id : Symbol(id, Decl(ifDoWhileStatements.ts, 31, 20))
+>id : Symbol(id, Decl(ifDoWhileStatements.ts, 32, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : Symbol(F2, Decl(ifDoWhileStatements.ts, 33, 5))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 35, 23))
+>F2 : Symbol(F2, Decl(ifDoWhileStatements.ts, 34, 5))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 36, 23))
 >x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 35, 23))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 36, 23))
 >toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
 }
 
@@ -137,200 +138,200 @@ while ({}) { }
 do { }while({})
 
 if ({ x: 1, y: 'a' }) { }
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 79, 5))
->y : Symbol(y, Decl(ifDoWhileStatements.ts, 79, 11))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 80, 5))
+>y : Symbol(y, Decl(ifDoWhileStatements.ts, 80, 11))
 
 while ({ x: 1, y: 'a' }) { }
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 80, 8))
->y : Symbol(y, Decl(ifDoWhileStatements.ts, 80, 14))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 81, 8))
+>y : Symbol(y, Decl(ifDoWhileStatements.ts, 81, 14))
 
 do { }while({ x: 1, y: 'a' })
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 81, 13))
->y : Symbol(y, Decl(ifDoWhileStatements.ts, 81, 19))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 82, 13))
+>y : Symbol(y, Decl(ifDoWhileStatements.ts, 82, 19))
 
 if (() => 43) { }
 while (() => 43) { }
 do { }while(() => 43)
 
 if (new C()) { }
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
 while (new C()) { }
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
 do { }while(new C())
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
 if (new D<C>()) { }
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
 while (new D<C>()) { }
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
 do { }while(new D<C>())
->D : Symbol(D, Decl(ifDoWhileStatements.ts, 11, 1))
->C : Symbol(C, Decl(ifDoWhileStatements.ts, 2, 1))
+>D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
+>C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
 // references
 var a = true;
->a : Symbol(a, Decl(ifDoWhileStatements.ts, 96, 3))
+>a : Symbol(a, Decl(ifDoWhileStatements.ts, 97, 3))
 
 if (a) { }
->a : Symbol(a, Decl(ifDoWhileStatements.ts, 96, 3))
+>a : Symbol(a, Decl(ifDoWhileStatements.ts, 97, 3))
 
 while (a) { }
->a : Symbol(a, Decl(ifDoWhileStatements.ts, 96, 3))
+>a : Symbol(a, Decl(ifDoWhileStatements.ts, 97, 3))
 
 do { }while(a)
->a : Symbol(a, Decl(ifDoWhileStatements.ts, 96, 3))
+>a : Symbol(a, Decl(ifDoWhileStatements.ts, 97, 3))
 
 var b = null;
->b : Symbol(b, Decl(ifDoWhileStatements.ts, 101, 3))
+>b : Symbol(b, Decl(ifDoWhileStatements.ts, 102, 3))
 
 if (b) { }
->b : Symbol(b, Decl(ifDoWhileStatements.ts, 101, 3))
+>b : Symbol(b, Decl(ifDoWhileStatements.ts, 102, 3))
 
 while (b) { }
->b : Symbol(b, Decl(ifDoWhileStatements.ts, 101, 3))
+>b : Symbol(b, Decl(ifDoWhileStatements.ts, 102, 3))
 
 do { }while(b)
->b : Symbol(b, Decl(ifDoWhileStatements.ts, 101, 3))
+>b : Symbol(b, Decl(ifDoWhileStatements.ts, 102, 3))
 
 var c = undefined;
->c : Symbol(c, Decl(ifDoWhileStatements.ts, 106, 3))
+>c : Symbol(c, Decl(ifDoWhileStatements.ts, 107, 3))
 >undefined : Symbol(undefined)
 
 if (c) { }
->c : Symbol(c, Decl(ifDoWhileStatements.ts, 106, 3))
+>c : Symbol(c, Decl(ifDoWhileStatements.ts, 107, 3))
 
 while (c) { }
->c : Symbol(c, Decl(ifDoWhileStatements.ts, 106, 3))
+>c : Symbol(c, Decl(ifDoWhileStatements.ts, 107, 3))
 
 do { }while(c)
->c : Symbol(c, Decl(ifDoWhileStatements.ts, 106, 3))
+>c : Symbol(c, Decl(ifDoWhileStatements.ts, 107, 3))
 
 var d = 0.0;
->d : Symbol(d, Decl(ifDoWhileStatements.ts, 111, 3))
+>d : Symbol(d, Decl(ifDoWhileStatements.ts, 112, 3))
 
 if (d) { }
->d : Symbol(d, Decl(ifDoWhileStatements.ts, 111, 3))
+>d : Symbol(d, Decl(ifDoWhileStatements.ts, 112, 3))
 
 while (d) { }
->d : Symbol(d, Decl(ifDoWhileStatements.ts, 111, 3))
+>d : Symbol(d, Decl(ifDoWhileStatements.ts, 112, 3))
 
 do { }while(d)
->d : Symbol(d, Decl(ifDoWhileStatements.ts, 111, 3))
+>d : Symbol(d, Decl(ifDoWhileStatements.ts, 112, 3))
 
 var e = 'a string';
->e : Symbol(e, Decl(ifDoWhileStatements.ts, 116, 3))
+>e : Symbol(e, Decl(ifDoWhileStatements.ts, 117, 3))
 
 if (e) { }
->e : Symbol(e, Decl(ifDoWhileStatements.ts, 116, 3))
+>e : Symbol(e, Decl(ifDoWhileStatements.ts, 117, 3))
 
 while (e) { }
->e : Symbol(e, Decl(ifDoWhileStatements.ts, 116, 3))
+>e : Symbol(e, Decl(ifDoWhileStatements.ts, 117, 3))
 
 do { }while(e)
->e : Symbol(e, Decl(ifDoWhileStatements.ts, 116, 3))
+>e : Symbol(e, Decl(ifDoWhileStatements.ts, 117, 3))
 
 var f = '';
->f : Symbol(f, Decl(ifDoWhileStatements.ts, 121, 3))
+>f : Symbol(f, Decl(ifDoWhileStatements.ts, 122, 3))
 
 if (f) { }
->f : Symbol(f, Decl(ifDoWhileStatements.ts, 121, 3))
+>f : Symbol(f, Decl(ifDoWhileStatements.ts, 122, 3))
 
 while (f) { }
->f : Symbol(f, Decl(ifDoWhileStatements.ts, 121, 3))
+>f : Symbol(f, Decl(ifDoWhileStatements.ts, 122, 3))
 
 do { }while(f)
->f : Symbol(f, Decl(ifDoWhileStatements.ts, 121, 3))
+>f : Symbol(f, Decl(ifDoWhileStatements.ts, 122, 3))
 
 var g = /[a-z]/
->g : Symbol(g, Decl(ifDoWhileStatements.ts, 126, 3))
+>g : Symbol(g, Decl(ifDoWhileStatements.ts, 127, 3))
 
 if (g) { }
->g : Symbol(g, Decl(ifDoWhileStatements.ts, 126, 3))
+>g : Symbol(g, Decl(ifDoWhileStatements.ts, 127, 3))
 
 while (g) { }
->g : Symbol(g, Decl(ifDoWhileStatements.ts, 126, 3))
+>g : Symbol(g, Decl(ifDoWhileStatements.ts, 127, 3))
 
 do { }while(g)
->g : Symbol(g, Decl(ifDoWhileStatements.ts, 126, 3))
+>g : Symbol(g, Decl(ifDoWhileStatements.ts, 127, 3))
 
 var h = [];
->h : Symbol(h, Decl(ifDoWhileStatements.ts, 131, 3))
+>h : Symbol(h, Decl(ifDoWhileStatements.ts, 132, 3))
 
 if (h) { }
->h : Symbol(h, Decl(ifDoWhileStatements.ts, 131, 3))
+>h : Symbol(h, Decl(ifDoWhileStatements.ts, 132, 3))
 
 while (h) { }
->h : Symbol(h, Decl(ifDoWhileStatements.ts, 131, 3))
+>h : Symbol(h, Decl(ifDoWhileStatements.ts, 132, 3))
 
 do { }while(h)
->h : Symbol(h, Decl(ifDoWhileStatements.ts, 131, 3))
+>h : Symbol(h, Decl(ifDoWhileStatements.ts, 132, 3))
 
 var i = [1, 2];
->i : Symbol(i, Decl(ifDoWhileStatements.ts, 136, 3))
+>i : Symbol(i, Decl(ifDoWhileStatements.ts, 137, 3))
 
 if (i) { }
->i : Symbol(i, Decl(ifDoWhileStatements.ts, 136, 3))
+>i : Symbol(i, Decl(ifDoWhileStatements.ts, 137, 3))
 
 while (i) { }
->i : Symbol(i, Decl(ifDoWhileStatements.ts, 136, 3))
+>i : Symbol(i, Decl(ifDoWhileStatements.ts, 137, 3))
 
 do { }while(i)
->i : Symbol(i, Decl(ifDoWhileStatements.ts, 136, 3))
+>i : Symbol(i, Decl(ifDoWhileStatements.ts, 137, 3))
 
 var j = {};
->j : Symbol(j, Decl(ifDoWhileStatements.ts, 141, 3))
+>j : Symbol(j, Decl(ifDoWhileStatements.ts, 142, 3))
 
 if (j) { }
->j : Symbol(j, Decl(ifDoWhileStatements.ts, 141, 3))
+>j : Symbol(j, Decl(ifDoWhileStatements.ts, 142, 3))
 
 while (j) { }
->j : Symbol(j, Decl(ifDoWhileStatements.ts, 141, 3))
+>j : Symbol(j, Decl(ifDoWhileStatements.ts, 142, 3))
 
 do { }while(j)
->j : Symbol(j, Decl(ifDoWhileStatements.ts, 141, 3))
+>j : Symbol(j, Decl(ifDoWhileStatements.ts, 142, 3))
 
 var k = { x: 1, y: 'a' };
->k : Symbol(k, Decl(ifDoWhileStatements.ts, 146, 3))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 146, 9))
->y : Symbol(y, Decl(ifDoWhileStatements.ts, 146, 15))
+>k : Symbol(k, Decl(ifDoWhileStatements.ts, 147, 3))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 147, 9))
+>y : Symbol(y, Decl(ifDoWhileStatements.ts, 147, 15))
 
 if (k) { }
->k : Symbol(k, Decl(ifDoWhileStatements.ts, 146, 3))
+>k : Symbol(k, Decl(ifDoWhileStatements.ts, 147, 3))
 
 while (k) { }
->k : Symbol(k, Decl(ifDoWhileStatements.ts, 146, 3))
+>k : Symbol(k, Decl(ifDoWhileStatements.ts, 147, 3))
 
 do { }while(k)
->k : Symbol(k, Decl(ifDoWhileStatements.ts, 146, 3))
+>k : Symbol(k, Decl(ifDoWhileStatements.ts, 147, 3))
 
 function fn(x?: string): I { return null; }
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
->x : Symbol(x, Decl(ifDoWhileStatements.ts, 151, 12))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
+>x : Symbol(x, Decl(ifDoWhileStatements.ts, 152, 12))
 >I : Symbol(I, Decl(ifDoWhileStatements.ts, 0, 0))
 
 if (fn()) { }
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
 
 while (fn()) { }
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
 
 do { }while(fn())
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
 
 if (fn) { }
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
 
 while (fn) { }
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
 
 do { }while(fn)
->fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 149, 14))
+>fn : Symbol(fn, Decl(ifDoWhileStatements.ts, 150, 14))
 
 
 
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index 92a9df6a4dd..660eaa4fb63 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts ===
+
 interface I {
 >I : I
 
diff --git a/tests/baselines/reference/ifElseWithStatements1.errors.txt b/tests/baselines/reference/ifElseWithStatements1.errors.txt
index 186cff59241..5dc4d9b0db5 100644
--- a/tests/baselines/reference/ifElseWithStatements1.errors.txt
+++ b/tests/baselines/reference/ifElseWithStatements1.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/compiler/ifElseWithStatements1.ts(2,5): error TS2304: Cannot find name 'f'.
-tests/cases/compiler/ifElseWithStatements1.ts(4,5): error TS2304: Cannot find name 'f'.
+tests/cases/compiler/ifElseWithStatements1.ts(3,5): error TS2304: Cannot find name 'f'.
+tests/cases/compiler/ifElseWithStatements1.ts(5,5): error TS2304: Cannot find name 'f'.
 
 
 ==== tests/cases/compiler/ifElseWithStatements1.ts (2 errors) ====
+    
     if (true)
         f();
         ~
diff --git a/tests/baselines/reference/ifElseWithStatements1.js b/tests/baselines/reference/ifElseWithStatements1.js
index 506e7e6a330..47df08d46ba 100644
--- a/tests/baselines/reference/ifElseWithStatements1.js
+++ b/tests/baselines/reference/ifElseWithStatements1.js
@@ -1,4 +1,5 @@
 //// [ifElseWithStatements1.ts]
+
 if (true)
     f();
 else
diff --git a/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt b/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt
index 99819ecad2c..bab58d0e4cf 100644
--- a/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt
+++ b/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts(1,10): error TS2354: No best common type exists among return expressions.
+tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts(2,10): error TS2354: No best common type exists among return expressions.
 
 
 ==== tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts (1 errors) ====
+    
     function foo() {
              ~~~
 !!! error TS2354: No best common type exists among return expressions.
diff --git a/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.js b/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.js
index ba528d4c133..2993a331fee 100644
--- a/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.js
+++ b/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.js
@@ -1,4 +1,5 @@
 //// [inferredFunctionReturnTypeIsEmptyType.ts]
+
 function foo() {
     if (true) {
         return 42;
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.errors.txt b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.errors.txt
index 08aab5b1158..787b95f2297 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.errors.txt
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts(2,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts(5,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts(3,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts(6,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 
 
 ==== tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts (2 errors) ====
+    
     class a {
         static get x(): () => string {
                    ~
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
index b81b6cd1d78..fa9c6e2a8b5 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -1,4 +1,5 @@
 //// [inheritanceStaticPropertyOverridingAccessor.ts]
+
 class a {
     static get x(): () => string {
         return null;;
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
index dc8b9b465d8..563cb58a755 100644
--- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
+++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
@@ -11,7 +11,7 @@ interface B extends A {
 >A : A
 
   (key:'foo'):string;
->key : 'foo'
+>key : "foo"
 }
 
 var b:B;
@@ -24,7 +24,7 @@ b('foo').charAt(0);
 >b('foo').charAt : (pos: number) => string
 >b('foo') : string
 >b : B
->'foo' : string
+>'foo' : "foo"
 >charAt : (pos: number) => string
 >0 : number
 
@@ -32,7 +32,7 @@ interface A {
 >A : A
 
     (x: 'A1'): string;
->x : 'A1'
+>x : "A1"
 
     (x: string): void;
 >x : string
@@ -43,21 +43,21 @@ interface B extends A {
 >A : A
 
     (x: 'B1'): number;
->x : 'B1'
+>x : "B1"
 }
 
 interface A {
 >A : A
 
     (x: 'A2'): boolean;
->x : 'A2'
+>x : "A2"
 }
 
 interface B  {
 >B : B
 
     (x: 'B2'): string[];
->x : 'B2'
+>x : "B2"
 }
 
 interface C1 extends B {
@@ -65,7 +65,7 @@ interface C1 extends B {
 >B : B
 
 	(x: 'C1'): number[];
->x : 'C1'
+>x : "C1"
 }
 
 interface C2 extends B {
@@ -73,7 +73,7 @@ interface C2 extends B {
 >B : B
 
 	(x: 'C2'): boolean[];
->x : 'C2'
+>x : "C2"
 }
 
 interface C extends C1, C2 {
@@ -82,7 +82,7 @@ interface C extends C1, C2 {
 >C2 : C2
 
 	(x: 'C'): string;
->x : 'C'
+>x : "C"
 }
 
 var c: C;
@@ -94,25 +94,25 @@ var x1: string[] = c('B2');
 >x1 : string[]
 >c('B2') : string[]
 >c : C
->'B2' : string
+>'B2' : "B2"
 
 var x2: number = c('B1');
 >x2 : number
 >c('B1') : number
 >c : C
->'B1' : string
+>'B1' : "B1"
 
 var x3: boolean = c('A2');
 >x3 : boolean
 >c('A2') : boolean
 >c : C
->'A2' : string
+>'A2' : "A2"
 
 var x4: string = c('A1');
 >x4 : string
 >c('A1') : string
 >c : C
->'A1' : string
+>'A1' : "A1"
 
 var x5: void = c('A0');
 >x5 : void
@@ -124,19 +124,19 @@ var x6: number[] = c('C1');
 >x6 : number[]
 >c('C1') : number[]
 >c : C
->'C1' : string
+>'C1' : "C1"
 
 var x7: boolean[] = c('C2');
 >x7 : boolean[]
 >c('C2') : boolean[]
 >c : C
->'C2' : string
+>'C2' : "C2"
 
 var x8: string = c('C');
 >x8 : string
 >c('C') : string
 >c : C
->'C' : string
+>'C' : "C"
 
 var x9: void = c('generic');
 >x9 : void
diff --git a/tests/baselines/reference/inlineSourceMap2.errors.txt b/tests/baselines/reference/inlineSourceMap2.errors.txt
index 24b0fddf942..26db1415593 100644
--- a/tests/baselines/reference/inlineSourceMap2.errors.txt
+++ b/tests/baselines/reference/inlineSourceMap2.errors.txt
@@ -1,12 +1,10 @@
 error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
-error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSourceMap'.
 tests/cases/compiler/inlineSourceMap2.ts(5,1): error TS2304: Cannot find name 'console'.
 
 
 !!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 !!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
-!!! error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSourceMap'.
 ==== tests/cases/compiler/inlineSourceMap2.ts (1 errors) ====
     
     // configuration errors
diff --git a/tests/baselines/reference/interfaceExtendingClass2.errors.txt b/tests/baselines/reference/interfaceExtendingClass2.errors.txt
index 3b394d4922a..859cb65410e 100644
--- a/tests/baselines/reference/interfaceExtendingClass2.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClass2.errors.txt
@@ -1,10 +1,11 @@
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(11,5): error TS2411: Property 'a' of type '{ toString: () => {}; }' is not assignable to string index type 'Object'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(13,13): error TS1131: Property or signature expected.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(14,9): error TS1128: Declaration or statement expected.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(15,5): error TS1128: Declaration or statement expected.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(12,5): error TS2411: Property 'a' of type '{ toString: () => {}; }' is not assignable to string index type 'Object'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(14,13): error TS1131: Property or signature expected.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(15,9): error TS1128: Declaration or statement expected.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts(16,5): error TS1128: Declaration or statement expected.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts (4 errors) ====
+    
     class Foo {
         x: string;
         y() { }
diff --git a/tests/baselines/reference/interfaceExtendingClass2.js b/tests/baselines/reference/interfaceExtendingClass2.js
index 6e6605e2459..c4143659125 100644
--- a/tests/baselines/reference/interfaceExtendingClass2.js
+++ b/tests/baselines/reference/interfaceExtendingClass2.js
@@ -1,4 +1,5 @@
 //// [interfaceExtendingClass2.ts]
+
 class Foo {
     x: string;
     y() { }
diff --git a/tests/baselines/reference/interfaceWithPrivateMember.errors.txt b/tests/baselines/reference/interfaceWithPrivateMember.errors.txt
index 7f2542b45a1..dc1cfeabed5 100644
--- a/tests/baselines/reference/interfaceWithPrivateMember.errors.txt
+++ b/tests/baselines/reference/interfaceWithPrivateMember.errors.txt
@@ -1,11 +1,12 @@
-tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(4,5): error TS1131: Property or signature expected.
-tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(8,5): error TS1131: Property or signature expected.
-tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(12,5): error TS1131: Property or signature expected.
-tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(12,16): error TS2304: Cannot find name 'string'.
-tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(13,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(5,5): error TS1131: Property or signature expected.
+tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(9,5): error TS1131: Property or signature expected.
+tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(13,5): error TS1131: Property or signature expected.
+tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(13,16): error TS2304: Cannot find name 'string'.
+tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(14,1): error TS1128: Declaration or statement expected.
 
 
 ==== tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts (5 errors) ====
+    
     // interfaces do not permit private members, these are errors
     
     interface I {
diff --git a/tests/baselines/reference/interfaceWithPrivateMember.js b/tests/baselines/reference/interfaceWithPrivateMember.js
index 24c2cf9ecf5..ceb388b1eae 100644
--- a/tests/baselines/reference/interfaceWithPrivateMember.js
+++ b/tests/baselines/reference/interfaceWithPrivateMember.js
@@ -1,4 +1,5 @@
 //// [interfaceWithPrivateMember.ts]
+
 // interfaces do not permit private members, these are errors
 
 interface I {
diff --git a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
index 971b5e56907..5288d9f15a4 100644
--- a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
+++ b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
@@ -3,13 +3,13 @@ interface Foo {
 >Foo : Foo
 
     (x: 'a'): number;
->x : 'a'
+>x : "a"
 
     (x: string): any;
 >x : string
 
     new (x: 'a'): any;
->x : 'a'
+>x : "a"
 
     new (x: string): Object;
 >x : string
@@ -24,7 +24,7 @@ var r = f('a');
 >r : number
 >f('a') : number
 >f : Foo
->'a' : string
+>'a' : "a"
 
 var r2 = f('A');
 >r2 : any
@@ -36,7 +36,7 @@ var r3 = new f('a');
 >r3 : any
 >new f('a') : any
 >f : Foo
->'a' : string
+>'a' : "a"
 
 var r4 = new f('A');
 >r4 : Object
diff --git a/tests/baselines/reference/invalidDoWhileBreakStatements.errors.txt b/tests/baselines/reference/invalidDoWhileBreakStatements.errors.txt
index 65fd55b763b..15983bd1fc4 100644
--- a/tests/baselines/reference/invalidDoWhileBreakStatements.errors.txt
+++ b/tests/baselines/reference/invalidDoWhileBreakStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(4,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
-tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(8,4): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
-tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
-tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(37,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(5,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
+tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(9,4): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(28,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts(38,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
 
 
 ==== tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked break not allowed
diff --git a/tests/baselines/reference/invalidDoWhileBreakStatements.js b/tests/baselines/reference/invalidDoWhileBreakStatements.js
index 807d58a8fea..4f48a890aa6 100644
--- a/tests/baselines/reference/invalidDoWhileBreakStatements.js
+++ b/tests/baselines/reference/invalidDoWhileBreakStatements.js
@@ -1,4 +1,5 @@
 //// [invalidDoWhileBreakStatements.ts]
+
 // All errors
 
 // naked break not allowed
diff --git a/tests/baselines/reference/invalidDoWhileContinueStatements.errors.txt b/tests/baselines/reference/invalidDoWhileContinueStatements.errors.txt
index e9643394d12..3a520209293 100644
--- a/tests/baselines/reference/invalidDoWhileContinueStatements.errors.txt
+++ b/tests/baselines/reference/invalidDoWhileContinueStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(4,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(8,4): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(27,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(37,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(5,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(9,4): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(28,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts(38,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
 
 
 ==== tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked continue not allowed
diff --git a/tests/baselines/reference/invalidDoWhileContinueStatements.js b/tests/baselines/reference/invalidDoWhileContinueStatements.js
index 21a10a3451b..b77259159a9 100644
--- a/tests/baselines/reference/invalidDoWhileContinueStatements.js
+++ b/tests/baselines/reference/invalidDoWhileContinueStatements.js
@@ -1,4 +1,5 @@
 //// [invalidDoWhileContinueStatements.ts]
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/baselines/reference/invalidForBreakStatements.errors.txt b/tests/baselines/reference/invalidForBreakStatements.errors.txt
index 50e4013c0ea..57ae1d32c8e 100644
--- a/tests/baselines/reference/invalidForBreakStatements.errors.txt
+++ b/tests/baselines/reference/invalidForBreakStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(4,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
-tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(8,9): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
-tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
-tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(36,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(5,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
+tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(9,9): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(28,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts(37,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
 
 
 ==== tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked break not allowed
diff --git a/tests/baselines/reference/invalidForBreakStatements.js b/tests/baselines/reference/invalidForBreakStatements.js
index 5e3430ecb41..50096e16720 100644
--- a/tests/baselines/reference/invalidForBreakStatements.js
+++ b/tests/baselines/reference/invalidForBreakStatements.js
@@ -1,4 +1,5 @@
 //// [invalidForBreakStatements.ts]
+
 // All errors
 
 // naked break not allowed
diff --git a/tests/baselines/reference/invalidForContinueStatements.errors.txt b/tests/baselines/reference/invalidForContinueStatements.errors.txt
index 3af47370df1..9ebfae57e9f 100644
--- a/tests/baselines/reference/invalidForContinueStatements.errors.txt
+++ b/tests/baselines/reference/invalidForContinueStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(4,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(8,9): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(27,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(36,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(5,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(9,9): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(28,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts(37,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
 
 
 ==== tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked continue not allowed
diff --git a/tests/baselines/reference/invalidForContinueStatements.js b/tests/baselines/reference/invalidForContinueStatements.js
index 2db1ce69ede..7a3513bb2a3 100644
--- a/tests/baselines/reference/invalidForContinueStatements.js
+++ b/tests/baselines/reference/invalidForContinueStatements.js
@@ -1,4 +1,5 @@
 //// [invalidForContinueStatements.ts]
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/baselines/reference/invalidForInBreakStatements.errors.txt b/tests/baselines/reference/invalidForInBreakStatements.errors.txt
index d83304ab1c6..b1f5d64f973 100644
--- a/tests/baselines/reference/invalidForInBreakStatements.errors.txt
+++ b/tests/baselines/reference/invalidForInBreakStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(4,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
-tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(8,19): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
-tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
-tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(37,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(5,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
+tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(9,19): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(28,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts(38,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
 
 
 ==== tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked break not allowed
diff --git a/tests/baselines/reference/invalidForInBreakStatements.js b/tests/baselines/reference/invalidForInBreakStatements.js
index 1784b9a57a6..11517f2a020 100644
--- a/tests/baselines/reference/invalidForInBreakStatements.js
+++ b/tests/baselines/reference/invalidForInBreakStatements.js
@@ -1,4 +1,5 @@
 //// [invalidForInBreakStatements.ts]
+
 // All errors
 
 // naked break not allowed
diff --git a/tests/baselines/reference/invalidForInContinueStatements.errors.txt b/tests/baselines/reference/invalidForInContinueStatements.errors.txt
index 7353a22d9cd..f20d9c6e81c 100644
--- a/tests/baselines/reference/invalidForInContinueStatements.errors.txt
+++ b/tests/baselines/reference/invalidForInContinueStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(4,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(8,19): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(27,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(37,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(5,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(9,19): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(28,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts(38,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
 
 
 ==== tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked continue not allowed
diff --git a/tests/baselines/reference/invalidForInContinueStatements.js b/tests/baselines/reference/invalidForInContinueStatements.js
index 94020d00f2b..5eb0e10bf53 100644
--- a/tests/baselines/reference/invalidForInContinueStatements.js
+++ b/tests/baselines/reference/invalidForInContinueStatements.js
@@ -1,4 +1,5 @@
 //// [invalidForInContinueStatements.ts]
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/baselines/reference/invalidReturnStatements.errors.txt b/tests/baselines/reference/invalidReturnStatements.errors.txt
index 780166e07c2..6fbe961cd54 100644
--- a/tests/baselines/reference/invalidReturnStatements.errors.txt
+++ b/tests/baselines/reference/invalidReturnStatements.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(2,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(4,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(5,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(2,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(4,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(5,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,29): error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
   Property 'name' is missing in type '{ id: number; }'.
 tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,29): error TS2322: Type 'C' is not assignable to type 'D'.
@@ -12,16 +12,16 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(1
     // all the following should be error
     function fn1(): number {  }
                     ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function fn2(): string { }
                     ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function fn3(): boolean { }
                     ~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function fn4(): Date {  }
                     ~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function fn7(): any {  } // should be valid: any includes void
     
     interface I { id: number }
diff --git a/tests/baselines/reference/invalidThrowStatement.errors.txt b/tests/baselines/reference/invalidThrowStatement.errors.txt
index b30549a217c..3002bce2f1f 100644
--- a/tests/baselines/reference/invalidThrowStatement.errors.txt
+++ b/tests/baselines/reference/invalidThrowStatement.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts(1,6): error TS1109: Expression expected.
-tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts(3,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts(2,6): error TS1109: Expression expected.
+tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts(4,1): error TS1128: Declaration or statement expected.
 
 
 ==== tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts (2 errors) ====
+    
     throw; 
          ~
 !!! error TS1109: Expression expected.
diff --git a/tests/baselines/reference/invalidThrowStatement.js b/tests/baselines/reference/invalidThrowStatement.js
index 4b794ab3d51..674dacf5c17 100644
--- a/tests/baselines/reference/invalidThrowStatement.js
+++ b/tests/baselines/reference/invalidThrowStatement.js
@@ -1,4 +1,5 @@
 //// [invalidThrowStatement.ts]
+
 throw; 
 
 export throw null;
diff --git a/tests/baselines/reference/invalidWhileBreakStatements.errors.txt b/tests/baselines/reference/invalidWhileBreakStatements.errors.txt
index 54adc2856d7..7d4f86b3e9d 100644
--- a/tests/baselines/reference/invalidWhileBreakStatements.errors.txt
+++ b/tests/baselines/reference/invalidWhileBreakStatements.errors.txt
@@ -1,12 +1,14 @@
 tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(4,1): error TS1105: A 'break' statement can only be used within an enclosing iteration or switch statement.
+tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(7,1): error TS7028: Unused label.
 tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(8,14): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
+tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(11,1): error TS7027: Unreachable code detected.
 tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
 tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
 tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
 tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts(37,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
 
 
-==== tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts (6 errors) ====
+==== tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.ts (8 errors) ====
     // All errors
     
     // naked break not allowed
@@ -16,12 +18,16 @@ tests/cases/conformance/statements/breakStatements/invalidWhileBreakStatements.t
     
     // non-existent label
     ONE:
+    ~~~
+!!! error TS7028: Unused label.
     while (true) break TWO;
                  ~~~~~~~~~~
 !!! error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
     
     // break from inside function
     TWO:
+    ~~~
+!!! error TS7027: Unreachable code detected.
     while (true){
         var x = () => {
             break TWO;
diff --git a/tests/baselines/reference/invalidWhileContinueStatements.errors.txt b/tests/baselines/reference/invalidWhileContinueStatements.errors.txt
index 462b244efd4..e7a9ed13c40 100644
--- a/tests/baselines/reference/invalidWhileContinueStatements.errors.txt
+++ b/tests/baselines/reference/invalidWhileContinueStatements.errors.txt
@@ -1,12 +1,13 @@
-tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(4,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(8,14): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
-tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(27,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
-tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(37,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(5,1): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(9,14): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(15,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(22,9): error TS1107: Jump target cannot cross function boundary.
+tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(28,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
+tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts(38,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
 
 
 ==== tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts (6 errors) ====
+    
     // All errors
     
     // naked continue not allowed
diff --git a/tests/baselines/reference/invalidWhileContinueStatements.js b/tests/baselines/reference/invalidWhileContinueStatements.js
index b8234bf9604..16350e9b561 100644
--- a/tests/baselines/reference/invalidWhileContinueStatements.js
+++ b/tests/baselines/reference/invalidWhileContinueStatements.js
@@ -1,4 +1,5 @@
 //// [invalidWhileContinueStatements.ts]
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/baselines/reference/isolatedModulesOut.js b/tests/baselines/reference/isolatedModulesOut.js
index ca5eb2b7579..44f319e1031 100644
--- a/tests/baselines/reference/isolatedModulesOut.js
+++ b/tests/baselines/reference/isolatedModulesOut.js
@@ -6,7 +6,5 @@ export var x;
 //// [file2.ts]
 var y;
 
-//// [file1.js]
-export var x;
 //// [all.js]
 var y;
diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt b/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt
index 7d290bcae44..1abc6ca47d4 100644
--- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt
+++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt
@@ -1,6 +1,6 @@
-error TS5047: Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher.
+error TS5047: Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.
 
 
-!!! error TS5047: Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher.
+!!! error TS5047: Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.
 ==== tests/cases/compiler/isolatedModulesUnspecifiedModule.ts (0 errors) ====
     export var x;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxEsprimaFbTestSuite.errors.txt b/tests/baselines/reference/jsxEsprimaFbTestSuite.errors.txt
index 5758db36960..3a6059d8d07 100644
--- a/tests/baselines/reference/jsxEsprimaFbTestSuite.errors.txt
+++ b/tests/baselines/reference/jsxEsprimaFbTestSuite.errors.txt
@@ -4,11 +4,10 @@ tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(39,29): error TS1005: '{'
 tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(39,57): error TS1109: Expression expected.
 tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(39,58): error TS1109: Expression expected.
 tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(41,1): error TS1003: Identifier expected.
-tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(41,6): error TS1109: Expression expected.
-tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(41,12): error TS1109: Expression expected.
+tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(41,12): error TS2657: JSX expressions must have one parent element
 
 
-==== tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx (8 errors) ====
+==== tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx (7 errors) ====
     declare var React: any;
     declare var 日本語;
     declare var AbC_def;
@@ -62,10 +61,8 @@ tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx(41,12): error TS1109: Expr
     <a.b></a.b>;
     ~
 !!! error TS1003: Identifier expected.
-         ~~
-!!! error TS1109: Expression expected.
                ~
-!!! error TS1109: Expression expected.
+!!! error TS2657: JSX expressions must have one parent element
     
     <a.b.c></a.b.c>;
     
diff --git a/tests/baselines/reference/jsxEsprimaFbTestSuite.js b/tests/baselines/reference/jsxEsprimaFbTestSuite.js
index 1e22826f440..465d265efb2 100644
--- a/tests/baselines/reference/jsxEsprimaFbTestSuite.js
+++ b/tests/baselines/reference/jsxEsprimaFbTestSuite.js
@@ -72,8 +72,8 @@ baz
 <div>@test content</div>;
 <div><br />7x invalid-js-identifier</div>;
 <LeftRight left={<a />} right={<b>monkeys /> gorillas</b> /  > }/>
-    < a.b > ;
-a.b > ;
+    ,
+        <a.b></a.b>;
 <a.b.c></a.b.c>;
 (<div />) < x;
 <div {...props}/>;
diff --git a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.errors.txt b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.errors.txt
index 02bc56e823e..578159dc651 100644
--- a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.errors.txt
+++ b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.errors.txt
@@ -12,17 +12,11 @@ tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(6,6): error TS2304: C
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(6,9): error TS1109: Expression expected.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(6,10): error TS1109: Expression expected.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(7,1): error TS1003: Identifier expected.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(7,2): error TS2304: Cannot find name 'a'.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(7,4): error TS1109: Expression expected.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(8,4): error TS17002: Expected corresponding JSX closing tag for 'a'.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(9,13): error TS1002: Unterminated string literal.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,1): error TS1003: Identifier expected.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,2): error TS2304: Cannot find name 'a'.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,3): error TS1005: ';' expected.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,4): error TS2304: Cannot find name 'b'.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,6): error TS1109: Expression expected.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,8): error TS2304: Cannot find name 'b'.
-tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,10): error TS1109: Expression expected.
+tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,6): error TS17002: Expected corresponding JSX closing tag for 'a'.
+tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(10,10): error TS2657: JSX expressions must have one parent element
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(11,3): error TS1003: Identifier expected.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(11,5): error TS1003: Identifier expected.
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(11,11): error TS1005: '>' expected.
@@ -71,7 +65,7 @@ tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(35,4): error TS1003:
 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(35,21): error TS17002: Expected corresponding JSX closing tag for 'a'.
 
 
-==== tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx (71 errors) ====
+==== tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx (65 errors) ====
     declare var React: any;
     
     </>;
@@ -107,10 +101,6 @@ tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(35,21): error TS17002
     <a>;
     ~
 !!! error TS1003: Identifier expected.
-     ~
-!!! error TS2304: Cannot find name 'a'.
-       ~
-!!! error TS1109: Expression expected.
     <a></b>;
        ~~~~
 !!! error TS17002: Expected corresponding JSX closing tag for 'a'.
@@ -120,18 +110,10 @@ tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx(35,21): error TS17002
     <a:b></b>;
     ~
 !!! error TS1003: Identifier expected.
-     ~
-!!! error TS2304: Cannot find name 'a'.
-      ~
-!!! error TS1005: ';' expected.
-       ~
-!!! error TS2304: Cannot find name 'b'.
-         ~~
-!!! error TS1109: Expression expected.
-           ~
-!!! error TS2304: Cannot find name 'b'.
+         ~~~~
+!!! error TS17002: Expected corresponding JSX closing tag for 'a'.
              ~
-!!! error TS1109: Expression expected.
+!!! error TS2657: JSX expressions must have one parent element
     <a:b.c></a:b.c>;
       ~
 !!! error TS1003: Identifier expected.
diff --git a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js
index d623e127be7..7f01666bd78 100644
--- a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js
+++ b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js
@@ -41,12 +41,10 @@ var x = <div>one</div> /* intervening comment */ <div>two</div>;;
     < ;
 a /  > ;
 <a b={d /  > }/>
-    < a > ;
-<a></b>;
-<a foo="bar;/>
-    < a;
-b > ;
-b > ;
+    ,
+        <a>;
+<a></b>;
+<a foo="bar;/>a:b></b>;
 <a b c></a>;
 b.c > ;
 <a.b c></a.b>;
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.js b/tests/baselines/reference/keywordInJsxIdentifier.js
index 677a79138e6..39f33449dad 100644
--- a/tests/baselines/reference/keywordInJsxIdentifier.js
+++ b/tests/baselines/reference/keywordInJsxIdentifier.js
@@ -9,6 +9,6 @@ declare var React: any;
 
 //// [keywordInJsxIdentifier.js]
 React.createElement("foo", {"class-id": true});
-React.createElement("foo", {"class": true});
+React.createElement("foo", {class: true});
 React.createElement("foo", {"class-id": "1"});
-React.createElement("foo", {"class": "1"});
+React.createElement("foo", {class: "1"});
diff --git a/tests/baselines/reference/letAndVarRedeclaration.errors.txt b/tests/baselines/reference/letAndVarRedeclaration.errors.txt
index 48704f61040..50a916e8d90 100644
--- a/tests/baselines/reference/letAndVarRedeclaration.errors.txt
+++ b/tests/baselines/reference/letAndVarRedeclaration.errors.txt
@@ -1,28 +1,29 @@
-tests/cases/compiler/letAndVarRedeclaration.ts(2,5): error TS2451: Cannot redeclare block-scoped variable 'e0'.
 tests/cases/compiler/letAndVarRedeclaration.ts(3,5): error TS2451: Cannot redeclare block-scoped variable 'e0'.
-tests/cases/compiler/letAndVarRedeclaration.ts(4,10): error TS2451: Cannot redeclare block-scoped variable 'e0'.
-tests/cases/compiler/letAndVarRedeclaration.ts(7,9): error TS2451: Cannot redeclare block-scoped variable 'x1'.
+tests/cases/compiler/letAndVarRedeclaration.ts(4,5): error TS2451: Cannot redeclare block-scoped variable 'e0'.
+tests/cases/compiler/letAndVarRedeclaration.ts(5,10): error TS2451: Cannot redeclare block-scoped variable 'e0'.
 tests/cases/compiler/letAndVarRedeclaration.ts(8,9): error TS2451: Cannot redeclare block-scoped variable 'x1'.
-tests/cases/compiler/letAndVarRedeclaration.ts(9,14): error TS2451: Cannot redeclare block-scoped variable 'x1'.
-tests/cases/compiler/letAndVarRedeclaration.ts(13,9): error TS2451: Cannot redeclare block-scoped variable 'x'.
-tests/cases/compiler/letAndVarRedeclaration.ts(15,13): error TS2451: Cannot redeclare block-scoped variable 'x'.
-tests/cases/compiler/letAndVarRedeclaration.ts(18,18): error TS2451: Cannot redeclare block-scoped variable 'x'.
-tests/cases/compiler/letAndVarRedeclaration.ts(23,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(9,9): error TS2451: Cannot redeclare block-scoped variable 'x1'.
+tests/cases/compiler/letAndVarRedeclaration.ts(10,14): error TS2451: Cannot redeclare block-scoped variable 'x1'.
+tests/cases/compiler/letAndVarRedeclaration.ts(14,9): error TS2451: Cannot redeclare block-scoped variable 'x'.
+tests/cases/compiler/letAndVarRedeclaration.ts(16,13): error TS2451: Cannot redeclare block-scoped variable 'x'.
+tests/cases/compiler/letAndVarRedeclaration.ts(19,18): error TS2451: Cannot redeclare block-scoped variable 'x'.
 tests/cases/compiler/letAndVarRedeclaration.ts(24,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(25,14): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(29,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(31,13): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(34,18): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(38,5): error TS2451: Cannot redeclare block-scoped variable 'x11'.
-tests/cases/compiler/letAndVarRedeclaration.ts(39,10): error TS2451: Cannot redeclare block-scoped variable 'x11'.
-tests/cases/compiler/letAndVarRedeclaration.ts(43,9): error TS2451: Cannot redeclare block-scoped variable 'x11'.
-tests/cases/compiler/letAndVarRedeclaration.ts(44,14): error TS2451: Cannot redeclare block-scoped variable 'x11'.
-tests/cases/compiler/letAndVarRedeclaration.ts(49,9): error TS2451: Cannot redeclare block-scoped variable 'x11'.
-tests/cases/compiler/letAndVarRedeclaration.ts(50,14): error TS2451: Cannot redeclare block-scoped variable 'x11'.
+tests/cases/compiler/letAndVarRedeclaration.ts(25,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(26,14): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(30,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(32,13): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(35,18): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(39,5): error TS2451: Cannot redeclare block-scoped variable 'x11'.
+tests/cases/compiler/letAndVarRedeclaration.ts(40,10): error TS2451: Cannot redeclare block-scoped variable 'x11'.
+tests/cases/compiler/letAndVarRedeclaration.ts(44,9): error TS2451: Cannot redeclare block-scoped variable 'x11'.
+tests/cases/compiler/letAndVarRedeclaration.ts(45,14): error TS2451: Cannot redeclare block-scoped variable 'x11'.
+tests/cases/compiler/letAndVarRedeclaration.ts(50,9): error TS2451: Cannot redeclare block-scoped variable 'x11'.
+tests/cases/compiler/letAndVarRedeclaration.ts(51,14): error TS2451: Cannot redeclare block-scoped variable 'x11'.
 
 
 ==== tests/cases/compiler/letAndVarRedeclaration.ts (21 errors) ====
     
+    
     let e0
         ~~
 !!! error TS2451: Cannot redeclare block-scoped variable 'e0'.
diff --git a/tests/baselines/reference/letAndVarRedeclaration.js b/tests/baselines/reference/letAndVarRedeclaration.js
index fd4bfe67cac..eb4dfc9c0e8 100644
--- a/tests/baselines/reference/letAndVarRedeclaration.js
+++ b/tests/baselines/reference/letAndVarRedeclaration.js
@@ -1,5 +1,6 @@
 //// [letAndVarRedeclaration.ts]
 
+
 let e0
 var e0;
 function e0() { }
diff --git a/tests/baselines/reference/letDeclarations-invalidContexts.errors.txt b/tests/baselines/reference/letDeclarations-invalidContexts.errors.txt
index 1ece1f31433..e46554ec0e6 100644
--- a/tests/baselines/reference/letDeclarations-invalidContexts.errors.txt
+++ b/tests/baselines/reference/letDeclarations-invalidContexts.errors.txt
@@ -1,16 +1,17 @@
-tests/cases/compiler/letDeclarations-invalidContexts.ts(4,5): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(6,5): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(9,5): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(12,5): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(16,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(20,5): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(23,5): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(26,12): error TS1157: 'let' declarations can only be declared inside a block.
-tests/cases/compiler/letDeclarations-invalidContexts.ts(29,29): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(5,5): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(7,5): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(10,5): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(13,5): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(17,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(21,5): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(24,5): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(27,12): error TS1157: 'let' declarations can only be declared inside a block.
+tests/cases/compiler/letDeclarations-invalidContexts.ts(30,29): error TS1157: 'let' declarations can only be declared inside a block.
 
 
 ==== tests/cases/compiler/letDeclarations-invalidContexts.ts (9 errors) ====
     
+    
     // Errors, let must be defined inside a block
     if (true) 
         let l1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-invalidContexts.js b/tests/baselines/reference/letDeclarations-invalidContexts.js
index f8c3bb04bdb..4c3be1faed8 100644
--- a/tests/baselines/reference/letDeclarations-invalidContexts.js
+++ b/tests/baselines/reference/letDeclarations-invalidContexts.js
@@ -1,5 +1,6 @@
 //// [letDeclarations-invalidContexts.ts]
 
+
 // Errors, let must be defined inside a block
 if (true) 
     let l1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-scopes.errors.txt b/tests/baselines/reference/letDeclarations-scopes.errors.txt
index 5c89ea98049..1b10903af7c 100644
--- a/tests/baselines/reference/letDeclarations-scopes.errors.txt
+++ b/tests/baselines/reference/letDeclarations-scopes.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/compiler/letDeclarations-scopes.ts(28,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+tests/cases/compiler/letDeclarations-scopes.ts(29,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
 
 
 ==== tests/cases/compiler/letDeclarations-scopes.ts (1 errors) ====
     
+    
     // global
     let l = "string";
     
diff --git a/tests/baselines/reference/letDeclarations-scopes.js b/tests/baselines/reference/letDeclarations-scopes.js
index d0489820d0b..3fc5976b4b7 100644
--- a/tests/baselines/reference/letDeclarations-scopes.js
+++ b/tests/baselines/reference/letDeclarations-scopes.js
@@ -1,5 +1,6 @@
 //// [letDeclarations-scopes.ts]
 
+
 // global
 let l = "string";
 
diff --git a/tests/baselines/reference/letDeclarations-validContexts.errors.txt b/tests/baselines/reference/letDeclarations-validContexts.errors.txt
index 3f3b7a2634f..acec026daf0 100644
--- a/tests/baselines/reference/letDeclarations-validContexts.errors.txt
+++ b/tests/baselines/reference/letDeclarations-validContexts.errors.txt
@@ -1,9 +1,10 @@
-tests/cases/compiler/letDeclarations-validContexts.ts(20,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+tests/cases/compiler/letDeclarations-validContexts.ts(21,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
 
 
 ==== tests/cases/compiler/letDeclarations-validContexts.ts (1 errors) ====
     
     
+    
     // Control flow statements with blocks
     if (true) { 
         let l1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-validContexts.js b/tests/baselines/reference/letDeclarations-validContexts.js
index b11a1922383..1859a0215bb 100644
--- a/tests/baselines/reference/letDeclarations-validContexts.js
+++ b/tests/baselines/reference/letDeclarations-validContexts.js
@@ -1,6 +1,7 @@
 //// [letDeclarations-validContexts.ts]
 
 
+
 // Control flow statements with blocks
 if (true) { 
     let l1 = 0;
diff --git a/tests/baselines/reference/literalsInComputedProperties1.errors.txt b/tests/baselines/reference/literalsInComputedProperties1.errors.txt
new file mode 100644
index 00000000000..e9972229f79
--- /dev/null
+++ b/tests/baselines/reference/literalsInComputedProperties1.errors.txt
@@ -0,0 +1,66 @@
+tests/cases/compiler/literalsInComputedProperties1.ts(40,5): error TS2452: An enum member cannot have a numeric name.
+tests/cases/compiler/literalsInComputedProperties1.ts(41,5): error TS2452: An enum member cannot have a numeric name.
+tests/cases/compiler/literalsInComputedProperties1.ts(42,5): error TS2452: An enum member cannot have a numeric name.
+tests/cases/compiler/literalsInComputedProperties1.ts(43,5): error TS2452: An enum member cannot have a numeric name.
+
+
+==== tests/cases/compiler/literalsInComputedProperties1.ts (4 errors) ====
+    
+    let x = {
+        1:1,
+        [2]:1,
+        "3":1,
+        ["4"]:1
+    }
+    x[1].toExponential();
+    x[2].toExponential();
+    x[3].toExponential();
+    x[4].toExponential();
+    
+    interface A {
+        1:number;
+        [2]:number;
+        "3":number;
+        ["4"]:number;
+    }
+    
+    let y:A;
+    y[1].toExponential();
+    y[2].toExponential();
+    y[3].toExponential();
+    y[4].toExponential();
+    
+    class C {
+        1:number;
+        [2]:number;
+        "3":number;
+        ["4"]:number;
+    }
+    
+    let z:C;
+    z[1].toExponential();
+    z[2].toExponential();
+    z[3].toExponential();
+    z[4].toExponential();
+    
+    enum X {
+        1 = 1,
+        ~
+!!! error TS2452: An enum member cannot have a numeric name.
+        [2] = 2,
+        ~~~
+!!! error TS2452: An enum member cannot have a numeric name.
+        "3" = 3,
+        ~~~
+!!! error TS2452: An enum member cannot have a numeric name.
+        ["4"] = 4,
+        ~~~~~
+!!! error TS2452: An enum member cannot have a numeric name.
+        "foo" = 5,
+        ["bar"] = 6
+    }
+    
+    let a = X["foo"];
+    let a0 = X["bar"];
+    
+    // TODO: make sure that enum still disallow template literals as member names
\ No newline at end of file
diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js
new file mode 100644
index 00000000000..ef11dbff6ea
--- /dev/null
+++ b/tests/baselines/reference/literalsInComputedProperties1.js
@@ -0,0 +1,94 @@
+//// [literalsInComputedProperties1.ts]
+
+let x = {
+    1:1,
+    [2]:1,
+    "3":1,
+    ["4"]:1
+}
+x[1].toExponential();
+x[2].toExponential();
+x[3].toExponential();
+x[4].toExponential();
+
+interface A {
+    1:number;
+    [2]:number;
+    "3":number;
+    ["4"]:number;
+}
+
+let y:A;
+y[1].toExponential();
+y[2].toExponential();
+y[3].toExponential();
+y[4].toExponential();
+
+class C {
+    1:number;
+    [2]:number;
+    "3":number;
+    ["4"]:number;
+}
+
+let z:C;
+z[1].toExponential();
+z[2].toExponential();
+z[3].toExponential();
+z[4].toExponential();
+
+enum X {
+    1 = 1,
+    [2] = 2,
+    "3" = 3,
+    ["4"] = 4,
+    "foo" = 5,
+    ["bar"] = 6
+}
+
+let a = X["foo"];
+let a0 = X["bar"];
+
+// TODO: make sure that enum still disallow template literals as member names
+
+//// [literalsInComputedProperties1.js]
+var x = (_a = {
+        1: 1
+    },
+    _a[2] = 1,
+    _a["3"] = 1,
+    _a["4"] = 1,
+    _a
+);
+x[1].toExponential();
+x[2].toExponential();
+x[3].toExponential();
+x[4].toExponential();
+var y;
+y[1].toExponential();
+y[2].toExponential();
+y[3].toExponential();
+y[4].toExponential();
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+var z;
+z[1].toExponential();
+z[2].toExponential();
+z[3].toExponential();
+z[4].toExponential();
+var X;
+(function (X) {
+    X[X["1"] = 1] = "1";
+    X[X[2] = 2] = 2;
+    X[X["3"] = 3] = "3";
+    X[X["4"] = 4] = "4";
+    X[X["foo"] = 5] = "foo";
+    X[X["bar"] = 6] = "bar";
+})(X || (X = {}));
+var a = X["foo"];
+var a0 = X["bar"];
+var _a;
+// TODO: make sure that enum still disallow template literals as member names 
diff --git a/tests/baselines/reference/localClassesInLoop.js b/tests/baselines/reference/localClassesInLoop.js
new file mode 100644
index 00000000000..7912b2ef0d6
--- /dev/null
+++ b/tests/baselines/reference/localClassesInLoop.js
@@ -0,0 +1,27 @@
+//// [localClassesInLoop.ts]
+declare function use(a: any);
+
+"use strict"
+var data = [];
+for (let x = 0; x < 2; ++x) {
+    class C { }
+    data.push(() => C);
+}
+
+use(data[0]() === data[1]());
+
+//// [localClassesInLoop.js]
+"use strict";
+var data = [];
+var _loop_1 = function(x) {
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+    data.push(function () { return C; });
+};
+for (var x = 0; x < 2; ++x) {
+    _loop_1(x);
+}
+use(data[0]() === data[1]());
diff --git a/tests/baselines/reference/localClassesInLoop.symbols b/tests/baselines/reference/localClassesInLoop.symbols
new file mode 100644
index 00000000000..6862525768e
--- /dev/null
+++ b/tests/baselines/reference/localClassesInLoop.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/localClassesInLoop.ts ===
+declare function use(a: any);
+>use : Symbol(use, Decl(localClassesInLoop.ts, 0, 0))
+>a : Symbol(a, Decl(localClassesInLoop.ts, 0, 21))
+
+"use strict"
+var data = [];
+>data : Symbol(data, Decl(localClassesInLoop.ts, 3, 3))
+
+for (let x = 0; x < 2; ++x) {
+>x : Symbol(x, Decl(localClassesInLoop.ts, 4, 8))
+>x : Symbol(x, Decl(localClassesInLoop.ts, 4, 8))
+>x : Symbol(x, Decl(localClassesInLoop.ts, 4, 8))
+
+    class C { }
+>C : Symbol(C, Decl(localClassesInLoop.ts, 4, 29))
+
+    data.push(() => C);
+>data.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>data : Symbol(data, Decl(localClassesInLoop.ts, 3, 3))
+>push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>C : Symbol(C, Decl(localClassesInLoop.ts, 4, 29))
+}
+
+use(data[0]() === data[1]());
+>use : Symbol(use, Decl(localClassesInLoop.ts, 0, 0))
+>data : Symbol(data, Decl(localClassesInLoop.ts, 3, 3))
+>data : Symbol(data, Decl(localClassesInLoop.ts, 3, 3))
+
diff --git a/tests/baselines/reference/localClassesInLoop.types b/tests/baselines/reference/localClassesInLoop.types
new file mode 100644
index 00000000000..f1c06f93463
--- /dev/null
+++ b/tests/baselines/reference/localClassesInLoop.types
@@ -0,0 +1,46 @@
+=== tests/cases/compiler/localClassesInLoop.ts ===
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+"use strict"
+>"use strict" : string
+
+var data = [];
+>data : any[]
+>[] : undefined[]
+
+for (let x = 0; x < 2; ++x) {
+>x : number
+>0 : number
+>x < 2 : boolean
+>x : number
+>2 : number
+>++x : number
+>x : number
+
+    class C { }
+>C : C
+
+    data.push(() => C);
+>data.push(() => C) : number
+>data.push : (...items: any[]) => number
+>data : any[]
+>push : (...items: any[]) => number
+>() => C : () => typeof C
+>C : typeof C
+}
+
+use(data[0]() === data[1]());
+>use(data[0]() === data[1]()) : any
+>use : (a: any) => any
+>data[0]() === data[1]() : boolean
+>data[0]() : any
+>data[0] : any
+>data : any[]
+>0 : number
+>data[1]() : any
+>data[1] : any
+>data : any[]
+>1 : number
+
diff --git a/tests/baselines/reference/localClassesInLoop_ES6.js b/tests/baselines/reference/localClassesInLoop_ES6.js
new file mode 100644
index 00000000000..b9e7dccff1f
--- /dev/null
+++ b/tests/baselines/reference/localClassesInLoop_ES6.js
@@ -0,0 +1,22 @@
+//// [localClassesInLoop_ES6.ts]
+
+declare function use(a: any);
+
+"use strict"
+var data = [];
+for (let x = 0; x < 2; ++x) {
+    class C { }
+    data.push(() => C);
+}
+
+use(data[0]() === data[1]());
+
+//// [localClassesInLoop_ES6.js]
+"use strict";
+var data = [];
+for (let x = 0; x < 2; ++x) {
+    class C {
+    }
+    data.push(() => C);
+}
+use(data[0]() === data[1]());
diff --git a/tests/baselines/reference/localClassesInLoop_ES6.symbols b/tests/baselines/reference/localClassesInLoop_ES6.symbols
new file mode 100644
index 00000000000..17e8102ad05
--- /dev/null
+++ b/tests/baselines/reference/localClassesInLoop_ES6.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/localClassesInLoop_ES6.ts ===
+
+declare function use(a: any);
+>use : Symbol(use, Decl(localClassesInLoop_ES6.ts, 0, 0))
+>a : Symbol(a, Decl(localClassesInLoop_ES6.ts, 1, 21))
+
+"use strict"
+var data = [];
+>data : Symbol(data, Decl(localClassesInLoop_ES6.ts, 4, 3))
+
+for (let x = 0; x < 2; ++x) {
+>x : Symbol(x, Decl(localClassesInLoop_ES6.ts, 5, 8))
+>x : Symbol(x, Decl(localClassesInLoop_ES6.ts, 5, 8))
+>x : Symbol(x, Decl(localClassesInLoop_ES6.ts, 5, 8))
+
+    class C { }
+>C : Symbol(C, Decl(localClassesInLoop_ES6.ts, 5, 29))
+
+    data.push(() => C);
+>data.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>data : Symbol(data, Decl(localClassesInLoop_ES6.ts, 4, 3))
+>push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>C : Symbol(C, Decl(localClassesInLoop_ES6.ts, 5, 29))
+}
+
+use(data[0]() === data[1]());
+>use : Symbol(use, Decl(localClassesInLoop_ES6.ts, 0, 0))
+>data : Symbol(data, Decl(localClassesInLoop_ES6.ts, 4, 3))
+>data : Symbol(data, Decl(localClassesInLoop_ES6.ts, 4, 3))
+
diff --git a/tests/baselines/reference/localClassesInLoop_ES6.types b/tests/baselines/reference/localClassesInLoop_ES6.types
new file mode 100644
index 00000000000..518e75f4afa
--- /dev/null
+++ b/tests/baselines/reference/localClassesInLoop_ES6.types
@@ -0,0 +1,47 @@
+=== tests/cases/compiler/localClassesInLoop_ES6.ts ===
+
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+"use strict"
+>"use strict" : string
+
+var data = [];
+>data : any[]
+>[] : undefined[]
+
+for (let x = 0; x < 2; ++x) {
+>x : number
+>0 : number
+>x < 2 : boolean
+>x : number
+>2 : number
+>++x : number
+>x : number
+
+    class C { }
+>C : C
+
+    data.push(() => C);
+>data.push(() => C) : number
+>data.push : (...items: any[]) => number
+>data : any[]
+>push : (...items: any[]) => number
+>() => C : () => typeof C
+>C : typeof C
+}
+
+use(data[0]() === data[1]());
+>use(data[0]() === data[1]()) : any
+>use : (a: any) => any
+>data[0]() === data[1]() : boolean
+>data[0]() : any
+>data[0] : any
+>data : any[]
+>0 : number
+>data[1]() : any
+>data[1] : any
+>data : any[]
+>1 : number
+
diff --git a/tests/baselines/reference/localTypes4.errors.txt b/tests/baselines/reference/localTypes4.errors.txt
index cad9d30c933..4d08644ea89 100644
--- a/tests/baselines/reference/localTypes4.errors.txt
+++ b/tests/baselines/reference/localTypes4.errors.txt
@@ -1,10 +1,11 @@
-tests/cases/conformance/types/localTypes/localTypes4.ts(10,19): error TS2304: Cannot find name 'T'.
-tests/cases/conformance/types/localTypes/localTypes4.ts(10,23): error TS2304: Cannot find name 'T'.
-tests/cases/conformance/types/localTypes/localTypes4.ts(18,16): error TS2300: Duplicate identifier 'T'.
-tests/cases/conformance/types/localTypes/localTypes4.ts(19,19): error TS2300: Duplicate identifier 'T'.
+tests/cases/conformance/types/localTypes/localTypes4.ts(11,19): error TS2304: Cannot find name 'T'.
+tests/cases/conformance/types/localTypes/localTypes4.ts(11,23): error TS2304: Cannot find name 'T'.
+tests/cases/conformance/types/localTypes/localTypes4.ts(19,16): error TS2300: Duplicate identifier 'T'.
+tests/cases/conformance/types/localTypes/localTypes4.ts(20,19): error TS2300: Duplicate identifier 'T'.
 
 
 ==== tests/cases/conformance/types/localTypes/localTypes4.ts (4 errors) ====
+    
     function f1() {
         // Type parameters are in scope in parameters and return types
         function f<T>(x: T): T {
diff --git a/tests/baselines/reference/localTypes4.js b/tests/baselines/reference/localTypes4.js
index 8f51761a65a..3b81175d2b6 100644
--- a/tests/baselines/reference/localTypes4.js
+++ b/tests/baselines/reference/localTypes4.js
@@ -1,4 +1,5 @@
 //// [localTypes4.ts]
+
 function f1() {
     // Type parameters are in scope in parameters and return types
     function f<T>(x: T): T {
diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
index 7cbc2aca1ff..bcd937e9cfc 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
@@ -17,20 +17,20 @@ class C {
 >y : any
 
     public bar(x: 'hi');
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
->x : 'hi'
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
+>x : "hi"
 
     public bar(x: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : string
 
     public bar(x: number, y: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public bar(x: any, y?: any) { }
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : any
 >y : any
 
@@ -49,20 +49,20 @@ class C {
 >y : any
 
     public static bar(x: 'hi');
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
->x : 'hi'
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
+>x : "hi"
 
     public static bar(x: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : string
 
     public static bar(x: number, y: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public static bar(x: any, y?: any) { }
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : any
 >y : any
 }
@@ -88,22 +88,22 @@ class D<T> {
 >y : any
 
     public bar(x: 'hi');
->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; }
->x : 'hi'
+>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
+>x : "hi"
 
     public bar(x: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
 >x : string
 
     public bar(x: T, y: T);
->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
 >x : T
 >T : T
 >y : T
 >T : T
 
     public bar(x: any, y?: any) { }
->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
 >x : any
 >y : any
 
@@ -122,20 +122,20 @@ class D<T> {
 >y : any
 
     public static bar(x: 'hi');
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
->x : 'hi'
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
+>x : "hi"
 
     public static bar(x: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : string
 
     public static bar(x: number, y: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public static bar(x: any, y?: any) { }
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; }
 >x : any
 >y : any
 
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.js b/tests/baselines/reference/mergedInheritedClassInterface.js
new file mode 100644
index 00000000000..2cc88ac9431
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -0,0 +1,96 @@
+//// [mergedInheritedClassInterface.ts]
+interface BaseInterface {
+    required: number;
+    optional?: number;
+}
+
+class BaseClass {
+    baseMethod() { }
+    baseNumber: number;
+}
+
+interface Child extends BaseInterface {
+    additional: number;
+}
+
+class Child extends BaseClass {
+    classNumber: number;
+    method() { }
+}
+
+interface ChildNoBaseClass extends BaseInterface {
+    additional2: string;
+}
+class ChildNoBaseClass {
+    classString: string;
+    method2() { }
+}
+class Grandchild extends ChildNoBaseClass {
+}
+
+// checks if properties actually were merged
+var child : Child;
+child.required;
+child.optional;
+child.additional;
+child.baseNumber;
+child.classNumber;
+child.baseMethod();
+child.method();
+
+var grandchild: Grandchild;
+grandchild.required;
+grandchild.optional;
+grandchild.additional2;
+grandchild.classString;
+grandchild.method2();
+
+
+//// [mergedInheritedClassInterface.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var BaseClass = (function () {
+    function BaseClass() {
+    }
+    BaseClass.prototype.baseMethod = function () { };
+    return BaseClass;
+})();
+var Child = (function (_super) {
+    __extends(Child, _super);
+    function Child() {
+        _super.apply(this, arguments);
+    }
+    Child.prototype.method = function () { };
+    return Child;
+})(BaseClass);
+var ChildNoBaseClass = (function () {
+    function ChildNoBaseClass() {
+    }
+    ChildNoBaseClass.prototype.method2 = function () { };
+    return ChildNoBaseClass;
+})();
+var Grandchild = (function (_super) {
+    __extends(Grandchild, _super);
+    function Grandchild() {
+        _super.apply(this, arguments);
+    }
+    return Grandchild;
+})(ChildNoBaseClass);
+// checks if properties actually were merged
+var child;
+child.required;
+child.optional;
+child.additional;
+child.baseNumber;
+child.classNumber;
+child.baseMethod();
+child.method();
+var grandchild;
+grandchild.required;
+grandchild.optional;
+grandchild.additional2;
+grandchild.classString;
+grandchild.method2();
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.symbols b/tests/baselines/reference/mergedInheritedClassInterface.symbols
new file mode 100644
index 00000000000..5f4ae67df6f
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedClassInterface.symbols
@@ -0,0 +1,130 @@
+=== tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts ===
+interface BaseInterface {
+>BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))
+
+    required: number;
+>required : Symbol(required, Decl(mergedInheritedClassInterface.ts, 0, 25))
+
+    optional?: number;
+>optional : Symbol(optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
+}
+
+class BaseClass {
+>BaseClass : Symbol(BaseClass, Decl(mergedInheritedClassInterface.ts, 3, 1))
+
+    baseMethod() { }
+>baseMethod : Symbol(baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))
+
+    baseNumber: number;
+>baseNumber : Symbol(baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
+}
+
+interface Child extends BaseInterface {
+>Child : Symbol(Child, Decl(mergedInheritedClassInterface.ts, 8, 1), Decl(mergedInheritedClassInterface.ts, 12, 1))
+>BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))
+
+    additional: number;
+>additional : Symbol(additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
+}
+
+class Child extends BaseClass {
+>Child : Symbol(Child, Decl(mergedInheritedClassInterface.ts, 8, 1), Decl(mergedInheritedClassInterface.ts, 12, 1))
+>BaseClass : Symbol(BaseClass, Decl(mergedInheritedClassInterface.ts, 3, 1))
+
+    classNumber: number;
+>classNumber : Symbol(classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))
+
+    method() { }
+>method : Symbol(method, Decl(mergedInheritedClassInterface.ts, 15, 24))
+}
+
+interface ChildNoBaseClass extends BaseInterface {
+>ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))
+>BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))
+
+    additional2: string;
+>additional2 : Symbol(additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
+}
+class ChildNoBaseClass {
+>ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))
+
+    classString: string;
+>classString : Symbol(classString, Decl(mergedInheritedClassInterface.ts, 22, 24))
+
+    method2() { }
+>method2 : Symbol(method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
+}
+class Grandchild extends ChildNoBaseClass {
+>Grandchild : Symbol(Grandchild, Decl(mergedInheritedClassInterface.ts, 25, 1))
+>ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))
+}
+
+// checks if properties actually were merged
+var child : Child;
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>Child : Symbol(Child, Decl(mergedInheritedClassInterface.ts, 8, 1), Decl(mergedInheritedClassInterface.ts, 12, 1))
+
+child.required;
+>child.required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
+
+child.optional;
+>child.optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
+
+child.additional;
+>child.additional : Symbol(Child.additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>additional : Symbol(Child.additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
+
+child.baseNumber;
+>child.baseNumber : Symbol(BaseClass.baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>baseNumber : Symbol(BaseClass.baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
+
+child.classNumber;
+>child.classNumber : Symbol(Child.classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>classNumber : Symbol(Child.classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))
+
+child.baseMethod();
+>child.baseMethod : Symbol(BaseClass.baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>baseMethod : Symbol(BaseClass.baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))
+
+child.method();
+>child.method : Symbol(Child.method, Decl(mergedInheritedClassInterface.ts, 15, 24))
+>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
+>method : Symbol(Child.method, Decl(mergedInheritedClassInterface.ts, 15, 24))
+
+var grandchild: Grandchild;
+>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
+>Grandchild : Symbol(Grandchild, Decl(mergedInheritedClassInterface.ts, 25, 1))
+
+grandchild.required;
+>grandchild.required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
+>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
+>required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
+
+grandchild.optional;
+>grandchild.optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
+>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
+>optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
+
+grandchild.additional2;
+>grandchild.additional2 : Symbol(ChildNoBaseClass.additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
+>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
+>additional2 : Symbol(ChildNoBaseClass.additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
+
+grandchild.classString;
+>grandchild.classString : Symbol(ChildNoBaseClass.classString, Decl(mergedInheritedClassInterface.ts, 22, 24))
+>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
+>classString : Symbol(ChildNoBaseClass.classString, Decl(mergedInheritedClassInterface.ts, 22, 24))
+
+grandchild.method2();
+>grandchild.method2 : Symbol(ChildNoBaseClass.method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
+>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
+>method2 : Symbol(ChildNoBaseClass.method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
+
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.types b/tests/baselines/reference/mergedInheritedClassInterface.types
new file mode 100644
index 00000000000..e7e645fb278
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedClassInterface.types
@@ -0,0 +1,133 @@
+=== tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts ===
+interface BaseInterface {
+>BaseInterface : BaseInterface
+
+    required: number;
+>required : number
+
+    optional?: number;
+>optional : number
+}
+
+class BaseClass {
+>BaseClass : BaseClass
+
+    baseMethod() { }
+>baseMethod : () => void
+
+    baseNumber: number;
+>baseNumber : number
+}
+
+interface Child extends BaseInterface {
+>Child : Child
+>BaseInterface : BaseInterface
+
+    additional: number;
+>additional : number
+}
+
+class Child extends BaseClass {
+>Child : Child
+>BaseClass : BaseClass
+
+    classNumber: number;
+>classNumber : number
+
+    method() { }
+>method : () => void
+}
+
+interface ChildNoBaseClass extends BaseInterface {
+>ChildNoBaseClass : ChildNoBaseClass
+>BaseInterface : BaseInterface
+
+    additional2: string;
+>additional2 : string
+}
+class ChildNoBaseClass {
+>ChildNoBaseClass : ChildNoBaseClass
+
+    classString: string;
+>classString : string
+
+    method2() { }
+>method2 : () => void
+}
+class Grandchild extends ChildNoBaseClass {
+>Grandchild : Grandchild
+>ChildNoBaseClass : ChildNoBaseClass
+}
+
+// checks if properties actually were merged
+var child : Child;
+>child : Child
+>Child : Child
+
+child.required;
+>child.required : number
+>child : Child
+>required : number
+
+child.optional;
+>child.optional : number
+>child : Child
+>optional : number
+
+child.additional;
+>child.additional : number
+>child : Child
+>additional : number
+
+child.baseNumber;
+>child.baseNumber : number
+>child : Child
+>baseNumber : number
+
+child.classNumber;
+>child.classNumber : number
+>child : Child
+>classNumber : number
+
+child.baseMethod();
+>child.baseMethod() : void
+>child.baseMethod : () => void
+>child : Child
+>baseMethod : () => void
+
+child.method();
+>child.method() : void
+>child.method : () => void
+>child : Child
+>method : () => void
+
+var grandchild: Grandchild;
+>grandchild : Grandchild
+>Grandchild : Grandchild
+
+grandchild.required;
+>grandchild.required : number
+>grandchild : Grandchild
+>required : number
+
+grandchild.optional;
+>grandchild.optional : number
+>grandchild : Grandchild
+>optional : number
+
+grandchild.additional2;
+>grandchild.additional2 : string
+>grandchild : Grandchild
+>additional2 : string
+
+grandchild.classString;
+>grandchild.classString : string
+>grandchild : Grandchild
+>classString : string
+
+grandchild.method2();
+>grandchild.method2() : void
+>grandchild.method2 : () => void
+>grandchild : Grandchild
+>method2 : () => void
+
diff --git a/tests/baselines/reference/methodInAmbientClass1.errors.txt b/tests/baselines/reference/methodInAmbientClass1.errors.txt
index 2badd839270..c931cc0101c 100644
--- a/tests/baselines/reference/methodInAmbientClass1.errors.txt
+++ b/tests/baselines/reference/methodInAmbientClass1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/methodInAmbientClass1.ts(2,12): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/methodInAmbientClass1.ts(2,12): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/methodInAmbientClass1.ts(2,20): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
@@ -6,7 +6,7 @@ tests/cases/compiler/methodInAmbientClass1.ts(2,20): error TS1183: An implementa
         declare class Foo {
         	fn(): boolean {
         	      ~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
         	              ~
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         	}
diff --git a/tests/baselines/reference/missingReturnStatement.errors.txt b/tests/baselines/reference/missingReturnStatement.errors.txt
index c7cedd793de..8926d22be3d 100644
--- a/tests/baselines/reference/missingReturnStatement.errors.txt
+++ b/tests/baselines/reference/missingReturnStatement.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/missingReturnStatement.ts(3,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/missingReturnStatement.ts(3,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 
 
 ==== tests/cases/compiler/missingReturnStatement.ts (1 errors) ====
@@ -6,7 +6,7 @@ tests/cases/compiler/missingReturnStatement.ts(3,22): error TS2355: A function w
         export class Bug {
             public foo():string {
                          ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
             }
         }    
     }
diff --git a/tests/baselines/reference/missingReturnStatement1.errors.txt b/tests/baselines/reference/missingReturnStatement1.errors.txt
index de471f90ac4..9d3cf78411e 100644
--- a/tests/baselines/reference/missingReturnStatement1.errors.txt
+++ b/tests/baselines/reference/missingReturnStatement1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/missingReturnStatement1.ts(2,12): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/missingReturnStatement1.ts(2,12): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 
 
 ==== tests/cases/compiler/missingReturnStatement1.ts (1 errors) ====
     class Foo {
         foo(): number {
                ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
             //return 4;
         }
     }
diff --git a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt
new file mode 100644
index 00000000000..d52b17a58a0
--- /dev/null
+++ b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt
@@ -0,0 +1,27 @@
+tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts(4,5): error TS2387: Function overload must be static.
+tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts(12,12): error TS2388: Function overload must not be static.
+tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts(13,5): error TS2387: Function overload must be static.
+
+
+==== tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts (3 errors) ====
+    class A {
+        f() {}
+        static m1 (a: string): void;
+        m1 (a: number): void;
+        ~~
+!!! error TS2387: Function overload must be static.
+        m1 (a: any): void {
+        }
+    }
+    
+    class B {
+        f() {}
+        m1 (a: string): void;
+        static m1 (a: number): void;
+               ~~
+!!! error TS2388: Function overload must not be static.
+        m1 (a: any): void {
+        ~~
+!!! error TS2387: Function overload must be static.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js
new file mode 100644
index 00000000000..427bbf65aa1
--- /dev/null
+++ b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js
@@ -0,0 +1,34 @@
+//// [mixedStaticAndInstanceClassMembers.ts]
+class A {
+    f() {}
+    static m1 (a: string): void;
+    m1 (a: number): void;
+    m1 (a: any): void {
+    }
+}
+
+class B {
+    f() {}
+    m1 (a: string): void;
+    static m1 (a: number): void;
+    m1 (a: any): void {
+    }
+}
+
+//// [mixedStaticAndInstanceClassMembers.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.f = function () { };
+    A.prototype.m1 = function (a) {
+    };
+    return A;
+})();
+var B = (function () {
+    function B() {
+    }
+    B.prototype.f = function () { };
+    B.prototype.m1 = function (a) {
+    };
+    return B;
+})();
diff --git a/tests/baselines/reference/multiLineErrors.errors.txt b/tests/baselines/reference/multiLineErrors.errors.txt
index 23a6278b4fb..70366aeabed 100644
--- a/tests/baselines/reference/multiLineErrors.errors.txt
+++ b/tests/baselines/reference/multiLineErrors.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/multiLineErrors.ts(3,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/multiLineErrors.ts(3,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/multiLineErrors.ts(21,1): error TS2322: Type 'A2' is not assignable to type 'A1'.
   Types of property 'x' are incompatible.
     Type '{ y: string; }' is not assignable to type '{ y: number; }'.
@@ -17,7 +17,7 @@ tests/cases/compiler/multiLineErrors.ts(21,1): error TS2322: Type 'A2' is not as
     ~~~~~~~~~~~~~~
     }
     ~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     {
         var x = 4;
         var y = 10;
diff --git a/tests/baselines/reference/narrowTypeByInstanceof.types b/tests/baselines/reference/narrowTypeByInstanceof.types
index e6a3466b88f..8bc13d12ca1 100644
--- a/tests/baselines/reference/narrowTypeByInstanceof.types
+++ b/tests/baselines/reference/narrowTypeByInstanceof.types
@@ -63,7 +63,7 @@ if (elementA instanceof FileMatch && elementB instanceof FileMatch) {
 } else if (elementA instanceof Match && elementB instanceof Match) {
 >elementA instanceof Match && elementB instanceof Match : boolean
 >elementA instanceof Match : boolean
->elementA : FileMatch | Match
+>elementA : Match | FileMatch
 >Match : typeof Match
 >elementB instanceof Match : boolean
 >elementB : FileMatch | Match
diff --git a/tests/baselines/reference/nestedRedeclarationInES6AMD.js b/tests/baselines/reference/nestedRedeclarationInES6AMD.js
new file mode 100644
index 00000000000..bb90759dc8b
--- /dev/null
+++ b/tests/baselines/reference/nestedRedeclarationInES6AMD.js
@@ -0,0 +1,15 @@
+//// [nestedRedeclarationInES6AMD.ts]
+function a() {
+    {
+        let status = 1;
+        status = 2;
+    }
+}
+
+//// [nestedRedeclarationInES6AMD.js]
+function a() {
+    {
+        let status = 1;
+        status = 2;
+    }
+}
diff --git a/tests/baselines/reference/nestedRedeclarationInES6AMD.symbols b/tests/baselines/reference/nestedRedeclarationInES6AMD.symbols
new file mode 100644
index 00000000000..65f310a7ed2
--- /dev/null
+++ b/tests/baselines/reference/nestedRedeclarationInES6AMD.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/nestedRedeclarationInES6AMD.ts ===
+function a() {
+>a : Symbol(a, Decl(nestedRedeclarationInES6AMD.ts, 0, 0))
+    {
+        let status = 1;
+>status : Symbol(status, Decl(nestedRedeclarationInES6AMD.ts, 2, 11))
+
+        status = 2;
+>status : Symbol(status, Decl(nestedRedeclarationInES6AMD.ts, 2, 11))
+    }
+}
diff --git a/tests/baselines/reference/nestedRedeclarationInES6AMD.types b/tests/baselines/reference/nestedRedeclarationInES6AMD.types
new file mode 100644
index 00000000000..2b8d971e3c1
--- /dev/null
+++ b/tests/baselines/reference/nestedRedeclarationInES6AMD.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/nestedRedeclarationInES6AMD.ts ===
+function a() {
+>a : () => void
+    {
+        let status = 1;
+>status : number
+>1 : number
+
+        status = 2;
+>status = 2 : number
+>status : number
+>2 : number
+    }
+}
diff --git a/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.js b/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.js
new file mode 100644
index 00000000000..b2f08b599be
--- /dev/null
+++ b/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.js
@@ -0,0 +1,10 @@
+//// [noReachabilityErrorsOnEmptyStatement.ts]
+function foo() {
+    return 1;;
+}
+
+//// [noReachabilityErrorsOnEmptyStatement.js]
+function foo() {
+    return 1;
+    ;
+}
diff --git a/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.symbols b/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.symbols
new file mode 100644
index 00000000000..0179e5150bb
--- /dev/null
+++ b/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noReachabilityErrorsOnEmptyStatement.ts ===
+function foo() {
+>foo : Symbol(foo, Decl(noReachabilityErrorsOnEmptyStatement.ts, 0, 0))
+
+    return 1;;
+}
diff --git a/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.types b/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.types
new file mode 100644
index 00000000000..e90fa04699b
--- /dev/null
+++ b/tests/baselines/reference/noReachabilityErrorsOnEmptyStatement.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/noReachabilityErrorsOnEmptyStatement.ts ===
+function foo() {
+>foo : () => number
+
+    return 1;;
+>1 : number
+}
diff --git a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt
new file mode 100644
index 00000000000..252cd6880d4
--- /dev/null
+++ b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt
@@ -0,0 +1,23 @@
+tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(2,5): error TS2300: Duplicate identifier 'm1'.
+tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(4,5): error TS2300: Duplicate identifier 'm1'.
+tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(5,5): error TS2300: Duplicate identifier 'm1'.
+tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(6,5): error TS2300: Duplicate identifier 'm1'.
+
+
+==== tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts (4 errors) ====
+    class A {
+        m1: string;
+        ~~
+!!! error TS2300: Duplicate identifier 'm1'.
+        f() {}
+        m1 (a: string): void;
+        ~~
+!!! error TS2300: Duplicate identifier 'm1'.
+        m1 (a: number): void;
+        ~~
+!!! error TS2300: Duplicate identifier 'm1'.
+        m1 (a: any): void {
+        ~~
+!!! error TS2300: Duplicate identifier 'm1'.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js
new file mode 100644
index 00000000000..3ca6a963515
--- /dev/null
+++ b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js
@@ -0,0 +1,19 @@
+//// [nonMergedDeclarationsAndOverloads.ts]
+class A {
+    m1: string;
+    f() {}
+    m1 (a: string): void;
+    m1 (a: number): void;
+    m1 (a: any): void {
+    }
+}
+
+//// [nonMergedDeclarationsAndOverloads.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.f = function () { };
+    A.prototype.m1 = function (a) {
+    };
+    return A;
+})();
diff --git a/tests/baselines/reference/nonMergedOverloads.errors.txt b/tests/baselines/reference/nonMergedOverloads.errors.txt
new file mode 100644
index 00000000000..9a38ebdc3b3
--- /dev/null
+++ b/tests/baselines/reference/nonMergedOverloads.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/compiler/nonMergedOverloads.ts(1,5): error TS2300: Duplicate identifier 'f'.
+tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
+tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS2300: Duplicate identifier 'f'.
+tests/cases/compiler/nonMergedOverloads.ts(4,17): error TS2300: Duplicate identifier 'f'.
+
+
+==== tests/cases/compiler/nonMergedOverloads.ts (4 errors) ====
+    var f = 10;
+        ~
+!!! error TS2300: Duplicate identifier 'f'.
+    
+    export function f();
+                    ~
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
+                    ~
+!!! error TS2300: Duplicate identifier 'f'.
+    export function f() {
+                    ~
+!!! error TS2300: Duplicate identifier 'f'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js
new file mode 100644
index 00000000000..2e7f7f67ee6
--- /dev/null
+++ b/tests/baselines/reference/nonMergedOverloads.js
@@ -0,0 +1,12 @@
+//// [nonMergedOverloads.ts]
+var f = 10;
+
+export function f();
+export function f() {
+}
+
+//// [nonMergedOverloads.js]
+var f = 10;
+function f() {
+}
+exports.f = f;
diff --git a/tests/baselines/reference/null.js b/tests/baselines/reference/null.js
index 499d6901847..ee897643fb1 100644
--- a/tests/baselines/reference/null.js
+++ b/tests/baselines/reference/null.js
@@ -1,4 +1,5 @@
 //// [null.ts]
+
 var x=null; 
 var y=3+x;  
 var z=3+null; 
diff --git a/tests/baselines/reference/null.symbols b/tests/baselines/reference/null.symbols
index 148cd1586b2..bd3d835995b 100644
--- a/tests/baselines/reference/null.symbols
+++ b/tests/baselines/reference/null.symbols
@@ -1,44 +1,45 @@
 === tests/cases/compiler/null.ts ===
+
 var x=null; 
->x : Symbol(x, Decl(null.ts, 0, 3))
+>x : Symbol(x, Decl(null.ts, 1, 3))
 
 var y=3+x;  
->y : Symbol(y, Decl(null.ts, 1, 3))
->x : Symbol(x, Decl(null.ts, 0, 3))
+>y : Symbol(y, Decl(null.ts, 2, 3))
+>x : Symbol(x, Decl(null.ts, 1, 3))
 
 var z=3+null; 
->z : Symbol(z, Decl(null.ts, 2, 3))
+>z : Symbol(z, Decl(null.ts, 3, 3))
 
 class C {
->C : Symbol(C, Decl(null.ts, 2, 13))
+>C : Symbol(C, Decl(null.ts, 3, 13))
 }
 function f() {
->f : Symbol(f, Decl(null.ts, 4, 1))
+>f : Symbol(f, Decl(null.ts, 5, 1))
 
     return null;
     return new C();
->C : Symbol(C, Decl(null.ts, 2, 13))
+>C : Symbol(C, Decl(null.ts, 3, 13))
 }
 function g() {
->g : Symbol(g, Decl(null.ts, 8, 1))
+>g : Symbol(g, Decl(null.ts, 9, 1))
 
     return null;
     return 3;
 }
 interface I {
->I : Symbol(I, Decl(null.ts, 12, 1))
+>I : Symbol(I, Decl(null.ts, 13, 1))
 
     x:any;
->x : Symbol(x, Decl(null.ts, 13, 13))
+>x : Symbol(x, Decl(null.ts, 14, 13))
 
     y:number;
->y : Symbol(y, Decl(null.ts, 14, 10))
+>y : Symbol(y, Decl(null.ts, 15, 10))
 }
 var w:I={x:null,y:3};
->w : Symbol(w, Decl(null.ts, 17, 3))
->I : Symbol(I, Decl(null.ts, 12, 1))
->x : Symbol(x, Decl(null.ts, 17, 9))
->y : Symbol(y, Decl(null.ts, 17, 16))
+>w : Symbol(w, Decl(null.ts, 18, 3))
+>I : Symbol(I, Decl(null.ts, 13, 1))
+>x : Symbol(x, Decl(null.ts, 18, 9))
+>y : Symbol(y, Decl(null.ts, 18, 16))
 
 
 
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
index 7df551b1bde..6fd8b423f13 100644
--- a/tests/baselines/reference/null.types
+++ b/tests/baselines/reference/null.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/null.ts ===
+
 var x=null; 
 >x : any
 >null : null
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.errors.txt b/tests/baselines/reference/objectLiteralExcessProperties.errors.txt
new file mode 100644
index 00000000000..84f635bf947
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralExcessProperties.errors.txt
@@ -0,0 +1,66 @@
+tests/cases/compiler/objectLiteralExcessProperties.ts(9,18): error TS2322: Type '{ forword: string; }' is not assignable to type 'Book'.
+  Object literal may only specify known properties, and 'forword' does not exist in type 'Book'.
+tests/cases/compiler/objectLiteralExcessProperties.ts(11,27): error TS2322: Type '{ foreward: string; }' is not assignable to type 'Book | string'.
+  Object literal may only specify known properties, and 'foreward' does not exist in type 'Book | string'.
+tests/cases/compiler/objectLiteralExcessProperties.ts(13,53): error TS2322: Type '({ foreword: string; } | { forwards: string; })[]' is not assignable to type 'Book | Book[]'.
+  Type '({ foreword: string; } | { forwards: string; })[]' is not assignable to type 'Book[]'.
+    Type '{ foreword: string; } | { forwards: string; }' is not assignable to type 'Book'.
+      Type '{ forwards: string; }' is not assignable to type 'Book'.
+        Object literal may only specify known properties, and 'forwards' does not exist in type 'Book'.
+tests/cases/compiler/objectLiteralExcessProperties.ts(15,42): error TS2322: Type '{ foreword: string; colour: string; }' is not assignable to type 'Book & Cover'.
+  Object literal may only specify known properties, and 'colour' does not exist in type 'Book & Cover'.
+tests/cases/compiler/objectLiteralExcessProperties.ts(17,26): error TS2322: Type '{ foreward: string; color: string; }' is not assignable to type 'Book & Cover'.
+  Object literal may only specify known properties, and 'foreward' does not exist in type 'Book & Cover'.
+tests/cases/compiler/objectLiteralExcessProperties.ts(19,57): error TS2322: Type '{ foreword: string; color: string; price: number; }' is not assignable to type 'Book & Cover'.
+  Object literal may only specify known properties, and 'price' does not exist in type 'Book & Cover'.
+tests/cases/compiler/objectLiteralExcessProperties.ts(21,43): error TS2322: Type '{ foreword: string; price: number; }' is not assignable to type 'Book & number'.
+  Object literal may only specify known properties, and 'price' does not exist in type 'Book & number'.
+
+
+==== tests/cases/compiler/objectLiteralExcessProperties.ts (7 errors) ====
+    interface Book {
+        foreword: string;
+    }
+    
+    interface Cover {
+        color?: string;
+    }
+    
+    var b1: Book = { forword: "oops" };
+                     ~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ forword: string; }' is not assignable to type 'Book'.
+!!! error TS2322:   Object literal may only specify known properties, and 'forword' does not exist in type 'Book'.
+    
+    var b2: Book | string = { foreward: "nope" };
+                              ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ foreward: string; }' is not assignable to type 'Book | string'.
+!!! error TS2322:   Object literal may only specify known properties, and 'foreward' does not exist in type 'Book | string'.
+    
+    var b3: Book | (Book[]) = [{ foreword: "hello" }, { forwards: "back" }];
+                                                        ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '({ foreword: string; } | { forwards: string; })[]' is not assignable to type 'Book | Book[]'.
+!!! error TS2322:   Type '({ foreword: string; } | { forwards: string; })[]' is not assignable to type 'Book[]'.
+!!! error TS2322:     Type '{ foreword: string; } | { forwards: string; }' is not assignable to type 'Book'.
+!!! error TS2322:       Type '{ forwards: string; }' is not assignable to type 'Book'.
+!!! error TS2322:         Object literal may only specify known properties, and 'forwards' does not exist in type 'Book'.
+    
+    var b4: Book & Cover = { foreword: "hi", colour: "blue" };
+                                             ~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ foreword: string; colour: string; }' is not assignable to type 'Book & Cover'.
+!!! error TS2322:   Object literal may only specify known properties, and 'colour' does not exist in type 'Book & Cover'.
+    
+    var b5: Book & Cover = { foreward: "hi", color: "blue" };
+                             ~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ foreward: string; color: string; }' is not assignable to type 'Book & Cover'.
+!!! error TS2322:   Object literal may only specify known properties, and 'foreward' does not exist in type 'Book & Cover'.
+    
+    var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
+                                                            ~~~~~~~~~~~~
+!!! error TS2322: Type '{ foreword: string; color: string; price: number; }' is not assignable to type 'Book & Cover'.
+!!! error TS2322:   Object literal may only specify known properties, and 'price' does not exist in type 'Book & Cover'.
+    
+    var b7: Book & number = { foreword: "hi", price: 10.99 };
+                                              ~~~~~~~~~~~~
+!!! error TS2322: Type '{ foreword: string; price: number; }' is not assignable to type 'Book & number'.
+!!! error TS2322:   Object literal may only specify known properties, and 'price' does not exist in type 'Book & number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.js b/tests/baselines/reference/objectLiteralExcessProperties.js
new file mode 100644
index 00000000000..747928ccb20
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralExcessProperties.js
@@ -0,0 +1,32 @@
+//// [objectLiteralExcessProperties.ts]
+interface Book {
+    foreword: string;
+}
+
+interface Cover {
+    color?: string;
+}
+
+var b1: Book = { forword: "oops" };
+
+var b2: Book | string = { foreward: "nope" };
+
+var b3: Book | (Book[]) = [{ foreword: "hello" }, { forwards: "back" }];
+
+var b4: Book & Cover = { foreword: "hi", colour: "blue" };
+
+var b5: Book & Cover = { foreward: "hi", color: "blue" };
+
+var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
+
+var b7: Book & number = { foreword: "hi", price: 10.99 };
+
+
+//// [objectLiteralExcessProperties.js]
+var b1 = { forword: "oops" };
+var b2 = { foreward: "nope" };
+var b3 = [{ foreword: "hello" }, { forwards: "back" }];
+var b4 = { foreword: "hi", colour: "blue" };
+var b5 = { foreward: "hi", color: "blue" };
+var b6 = { foreword: "hi", color: "blue", price: 10.99 };
+var b7 = { foreword: "hi", price: 10.99 };
diff --git a/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt b/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt
index e939725ea6e..be2bea5e241 100644
--- a/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt
+++ b/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,22): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,22): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,22): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/compiler/objectLiteralMemberWithModifiers2.ts (2 errors) ====
@@ -7,4 +7,4 @@ tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,22): error TS2378: A
                          ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
                          ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
+!!! error TS2378: A 'get' accessor must return a value.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralWithSemicolons5.errors.txt b/tests/baselines/reference/objectLiteralWithSemicolons5.errors.txt
index 7373c3d535d..5a24f29252c 100644
--- a/tests/baselines/reference/objectLiteralWithSemicolons5.errors.txt
+++ b/tests/baselines/reference/objectLiteralWithSemicolons5.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,20): error TS1005: ',' expected.
 tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,25): error TS2304: Cannot find name 'b'.
 tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,26): error TS1005: ',' expected.
-tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,32): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,32): error TS2378: A 'get' accessor must return a value.
 tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,41): error TS1005: ',' expected.
 
 
@@ -14,6 +14,6 @@ tests/cases/compiler/objectLiteralWithSemicolons5.ts(1,41): error TS1005: ',' ex
                              ~
 !!! error TS1005: ',' expected.
                                    ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                                             ~
 !!! error TS1005: ',' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt b/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt
new file mode 100644
index 00000000000..a9efb0e2971
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt
@@ -0,0 +1,9 @@
+error TS5052: Option 'mapRoot' cannot be specified without specifying option 'sourceMap'.
+error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
+
+
+!!! error TS5052: Option 'mapRoot' cannot be specified without specifying option 'sourceMap'.
+!!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
+==== tests/cases/compiler/optionsInlineSourceMapMapRoot.ts (0 errors) ====
+    
+    var a = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.js b/tests/baselines/reference/optionsInlineSourceMapMapRoot.js
new file mode 100644
index 00000000000..c165c49ec29
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.js
@@ -0,0 +1,7 @@
+//// [optionsInlineSourceMapMapRoot.ts]
+
+var a = 10;
+
+//// [optionsInlineSourceMapMapRoot.js]
+var a = 10;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9vcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ==
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt
new file mode 100644
index 00000000000..32e5f85d02f
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt
@@ -0,0 +1,33 @@
+===================================================================
+JsFile: optionsInlineSourceMapMapRoot.js
+mapUrl: local/optionsInlineSourceMapMapRoot.js.map
+sourceRoot: 
+sources: ../optionsInlineSourceMapMapRoot.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/optionsInlineSourceMapMapRoot.js
+sourceFile:../optionsInlineSourceMapMapRoot.ts
+-------------------------------------------------------------------
+>>>var a = 10;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^
+6 >          ^
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a
+4 >      = 
+5 >        10
+6 >          ;
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0)
+5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0)
+6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9vcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ==
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.js b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.js
new file mode 100644
index 00000000000..748fae7320c
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.js
@@ -0,0 +1,7 @@
+//// [optionsInlineSourceMapSourceRoot.ts]
+
+var a = 10;
+
+//// [optionsInlineSourceMapSourceRoot.js]
+var a = 10;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZVJvb3QuanMiLCJzb3VyY2VSb290IjoibG9jYWwvIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwU291cmNlUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ==
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt
new file mode 100644
index 00000000000..b3f81493aa9
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt
@@ -0,0 +1,33 @@
+===================================================================
+JsFile: optionsInlineSourceMapSourceRoot.js
+mapUrl: optionsInlineSourceMapSourceRoot.js.map
+sourceRoot: local/
+sources: optionsInlineSourceMapSourceRoot.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/optionsInlineSourceMapSourceRoot.js
+sourceFile:optionsInlineSourceMapSourceRoot.ts
+-------------------------------------------------------------------
+>>>var a = 10;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^
+6 >          ^
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a
+4 >      = 
+5 >        10
+6 >          ;
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0)
+5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0)
+6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZVJvb3QuanMiLCJzb3VyY2VSb290IjoibG9jYWwvIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwU291cmNlUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ==
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols
new file mode 100644
index 00000000000..cf8c0826d8e
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts ===
+
+var a = 10;
+>a : Symbol(a, Decl(optionsInlineSourceMapSourceRoot.ts, 1, 3))
+
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.types b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.types
new file mode 100644
index 00000000000..1f6a5fc9dc6
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts ===
+
+var a = 10;
+>a : number
+>10 : number
+
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt b/tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt
new file mode 100644
index 00000000000..e91781ccd77
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt
@@ -0,0 +1,7 @@
+error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
+
+
+!!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
+==== tests/cases/compiler/optionsInlineSourceMapSourcemap.ts (0 errors) ====
+    
+    var a = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourcemap.js b/tests/baselines/reference/optionsInlineSourceMapSourcemap.js
new file mode 100644
index 00000000000..96d468d27da
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourcemap.js
@@ -0,0 +1,7 @@
+//// [optionsInlineSourceMapSourcemap.ts]
+
+var a = 10;
+
+//// [optionsInlineSourceMapSourcemap.js]
+var a = 10;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZW1hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm9wdGlvbnNJbmxpbmVTb3VyY2VNYXBTb3VyY2VtYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDIn0=
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt
new file mode 100644
index 00000000000..ecd6c4062c3
--- /dev/null
+++ b/tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt
@@ -0,0 +1,33 @@
+===================================================================
+JsFile: optionsInlineSourceMapSourcemap.js
+mapUrl: optionsInlineSourceMapSourcemap.js.map
+sourceRoot: 
+sources: optionsInlineSourceMapSourcemap.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/optionsInlineSourceMapSourcemap.js
+sourceFile:optionsInlineSourceMapSourcemap.ts
+-------------------------------------------------------------------
+>>>var a = 10;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^
+6 >          ^
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a
+4 >      = 
+5 >        10
+6 >          ;
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0)
+5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0)
+6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZW1hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm9wdGlvbnNJbmxpbmVTb3VyY2VNYXBTb3VyY2VtYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDIn0=
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.js b/tests/baselines/reference/optionsSourcemapInlineSources.js
new file mode 100644
index 00000000000..029575ab992
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSources.js
@@ -0,0 +1,7 @@
+//// [optionsSourcemapInlineSources.ts]
+
+var a = 10;
+
+//// [optionsSourcemapInlineSources.js]
+var a = 10;
+//# sourceMappingURL=optionsSourcemapInlineSources.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.js.map b/tests/baselines/reference/optionsSourcemapInlineSources.js.map
new file mode 100644
index 00000000000..2be06332573
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSources.js.map
@@ -0,0 +1,2 @@
+//// [optionsSourcemapInlineSources.js.map]
+{"version":3,"file":"optionsSourcemapInlineSources.js","sourceRoot":"","sources":["optionsSourcemapInlineSources.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,EAAE,CAAC","sourcesContent":["\nvar a = 10;"]}
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt b/tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt
new file mode 100644
index 00000000000..79119d8c687
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt
@@ -0,0 +1,34 @@
+===================================================================
+JsFile: optionsSourcemapInlineSources.js
+mapUrl: optionsSourcemapInlineSources.js.map
+sourceRoot: 
+sources: optionsSourcemapInlineSources.ts
+sourcesContent: ["\nvar a = 10;"]
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/optionsSourcemapInlineSources.js
+sourceFile:optionsSourcemapInlineSources.ts
+-------------------------------------------------------------------
+>>>var a = 10;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^
+6 >          ^
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a
+4 >      = 
+5 >        10
+6 >          ;
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0)
+5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0)
+6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=optionsSourcemapInlineSources.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.symbols b/tests/baselines/reference/optionsSourcemapInlineSources.symbols
new file mode 100644
index 00000000000..50649b86a0d
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSources.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/optionsSourcemapInlineSources.ts ===
+
+var a = 10;
+>a : Symbol(a, Decl(optionsSourcemapInlineSources.ts, 1, 3))
+
diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.types b/tests/baselines/reference/optionsSourcemapInlineSources.types
new file mode 100644
index 00000000000..42fa1839371
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSources.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/optionsSourcemapInlineSources.ts ===
+
+var a = 10;
+>a : number
+>10 : number
+
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js
new file mode 100644
index 00000000000..f7100140850
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js
@@ -0,0 +1,7 @@
+//// [optionsSourcemapInlineSourcesMapRoot.ts]
+
+var a = 10;
+
+//// [optionsSourcemapInlineSourcesMapRoot.js]
+var a = 10;
+//# sourceMappingURL=local/optionsSourcemapInlineSourcesMapRoot.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map
new file mode 100644
index 00000000000..e99843b577f
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map
@@ -0,0 +1,2 @@
+//// [optionsSourcemapInlineSourcesMapRoot.js.map]
+{"version":3,"file":"optionsSourcemapInlineSourcesMapRoot.js","sourceRoot":"","sources":["../optionsSourcemapInlineSourcesMapRoot.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,EAAE,CAAC","sourcesContent":["\nvar a = 10;"]}
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt
new file mode 100644
index 00000000000..a00040a9c93
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt
@@ -0,0 +1,34 @@
+===================================================================
+JsFile: optionsSourcemapInlineSourcesMapRoot.js
+mapUrl: local/optionsSourcemapInlineSourcesMapRoot.js.map
+sourceRoot: 
+sources: ../optionsSourcemapInlineSourcesMapRoot.ts
+sourcesContent: ["\nvar a = 10;"]
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.js
+sourceFile:../optionsSourcemapInlineSourcesMapRoot.ts
+-------------------------------------------------------------------
+>>>var a = 10;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^
+6 >          ^
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a
+4 >      = 
+5 >        10
+6 >          ;
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0)
+5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0)
+6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=local/optionsSourcemapInlineSourcesMapRoot.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols
new file mode 100644
index 00000000000..57833abe2ee
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts ===
+
+var a = 10;
+>a : Symbol(a, Decl(optionsSourcemapInlineSourcesMapRoot.ts, 1, 3))
+
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types
new file mode 100644
index 00000000000..77abb6f7b11
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts ===
+
+var a = 10;
+>a : number
+>10 : number
+
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt
new file mode 100644
index 00000000000..bfa77ff5a3e
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt
@@ -0,0 +1,7 @@
+error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSources'.
+
+
+!!! error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSources'.
+==== tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts (0 errors) ====
+    
+    var a = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js
new file mode 100644
index 00000000000..948d6536f46
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js
@@ -0,0 +1,7 @@
+//// [optionsSourcemapInlineSourcesSourceRoot.ts]
+
+var a = 10;
+
+//// [optionsSourcemapInlineSourcesSourceRoot.js]
+var a = 10;
+//# sourceMappingURL=optionsSourcemapInlineSourcesSourceRoot.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map
new file mode 100644
index 00000000000..ad373e11aab
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map
@@ -0,0 +1,2 @@
+//// [optionsSourcemapInlineSourcesSourceRoot.js.map]
+{"version":3,"file":"optionsSourcemapInlineSourcesSourceRoot.js","sourceRoot":"local/","sources":["optionsSourcemapInlineSourcesSourceRoot.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,EAAE,CAAC","sourcesContent":["\nvar a = 10;"]}
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt
new file mode 100644
index 00000000000..55102f5c1cd
--- /dev/null
+++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt
@@ -0,0 +1,34 @@
+===================================================================
+JsFile: optionsSourcemapInlineSourcesSourceRoot.js
+mapUrl: optionsSourcemapInlineSourcesSourceRoot.js.map
+sourceRoot: local/
+sources: optionsSourcemapInlineSourcesSourceRoot.ts
+sourcesContent: ["\nvar a = 10;"]
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.js
+sourceFile:optionsSourcemapInlineSourcesSourceRoot.ts
+-------------------------------------------------------------------
+>>>var a = 10;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^
+6 >          ^
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a
+4 >      = 
+5 >        10
+6 >          ;
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0)
+5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0)
+6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=optionsSourcemapInlineSourcesSourceRoot.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/out-flag2.errors.txt b/tests/baselines/reference/out-flag2.errors.txt
new file mode 100644
index 00000000000..ea6fed45bd0
--- /dev/null
+++ b/tests/baselines/reference/out-flag2.errors.txt
@@ -0,0 +1,10 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/a.ts (0 errors) ====
+    
+    class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    class B { }
\ No newline at end of file
diff --git a/tests/baselines/reference/out-flag2.symbols b/tests/baselines/reference/out-flag2.symbols
deleted file mode 100644
index 1bca057c580..00000000000
--- a/tests/baselines/reference/out-flag2.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/compiler/a.ts ===
-
-class A { }
->A : Symbol(A, Decl(a.ts, 0, 0))
-
-=== tests/cases/compiler/b.ts ===
-class B { }
->B : Symbol(B, Decl(b.ts, 0, 0))
-
diff --git a/tests/baselines/reference/out-flag2.types b/tests/baselines/reference/out-flag2.types
deleted file mode 100644
index 5a13642f99f..00000000000
--- a/tests/baselines/reference/out-flag2.types
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/compiler/a.ts ===
-
-class A { }
->A : A
-
-=== tests/cases/compiler/b.ts ===
-class B { }
->B : B
-
diff --git a/tests/baselines/reference/out-flag3.errors.txt b/tests/baselines/reference/out-flag3.errors.txt
index 6b7dda7c962..c01cef151f3 100644
--- a/tests/baselines/reference/out-flag3.errors.txt
+++ b/tests/baselines/reference/out-flag3.errors.txt
@@ -1,7 +1,9 @@
 error TS5053: Option 'out' cannot be specified with option 'outFile'.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
 
 
 !!! error TS5053: Option 'out' cannot be specified with option 'outFile'.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     
     // --out and --outFile error
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
new file mode 100644
index 00000000000..a1c874abb7c
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -0,0 +1,46 @@
+//// [tests/cases/compiler/outModuleConcatAmd.ts] ////
+
+//// [a.ts]
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=all.js.map
+
+//// [all.d.ts]
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
new file mode 100644
index 00000000000..44cd5ce9955
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -0,0 +1,2 @@
+//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":";;;;;;IACA;QAAAA;QAAiBC,CAACA;QAADD,QAACA;IAADA,CAACA,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;ICAlB;QAAuBE,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
new file mode 100644
index 00000000000..eec3a6014aa
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -0,0 +1,164 @@
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+>>>    var A = (function () {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(7, 5) Source(2, 1) + SourceIndex(0)
+---
+>>>        function A() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(8, 9) Source(2, 1) + SourceIndex(0) name (A)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1->export class A { 
+2 >        }
+1->Emitted(9, 9) Source(2, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(9, 10) Source(2, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>        return A;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(10, 17) Source(2, 19) + SourceIndex(0) name (A)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class A { }
+1 >Emitted(11, 5) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(11, 6) Source(2, 19) + SourceIndex(0) name (A)
+3 >Emitted(11, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(11, 10) Source(2, 19) + SourceIndex(0)
+---
+>>>    exports.A = A;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    A
+3 >              { }
+4 >                 
+1->Emitted(12, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(12, 14) Source(2, 15) + SourceIndex(0)
+3 >Emitted(12, 18) Source(2, 19) + SourceIndex(0)
+4 >Emitted(12, 19) Source(2, 19) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>});
+>>>define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+>>>    var B = (function (_super) {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(15, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        __extends(B, _super);
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >        A
+1->Emitted(16, 9) Source(2, 24) + SourceIndex(1) name (B)
+2 >Emitted(16, 30) Source(2, 25) + SourceIndex(1) name (B)
+---
+>>>        function B() {
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(17, 9) Source(2, 1) + SourceIndex(1) name (B)
+---
+>>>            _super.apply(this, arguments);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >            A
+1->Emitted(18, 13) Source(2, 24) + SourceIndex(1) name (B.constructor)
+2 >Emitted(18, 43) Source(2, 25) + SourceIndex(1) name (B.constructor)
+---
+>>>        }
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1 > { 
+2 >        }
+1 >Emitted(19, 9) Source(2, 28) + SourceIndex(1) name (B.constructor)
+2 >Emitted(19, 10) Source(2, 29) + SourceIndex(1) name (B.constructor)
+---
+>>>        return B;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(20, 9) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(20, 17) Source(2, 29) + SourceIndex(1) name (B)
+---
+>>>    })(a_1.A);
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^
+5 >       ^^^^^
+6 >            ^^
+7 >              ^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class B extends 
+5 >       A
+6 >             { }
+1 >Emitted(21, 5) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(21, 6) Source(2, 29) + SourceIndex(1) name (B)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 8) Source(2, 24) + SourceIndex(1)
+5 >Emitted(21, 13) Source(2, 25) + SourceIndex(1)
+6 >Emitted(21, 15) Source(2, 29) + SourceIndex(1)
+---
+>>>    exports.B = B;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    B
+3 >              extends A { }
+4 >                 
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 14) Source(2, 15) + SourceIndex(1)
+3 >Emitted(22, 18) Source(2, 29) + SourceIndex(1)
+4 >Emitted(22, 19) Source(2, 29) + SourceIndex(1)
+---
+>>>});
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.symbols b/tests/baselines/reference/outModuleConcatAmd.symbols
new file mode 100644
index 00000000000..349de40815a
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 26))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
diff --git a/tests/baselines/reference/outModuleConcatAmd.types b/tests/baselines/reference/outModuleConcatAmd.types
new file mode 100644
index 00000000000..6e0d9398853
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.errors.txt b/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
new file mode 100644
index 00000000000..d1a2adbc93f
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
@@ -0,0 +1,13 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/ref/a.ts (0 errors) ====
+    
+    // This should be an error
+    
+    export class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js b/tests/baselines/reference/outModuleConcatCommonjs.js
new file mode 100644
index 00000000000..c859d6c63ef
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.js
@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/outModuleConcatCommonjs.ts] ////
+
+//// [a.ts]
+
+// This should be an error
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+// This should be an error
+//# sourceMappingURL=all.js.map
+
+//// [all.d.ts]
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js.map b/tests/baselines/reference/outModuleConcatCommonjs.js.map
new file mode 100644
index 00000000000..09646467406
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.js.map
@@ -0,0 +1,2 @@
+//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AACA,0BAA0B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt b/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
new file mode 100644
index 00000000000..698328649e2
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
@@ -0,0 +1,26 @@
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>// This should be an error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^->
+1 >
+  >
+2 >// This should be an error
+1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 27) Source(2, 27) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.errors.txt b/tests/baselines/reference/outModuleConcatES6.errors.txt
new file mode 100644
index 00000000000..d1a2adbc93f
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.errors.txt
@@ -0,0 +1,13 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/ref/a.ts (0 errors) ====
+    
+    // This should be an error
+    
+    export class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.js b/tests/baselines/reference/outModuleConcatES6.js
new file mode 100644
index 00000000000..037d52eb410
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.js
@@ -0,0 +1,26 @@
+//// [tests/cases/compiler/outModuleConcatES6.ts] ////
+
+//// [a.ts]
+
+// This should be an error
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [all.js]
+// This should be an error
+//# sourceMappingURL=all.js.map
+
+//// [all.d.ts]
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleConcatES6.js.map b/tests/baselines/reference/outModuleConcatES6.js.map
new file mode 100644
index 00000000000..bd3e6f58731
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.js.map
@@ -0,0 +1,2 @@
+//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AACA,0BAA0B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.sourcemap.txt b/tests/baselines/reference/outModuleConcatES6.sourcemap.txt
new file mode 100644
index 00000000000..78b6e98ac15
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.sourcemap.txt
@@ -0,0 +1,21 @@
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>// This should be an error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^->
+1 >
+  >
+2 >// This should be an error
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 27) Source(2, 27) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js
new file mode 100644
index 00000000000..1f8bdbd8070
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -0,0 +1,62 @@
+//// [tests/cases/compiler/outModuleConcatSystem.ts] ////
+
+//// [a.ts]
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+System.register("tests/cases/compiler/ref/a", [], function(exports_1) {
+    var A;
+    return {
+        setters:[],
+        execute: function() {
+            A = (function () {
+                function A() {
+                }
+                return A;
+            })();
+            exports_1("A", A);
+        }
+    }
+});
+System.register("tests/cases/compiler/b", ["tests/cases/compiler/ref/a"], function(exports_2) {
+    var a_1;
+    var B;
+    return {
+        setters:[
+            function (a_1_1) {
+                a_1 = a_1_1;
+            }],
+        execute: function() {
+            B = (function (_super) {
+                __extends(B, _super);
+                function B() {
+                    _super.apply(this, arguments);
+                }
+                return B;
+            })(a_1.A);
+            exports_2("B", B);
+        }
+    }
+});
+//# sourceMappingURL=all.js.map
+
+//// [all.d.ts]
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map
new file mode 100644
index 00000000000..77ff05f84fb
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.js.map
@@ -0,0 +1,2 @@
+//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":";;;;;;;;;;YACA;gBAAAA;gBAAiBC,CAACA;gBAADD,QAACA;YAADA,CAACA,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;YCAlB;gBAAuBE,qBAACA;gBAAxBA;oBAAuBC,8BAACA;gBAAGA,CAACA;gBAADD,QAACA;YAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
new file mode 100644
index 00000000000..489487772db
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -0,0 +1,174 @@
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>System.register("tests/cases/compiler/ref/a", [], function(exports_1) {
+>>>    var A;
+>>>    return {
+>>>        setters:[],
+>>>        execute: function() {
+>>>            A = (function () {
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(11, 13) Source(2, 1) + SourceIndex(0)
+---
+>>>                function A() {
+1->^^^^^^^^^^^^^^^^
+2 >                ^^->
+1->
+1->Emitted(12, 17) Source(2, 1) + SourceIndex(0) name (A)
+---
+>>>                }
+1->^^^^^^^^^^^^^^^^
+2 >                ^
+3 >                 ^^^^^^^^^->
+1->export class A { 
+2 >                }
+1->Emitted(13, 17) Source(2, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(13, 18) Source(2, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>                return A;
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^
+1->
+2 >                }
+1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(14, 25) Source(2, 19) + SourceIndex(0) name (A)
+---
+>>>            })();
+1 >^^^^^^^^^^^^
+2 >            ^
+3 >             
+4 >             ^^^^
+5 >                 ^^^^^^^^^^^^^^->
+1 >
+2 >            }
+3 >             
+4 >             export class A { }
+1 >Emitted(15, 13) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(15, 14) Source(2, 19) + SourceIndex(0) name (A)
+3 >Emitted(15, 14) Source(2, 1) + SourceIndex(0)
+4 >Emitted(15, 18) Source(2, 19) + SourceIndex(0)
+---
+>>>            exports_1("A", A);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^
+3 >                             ^
+1->
+2 >            export class A { }
+3 >                             
+1->Emitted(16, 13) Source(2, 1) + SourceIndex(0)
+2 >Emitted(16, 30) Source(2, 19) + SourceIndex(0)
+3 >Emitted(16, 31) Source(2, 19) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>        }
+>>>    }
+>>>});
+>>>System.register("tests/cases/compiler/b", ["tests/cases/compiler/ref/a"], function(exports_2) {
+>>>    var a_1;
+>>>    var B;
+>>>    return {
+>>>        setters:[
+>>>            function (a_1_1) {
+>>>                a_1 = a_1_1;
+>>>            }],
+>>>        execute: function() {
+>>>            B = (function (_super) {
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(29, 13) Source(2, 1) + SourceIndex(1)
+---
+>>>                __extends(B, _super);
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >                A
+1->Emitted(30, 17) Source(2, 24) + SourceIndex(1) name (B)
+2 >Emitted(30, 38) Source(2, 25) + SourceIndex(1) name (B)
+---
+>>>                function B() {
+1 >^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(31, 17) Source(2, 1) + SourceIndex(1) name (B)
+---
+>>>                    _super.apply(this, arguments);
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >                    A
+1->Emitted(32, 21) Source(2, 24) + SourceIndex(1) name (B.constructor)
+2 >Emitted(32, 51) Source(2, 25) + SourceIndex(1) name (B.constructor)
+---
+>>>                }
+1 >^^^^^^^^^^^^^^^^
+2 >                ^
+3 >                 ^^^^^^^^^->
+1 > { 
+2 >                }
+1 >Emitted(33, 17) Source(2, 28) + SourceIndex(1) name (B.constructor)
+2 >Emitted(33, 18) Source(2, 29) + SourceIndex(1) name (B.constructor)
+---
+>>>                return B;
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^
+1->
+2 >                }
+1->Emitted(34, 17) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(34, 25) Source(2, 29) + SourceIndex(1) name (B)
+---
+>>>            })(a_1.A);
+1 >^^^^^^^^^^^^
+2 >            ^
+3 >             
+4 >             ^^
+5 >               ^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^->
+1 >
+2 >            }
+3 >             
+4 >             export class B extends 
+5 >               A
+6 >                     { }
+1 >Emitted(35, 13) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(35, 14) Source(2, 29) + SourceIndex(1) name (B)
+3 >Emitted(35, 14) Source(2, 1) + SourceIndex(1)
+4 >Emitted(35, 16) Source(2, 24) + SourceIndex(1)
+5 >Emitted(35, 21) Source(2, 25) + SourceIndex(1)
+6 >Emitted(35, 23) Source(2, 29) + SourceIndex(1)
+---
+>>>            exports_2("B", B);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^
+3 >                             ^
+1->
+2 >            export class B extends A { }
+3 >                             
+1->Emitted(36, 13) Source(2, 1) + SourceIndex(1)
+2 >Emitted(36, 30) Source(2, 29) + SourceIndex(1)
+3 >Emitted(36, 31) Source(2, 29) + SourceIndex(1)
+---
+>>>        }
+>>>    }
+>>>});
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.symbols b/tests/baselines/reference/outModuleConcatSystem.symbols
new file mode 100644
index 00000000000..349de40815a
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 26))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
diff --git a/tests/baselines/reference/outModuleConcatSystem.types b/tests/baselines/reference/outModuleConcatSystem.types
new file mode 100644
index 00000000000..6e0d9398853
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
diff --git a/tests/baselines/reference/outModuleConcatUmd.errors.txt b/tests/baselines/reference/outModuleConcatUmd.errors.txt
new file mode 100644
index 00000000000..8695199c7eb
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.errors.txt
@@ -0,0 +1,13 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/ref/a.ts (0 errors) ====
+    
+    // This should error
+    
+    export class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.js b/tests/baselines/reference/outModuleConcatUmd.js
new file mode 100644
index 00000000000..c4aad41c6ed
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.js
@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/outModuleConcatUmd.ts] ////
+
+//// [a.ts]
+
+// This should error
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+// This should error
+//# sourceMappingURL=all.js.map
+
+//// [all.d.ts]
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleConcatUmd.js.map b/tests/baselines/reference/outModuleConcatUmd.js.map
new file mode 100644
index 00000000000..7a9fcd77bdf
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.js.map
@@ -0,0 +1,2 @@
+//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AACA,oBAAoB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
new file mode 100644
index 00000000000..d2fbe17fe65
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
@@ -0,0 +1,26 @@
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>// This should error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^->
+1 >
+  >
+2 >// This should error
+1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 21) Source(2, 21) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
new file mode 100644
index 00000000000..ae4ac43b5c9
--- /dev/null
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -0,0 +1,81 @@
+//// [tests/cases/compiler/outModuleTripleSlashRefs.ts] ////
+
+//// [a.ts]
+
+/// <reference path="./b.ts" />
+export class A {
+	member: typeof GlobalFoo;
+}
+
+//// [b.ts]
+/// <reference path="./c.d.ts" />
+class Foo {
+	member: Bar;
+}
+declare var GlobalFoo: Foo;
+
+//// [c.d.ts]
+/// <reference path="./d.d.ts" />
+declare class Bar {
+	member: Baz;
+}
+
+//// [d.d.ts]
+declare class Baz {
+	member: number;
+}
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+
+//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+/// <reference path="./c.d.ts" />
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+    /// <reference path="./b.ts" />
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=all.js.map
+
+//// [all.d.ts]
+/// <reference path="tests/cases/compiler/ref/c.d.ts" />
+declare class Foo {
+    member: Bar;
+}
+declare var GlobalFoo: Foo;
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+        member: typeof GlobalFoo;
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
new file mode 100644
index 00000000000..711163a76e8
--- /dev/null
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -0,0 +1,2 @@
+//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["Foo","Foo.constructor","A","A.constructor","B","B.constructor"],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAAA;IAEAC,CAACA;IAADD,UAACA;AAADA,CAACA,AAFD,IAEC;;ICFD,+BAA+B;IAC/B;QAAAE;QAEAC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;ICHD;QAAuBE,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
new file mode 100644
index 00000000000..c95eb22cb10
--- /dev/null
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -0,0 +1,240 @@
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/b.ts,tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/b.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>/// <reference path="./c.d.ts" />
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path="./c.d.ts" />
+1 >Emitted(6, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(6, 34) Source(1, 34) + SourceIndex(0)
+---
+>>>var Foo = (function () {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(7, 1) Source(2, 1) + SourceIndex(0)
+---
+>>>    function Foo() {
+1->^^^^
+2 >    ^^->
+1->
+1->Emitted(8, 5) Source(2, 1) + SourceIndex(0) name (Foo)
+---
+>>>    }
+1->^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^->
+1->class Foo {
+  >	member: Bar;
+  >
+2 >    }
+1->Emitted(9, 5) Source(4, 1) + SourceIndex(0) name (Foo.constructor)
+2 >Emitted(9, 6) Source(4, 2) + SourceIndex(0) name (Foo.constructor)
+---
+>>>    return Foo;
+1->^^^^
+2 >    ^^^^^^^^^^
+1->
+2 >    }
+1->Emitted(10, 5) Source(4, 1) + SourceIndex(0) name (Foo)
+2 >Emitted(10, 15) Source(4, 2) + SourceIndex(0) name (Foo)
+---
+>>>})();
+1 >
+2 >^
+3 > 
+4 > ^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >}
+3 > 
+4 > class Foo {
+  > 	member: Bar;
+  > }
+1 >Emitted(11, 1) Source(4, 1) + SourceIndex(0) name (Foo)
+2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0) name (Foo)
+3 >Emitted(11, 2) Source(2, 1) + SourceIndex(0)
+4 >Emitted(11, 6) Source(4, 2) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+>>>    /// <reference path="./b.ts" />
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >
+2 >    /// <reference path="./b.ts" />
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+2 >Emitted(13, 36) Source(2, 32) + SourceIndex(1)
+---
+>>>    var A = (function () {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(14, 5) Source(3, 1) + SourceIndex(1)
+---
+>>>        function A() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(15, 9) Source(3, 1) + SourceIndex(1) name (A)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1->export class A {
+  >	member: typeof GlobalFoo;
+  >
+2 >        }
+1->Emitted(16, 9) Source(5, 1) + SourceIndex(1) name (A.constructor)
+2 >Emitted(16, 10) Source(5, 2) + SourceIndex(1) name (A.constructor)
+---
+>>>        return A;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(17, 9) Source(5, 1) + SourceIndex(1) name (A)
+2 >Emitted(17, 17) Source(5, 2) + SourceIndex(1) name (A)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class A {
+  >     	member: typeof GlobalFoo;
+  >     }
+1 >Emitted(18, 5) Source(5, 1) + SourceIndex(1) name (A)
+2 >Emitted(18, 6) Source(5, 2) + SourceIndex(1) name (A)
+3 >Emitted(18, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(18, 10) Source(5, 2) + SourceIndex(1)
+---
+>>>    exports.A = A;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    A
+3 >              {
+  >             	member: typeof GlobalFoo;
+  >             }
+4 >                 
+1->Emitted(19, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(19, 14) Source(3, 15) + SourceIndex(1)
+3 >Emitted(19, 18) Source(5, 2) + SourceIndex(1)
+4 >Emitted(19, 19) Source(5, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>});
+>>>define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+>>>    var B = (function (_super) {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(22, 5) Source(2, 1) + SourceIndex(2)
+---
+>>>        __extends(B, _super);
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >        A
+1->Emitted(23, 9) Source(2, 24) + SourceIndex(2) name (B)
+2 >Emitted(23, 30) Source(2, 25) + SourceIndex(2) name (B)
+---
+>>>        function B() {
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(24, 9) Source(2, 1) + SourceIndex(2) name (B)
+---
+>>>            _super.apply(this, arguments);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >            A
+1->Emitted(25, 13) Source(2, 24) + SourceIndex(2) name (B.constructor)
+2 >Emitted(25, 43) Source(2, 25) + SourceIndex(2) name (B.constructor)
+---
+>>>        }
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1 > { 
+2 >        }
+1 >Emitted(26, 9) Source(2, 28) + SourceIndex(2) name (B.constructor)
+2 >Emitted(26, 10) Source(2, 29) + SourceIndex(2) name (B.constructor)
+---
+>>>        return B;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(27, 9) Source(2, 28) + SourceIndex(2) name (B)
+2 >Emitted(27, 17) Source(2, 29) + SourceIndex(2) name (B)
+---
+>>>    })(a_1.A);
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^
+5 >       ^^^^^
+6 >            ^^
+7 >              ^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class B extends 
+5 >       A
+6 >             { }
+1 >Emitted(28, 5) Source(2, 28) + SourceIndex(2) name (B)
+2 >Emitted(28, 6) Source(2, 29) + SourceIndex(2) name (B)
+3 >Emitted(28, 6) Source(2, 1) + SourceIndex(2)
+4 >Emitted(28, 8) Source(2, 24) + SourceIndex(2)
+5 >Emitted(28, 13) Source(2, 25) + SourceIndex(2)
+6 >Emitted(28, 15) Source(2, 29) + SourceIndex(2)
+---
+>>>    exports.B = B;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    B
+3 >              extends A { }
+4 >                 
+1->Emitted(29, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(29, 14) Source(2, 15) + SourceIndex(2)
+3 >Emitted(29, 18) Source(2, 29) + SourceIndex(2)
+4 >Emitted(29, 19) Source(2, 29) + SourceIndex(2)
+---
+>>>});
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.symbols b/tests/baselines/reference/outModuleTripleSlashRefs.symbols
new file mode 100644
index 00000000000..f8d550aedb6
--- /dev/null
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.symbols
@@ -0,0 +1,50 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+/// <reference path="./b.ts" />
+export class A {
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+	member: typeof GlobalFoo;
+>member : Symbol(member, Decl(a.ts, 2, 16))
+>GlobalFoo : Symbol(GlobalFoo, Decl(b.ts, 4, 11))
+}
+
+=== tests/cases/compiler/ref/b.ts ===
+/// <reference path="./c.d.ts" />
+class Foo {
+>Foo : Symbol(Foo, Decl(b.ts, 0, 0))
+
+	member: Bar;
+>member : Symbol(member, Decl(b.ts, 1, 11))
+>Bar : Symbol(Bar, Decl(c.d.ts, 0, 0))
+}
+declare var GlobalFoo: Foo;
+>GlobalFoo : Symbol(GlobalFoo, Decl(b.ts, 4, 11))
+>Foo : Symbol(Foo, Decl(b.ts, 0, 0))
+
+=== tests/cases/compiler/ref/c.d.ts ===
+/// <reference path="./d.d.ts" />
+declare class Bar {
+>Bar : Symbol(Bar, Decl(c.d.ts, 0, 0))
+
+	member: Baz;
+>member : Symbol(member, Decl(c.d.ts, 1, 19))
+>Baz : Symbol(Baz, Decl(d.d.ts, 0, 0))
+}
+
+=== tests/cases/compiler/ref/d.d.ts ===
+declare class Baz {
+>Baz : Symbol(Baz, Decl(d.d.ts, 0, 0))
+
+	member: number;
+>member : Symbol(member, Decl(d.d.ts, 0, 19))
+}
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 26))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.types b/tests/baselines/reference/outModuleTripleSlashRefs.types
new file mode 100644
index 00000000000..917704cce5a
--- /dev/null
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.types
@@ -0,0 +1,50 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+/// <reference path="./b.ts" />
+export class A {
+>A : A
+
+	member: typeof GlobalFoo;
+>member : Foo
+>GlobalFoo : Foo
+}
+
+=== tests/cases/compiler/ref/b.ts ===
+/// <reference path="./c.d.ts" />
+class Foo {
+>Foo : Foo
+
+	member: Bar;
+>member : Bar
+>Bar : Bar
+}
+declare var GlobalFoo: Foo;
+>GlobalFoo : Foo
+>Foo : Foo
+
+=== tests/cases/compiler/ref/c.d.ts ===
+/// <reference path="./d.d.ts" />
+declare class Bar {
+>Bar : Bar
+
+	member: Baz;
+>member : Baz
+>Baz : Baz
+}
+
+=== tests/cases/compiler/ref/d.d.ts ===
+declare class Baz {
+>Baz : Baz
+
+	member: number;
+>member : number
+}
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt
index 079951880ab..a78e0c8abcf 100644
--- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt
+++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(1,8): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
-tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(1,37): error TS1005: ';' expected.
+tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,8): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,37): error TS1005: ';' expected.
 
 
 ==== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts (2 errors) ====
+    
     var f: (x: 'hi') => number = ('hi') => { return 1; };
            ~~~~~~~~~~~~~~~~~~~
 !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js
index 48e52ba0967..aa5c8701f28 100644
--- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js
+++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js
@@ -1,4 +1,5 @@
 //// [overloadOnConstAsTypeAnnotation.ts]
+
 var f: (x: 'hi') => number = ('hi') => { return 1; };
 
 //// [overloadOnConstAsTypeAnnotation.js]
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.types b/tests/baselines/reference/overloadOnConstConstraintChecks1.types
index cc561eb6e21..012774b3cc9 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.types
@@ -22,23 +22,23 @@ interface MyDoc { // Document
 >MyDoc : MyDoc
 
     createElement(tagName: string): Base;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : string
 >Base : Base
 
     createElement(tagName: 'canvas'): Derived1;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
->tagName : 'canvas'
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
+>tagName : "canvas"
 >Derived1 : Derived1
 
     createElement(tagName: 'div'): Derived2;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
->tagName : 'div'
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
+>tagName : "div"
 >Derived2 : Derived2
 
     createElement(tagName: 'span'): Derived3;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
->tagName : 'span'
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
+>tagName : "span"
 >Derived3 : Derived3
 
     // + 100 more
@@ -49,27 +49,27 @@ class D implements MyDoc {
 >MyDoc : MyDoc
 
     createElement(tagName:string): Base;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : string
 >Base : Base
 
     createElement(tagName: 'canvas'): Derived1;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
->tagName : 'canvas'
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
+>tagName : "canvas"
 >Derived1 : Derived1
 
     createElement(tagName: 'div'): Derived2;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
->tagName : 'div'
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
+>tagName : "div"
 >Derived2 : Derived2
 
     createElement(tagName: 'span'): Derived3;
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
->tagName : 'span'
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
+>tagName : "span"
 >Derived3 : Derived3
 
     createElement(tagName:any): Base {
->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; }
+>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : any
 >Base : Base
 
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.types b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
index 36fa89dec4a..6102c282a60 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
@@ -14,22 +14,22 @@ class C extends A {
 >foo : () => void
 }
 function foo(name: 'hi'): B;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
->name : 'hi'
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
+>name : "hi"
 >B : B
 
 function foo(name: 'bye'): C;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
->name : 'bye'
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
+>name : "bye"
 >C : C
 
 function foo(name: string): A;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : string
 >A : A
 
 function foo(name: any): A {
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : any
 >A : A
 
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.types b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
index 94a03bb7680..0348d3d4b79 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
@@ -16,22 +16,22 @@ class C extends A {
 >foo : () => void
 }
 function foo(name: 'hi'): B;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
->name : 'hi'
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
+>name : "hi"
 >B : B
 
 function foo(name: 'bye'): C;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
->name : 'bye'
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
+>name : "bye"
 >C : C
 
 function foo(name: string): A;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : string
 >A : A
 
 function foo(name: any): A {
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : any
 >A : A
 
diff --git a/tests/baselines/reference/overloadOnConstInheritance1.types b/tests/baselines/reference/overloadOnConstInheritance1.types
index 96f8df3dffd..4721c18e55c 100644
--- a/tests/baselines/reference/overloadOnConstInheritance1.types
+++ b/tests/baselines/reference/overloadOnConstInheritance1.types
@@ -3,23 +3,23 @@ interface Base {
 >Base : Base
 
     addEventListener(x: string): any;
->addEventListener : { (x: string): any; (x: 'foo'): string; }
+>addEventListener : { (x: string): any; (x: "foo"): string; }
 >x : string
 
     addEventListener(x: 'foo'): string;
->addEventListener : { (x: string): any; (x: 'foo'): string; }
->x : 'foo'
+>addEventListener : { (x: string): any; (x: "foo"): string; }
+>x : "foo"
 }
 interface Deriver extends Base {
 >Deriver : Deriver
 >Base : Base
 
     addEventListener(x: string): any;
->addEventListener : { (x: string): any; (x: 'bar'): string; }
+>addEventListener : { (x: string): any; (x: "bar"): string; }
 >x : string
 
     addEventListener(x: 'bar'): string;
->addEventListener : { (x: string): any; (x: 'bar'): string; }
->x : 'bar'
+>addEventListener : { (x: string): any; (x: "bar"): string; }
+>x : "bar"
 }
 
diff --git a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt
index 159af64a13a..4870106f474 100644
--- a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt
+++ b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'.
   Types of property 'addEventListener' are incompatible.
-    Type '(x: 'bar') => string' is not assignable to type '{ (x: string): any; (x: 'foo'): string; }'.
+    Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'.
 tests/cases/compiler/overloadOnConstInheritance2.ts(6,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 
 
@@ -13,7 +13,7 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(6,5): error TS2382: Speciali
               ~~~~~~~
 !!! error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'.
 !!! error TS2430:   Types of property 'addEventListener' are incompatible.
-!!! error TS2430:     Type '(x: 'bar') => string' is not assignable to type '{ (x: string): any; (x: 'foo'): string; }'.
+!!! error TS2430:     Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'.
         addEventListener(x: 'bar'): string; // shouldn't need to redeclare the string overload
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
diff --git a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt
index e0fff7b1ec7..b338f9795d7 100644
--- a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt
+++ b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/overloadOnConstInheritance3.ts(4,11): error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'.
   Types of property 'addEventListener' are incompatible.
-    Type '{ (x: 'bar'): string; (x: 'foo'): string; }' is not assignable to type '(x: string) => any'.
+    Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'.
 tests/cases/compiler/overloadOnConstInheritance3.ts(6,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 tests/cases/compiler/overloadOnConstInheritance3.ts(7,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 
@@ -13,7 +13,7 @@ tests/cases/compiler/overloadOnConstInheritance3.ts(7,5): error TS2382: Speciali
               ~~~~~~~
 !!! error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'.
 !!! error TS2430:   Types of property 'addEventListener' are incompatible.
-!!! error TS2430:     Type '{ (x: 'bar'): string; (x: 'foo'): string; }' is not assignable to type '(x: string) => any'.
+!!! error TS2430:     Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'.
         // shouldn't need to redeclare the string overload
         addEventListener(x: 'bar'): string;
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt
index 1676a2fb426..4fea7cc1227 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(7,10): error TS2381: A signature with an implementation cannot use a string literal type.
-tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: Argument of type 'string' is not assignable to parameter of type '"SPAN"'.
+tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: Argument of type '"HI"' is not assignable to parameter of type '"SPAN"'.
 
 
 ==== tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts (3 errors) ====
@@ -20,4 +20,4 @@ tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345:
     
     foo("HI");
         ~~~~
-!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"SPAN"'.
\ No newline at end of file
+!!! error TS2345: Argument of type '"HI"' is not assignable to parameter of type '"SPAN"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadingOnConstants2.errors.txt b/tests/baselines/reference/overloadingOnConstants2.errors.txt
index c6d63523576..b448deaadc7 100644
--- a/tests/baselines/reference/overloadingOnConstants2.errors.txt
+++ b/tests/baselines/reference/overloadingOnConstants2.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/overloadingOnConstants2.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 tests/cases/compiler/overloadingOnConstants2.ts(9,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
-tests/cases/compiler/overloadingOnConstants2.ts(15,13): error TS2345: Argument of type 'string' is not assignable to parameter of type '"bye"'.
+tests/cases/compiler/overloadingOnConstants2.ts(15,13): error TS2345: Argument of type '"um"' is not assignable to parameter of type '"bye"'.
 tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 
 
@@ -25,7 +25,7 @@ tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialize
     var b: E = foo("bye", []); // E 
     var c = foo("um", []); // error
                 ~~~~
-!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"bye"'.
+!!! error TS2345: Argument of type '"um"' is not assignable to parameter of type '"bye"'.
     
     
     //function bar(x: "hi", items: string[]): D;
diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt b/tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt
new file mode 100644
index 00000000000..54ddb963f94
--- /dev/null
+++ b/tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt
@@ -0,0 +1,44 @@
+tests/cases/compiler/parameterNamesInTypeParameterList.ts(1,30): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/parameterNamesInTypeParameterList.ts(5,30): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/parameterNamesInTypeParameterList.ts(9,30): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/parameterNamesInTypeParameterList.ts(14,22): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/parameterNamesInTypeParameterList.ts(17,22): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/parameterNamesInTypeParameterList.ts(20,22): error TS2304: Cannot find name 'a'.
+
+
+==== tests/cases/compiler/parameterNamesInTypeParameterList.ts (6 errors) ====
+    function f0<T extends typeof a>(a: T) {
+                                 ~
+!!! error TS2304: Cannot find name 'a'.
+    	a.b;
+    }
+    
+    function f1<T extends typeof a>({a}: {a:T}) {
+                                 ~
+!!! error TS2304: Cannot find name 'a'.
+    	a.b;
+    }
+    
+    function f2<T extends typeof a>([a]: T[]) {
+                                 ~
+!!! error TS2304: Cannot find name 'a'.
+    	a.b;
+    }
+    
+    class A {
+    	m0<T extends typeof a>(a: T) {
+    	                    ~
+!!! error TS2304: Cannot find name 'a'.
+    		a.b
+    	}
+    	m1<T extends typeof a>({a}: {a:T}) {
+    	                    ~
+!!! error TS2304: Cannot find name 'a'.
+    		a.b
+    	}
+    	m2<T extends typeof a>([a]: T[]) {
+    	                    ~
+!!! error TS2304: Cannot find name 'a'.
+    		a.b
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.js b/tests/baselines/reference/parameterNamesInTypeParameterList.js
new file mode 100644
index 00000000000..2fbd7fad3cb
--- /dev/null
+++ b/tests/baselines/reference/parameterNamesInTypeParameterList.js
@@ -0,0 +1,53 @@
+//// [parameterNamesInTypeParameterList.ts]
+function f0<T extends typeof a>(a: T) {
+	a.b;
+}
+
+function f1<T extends typeof a>({a}: {a:T}) {
+	a.b;
+}
+
+function f2<T extends typeof a>([a]: T[]) {
+	a.b;
+}
+
+class A {
+	m0<T extends typeof a>(a: T) {
+		a.b
+	}
+	m1<T extends typeof a>({a}: {a:T}) {
+		a.b
+	}
+	m2<T extends typeof a>([a]: T[]) {
+		a.b
+	}
+}
+
+//// [parameterNamesInTypeParameterList.js]
+function f0(a) {
+    a.b;
+}
+function f1(_a) {
+    var a = _a.a;
+    a.b;
+}
+function f2(_a) {
+    var a = _a[0];
+    a.b;
+}
+var A = (function () {
+    function A() {
+    }
+    A.prototype.m0 = function (a) {
+        a.b;
+    };
+    A.prototype.m1 = function (_a) {
+        var a = _a.a;
+        a.b;
+    };
+    A.prototype.m2 = function (_a) {
+        var a = _a[0];
+        a.b;
+    };
+    return A;
+})();
diff --git a/tests/baselines/reference/parser10.1.1-8gs.errors.txt b/tests/baselines/reference/parser10.1.1-8gs.errors.txt
index 185665d23da..3426ccab8da 100644
--- a/tests/baselines/reference/parser10.1.1-8gs.errors.txt
+++ b/tests/baselines/reference/parser10.1.1-8gs.errors.txt
@@ -1,8 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts(16,7): error TS2304: Cannot find name 'NotEarlyError'.
-tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts(17,5): error TS1212: Identifier expected. 'public' is a reserved word in strict mode
+tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts(17,7): error TS2304: Cannot find name 'NotEarlyError'.
+tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts(18,5): error TS1212: Identifier expected. 'public' is a reserved word in strict mode
 
 
 ==== tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts (2 errors) ====
+    
     /// Copyright (c) 2012 Ecma International.  All rights reserved. 
     /// Ecma International makes this code available under the terms and conditions set
     /// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
diff --git a/tests/baselines/reference/parser10.1.1-8gs.js b/tests/baselines/reference/parser10.1.1-8gs.js
index e7d342cf1f1..fb3b96f6baf 100644
--- a/tests/baselines/reference/parser10.1.1-8gs.js
+++ b/tests/baselines/reference/parser10.1.1-8gs.js
@@ -1,4 +1,5 @@
 //// [parser10.1.1-8gs.ts]
+
 /// Copyright (c) 2012 Ecma International.  All rights reserved. 
 /// Ecma International makes this code available under the terms and conditions set
 /// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
diff --git a/tests/baselines/reference/parser768531.js b/tests/baselines/reference/parser768531.js
index 26e22117717..462db3742b3 100644
--- a/tests/baselines/reference/parser768531.js
+++ b/tests/baselines/reference/parser768531.js
@@ -1,4 +1,5 @@
 //// [parser768531.ts]
+
 {a: 3}
 /x/
 
diff --git a/tests/baselines/reference/parser768531.symbols b/tests/baselines/reference/parser768531.symbols
index 2da2298c8e2..f180922c7e0 100644
--- a/tests/baselines/reference/parser768531.symbols
+++ b/tests/baselines/reference/parser768531.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts ===
-{a: 3}
+
+No type information for this code.{a: 3}
 No type information for this code./x/
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parser768531.types b/tests/baselines/reference/parser768531.types
index f1bcedefae9..434535b5cc9 100644
--- a/tests/baselines/reference/parser768531.types
+++ b/tests/baselines/reference/parser768531.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts ===
+
 {a: 3}
 >a : any
 >3 : number
diff --git a/tests/baselines/reference/parserAccessors1.errors.txt b/tests/baselines/reference/parserAccessors1.errors.txt
index 8c5033da0c4..2ef8d4e37ab 100644
--- a/tests/baselines/reference/parserAccessors1.errors.txt
+++ b/tests/baselines/reference/parserAccessors1.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts(2,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts(2,9): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts (1 errors) ====
     class C {
         get Foo() { }
             ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors10.errors.txt b/tests/baselines/reference/parserAccessors10.errors.txt
index a5228f47443..d6a2b99eaca 100644
--- a/tests/baselines/reference/parserAccessors10.errors.txt
+++ b/tests/baselines/reference/parserAccessors10.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts(2,14): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts(2,14): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts (1 errors) ====
     var v = {
       public get foo() { }
                  ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors3.errors.txt b/tests/baselines/reference/parserAccessors3.errors.txt
index 2987b606451..5411cd544eb 100644
--- a/tests/baselines/reference/parserAccessors3.errors.txt
+++ b/tests/baselines/reference/parserAccessors3.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts(1,15): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts (1 errors) ====
     var v = { get Foo() { } };
                   ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
+!!! error TS2378: A 'get' accessor must return a value.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors7.errors.txt b/tests/baselines/reference/parserAccessors7.errors.txt
index 857833a7673..3938280e6d5 100644
--- a/tests/baselines/reference/parserAccessors7.errors.txt
+++ b/tests/baselines/reference/parserAccessors7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts(1,15): error TS1054: A 'get' accessor cannot have parameters.
-tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts(1,15): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts (2 errors) ====
@@ -7,4 +7,4 @@ tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts(1,15):
                   ~~~
 !!! error TS1054: A 'get' accessor cannot have parameters.
                   ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
+!!! error TS2378: A 'get' accessor must return a value.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName4.errors.txt b/tests/baselines/reference/parserComputedPropertyName4.errors.txt
index bfc78b162fd..3430e75b82f 100644
--- a/tests/baselines/reference/parserComputedPropertyName4.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName4.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,15): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts (2 errors) ====
     var v = { get [e]() { } };
                   ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                    ~
 !!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName5.errors.txt b/tests/baselines/reference/parserComputedPropertyName5.errors.txt
index 07cc6f3a9f0..09c38ecbef5 100644
--- a/tests/baselines/reference/parserComputedPropertyName5.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts(1,22): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts(1,22): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts(1,23): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts (2 errors) ====
     var v = { public get [e]() { } };
                          ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                           ~
 !!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES3Accessors1.errors.txt b/tests/baselines/reference/parserES3Accessors1.errors.txt
index 5e2ca9f97bc..9c6dbf0e76f 100644
--- a/tests/baselines/reference/parserES3Accessors1.errors.txt
+++ b/tests/baselines/reference/parserES3Accessors1.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts(2,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts(2,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts(2,9): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts(2,9)
             ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES3Accessors3.errors.txt b/tests/baselines/reference/parserES3Accessors3.errors.txt
index 6d262e2a855..70ab3f2072e 100644
--- a/tests/baselines/reference/parserES3Accessors3.errors.txt
+++ b/tests/baselines/reference/parserES3Accessors3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts(1,15): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts(1,15): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts (2 errors) ====
@@ -7,4 +7,4 @@ tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts(1,15
                   ~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
                   ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
+!!! error TS2378: A 'get' accessor must return a value.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
index cfb12152c94..854bb364842 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS2378: A 'get' accessor must return a value.
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts (2 errors) ====
     var v = { get [e]() { } };
                   ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
                    ~
 !!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement10.js b/tests/baselines/reference/parserES5ForOfStatement10.js
index cac70523022..36c505b0a12 100644
--- a/tests/baselines/reference/parserES5ForOfStatement10.js
+++ b/tests/baselines/reference/parserES5ForOfStatement10.js
@@ -3,6 +3,6 @@ for (const v of X) {
 }
 
 //// [parserES5ForOfStatement10.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var v = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var v = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement11.js b/tests/baselines/reference/parserES5ForOfStatement11.js
index 40e4ca68d6b..e3bac1584fc 100644
--- a/tests/baselines/reference/parserES5ForOfStatement11.js
+++ b/tests/baselines/reference/parserES5ForOfStatement11.js
@@ -3,6 +3,6 @@ for (const [a, b] of X) {
 }
 
 //// [parserES5ForOfStatement11.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i], a = _a[0], b = _a[1];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i], a = _a[0], b = _a[1];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement12.js b/tests/baselines/reference/parserES5ForOfStatement12.js
index f877ebdb757..2a43ca2dea3 100644
--- a/tests/baselines/reference/parserES5ForOfStatement12.js
+++ b/tests/baselines/reference/parserES5ForOfStatement12.js
@@ -3,6 +3,6 @@ for (const {a, b} of X) {
 }
 
 //// [parserES5ForOfStatement12.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i], a = _a.a, b = _a.b;
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i], a = _a.a, b = _a.b;
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement13.js b/tests/baselines/reference/parserES5ForOfStatement13.js
index 45199480518..2f1f280090f 100644
--- a/tests/baselines/reference/parserES5ForOfStatement13.js
+++ b/tests/baselines/reference/parserES5ForOfStatement13.js
@@ -3,6 +3,6 @@ for (let {a, b} of X) {
 }
 
 //// [parserES5ForOfStatement13.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i], a = _a.a, b = _a.b;
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i], a = _a.a, b = _a.b;
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement14.js b/tests/baselines/reference/parserES5ForOfStatement14.js
index d05fdb96e57..cb753328937 100644
--- a/tests/baselines/reference/parserES5ForOfStatement14.js
+++ b/tests/baselines/reference/parserES5ForOfStatement14.js
@@ -3,6 +3,6 @@ for (let [a, b] of X) {
 }
 
 //// [parserES5ForOfStatement14.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i], a = _a[0], b = _a[1];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i], a = _a[0], b = _a[1];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement15.js b/tests/baselines/reference/parserES5ForOfStatement15.js
index 0af74961145..c7c4db351a6 100644
--- a/tests/baselines/reference/parserES5ForOfStatement15.js
+++ b/tests/baselines/reference/parserES5ForOfStatement15.js
@@ -3,6 +3,6 @@ for (var [a, b] of X) {
 }
 
 //// [parserES5ForOfStatement15.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i], a = _a[0], b = _a[1];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i], a = _a[0], b = _a[1];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement16.js b/tests/baselines/reference/parserES5ForOfStatement16.js
index 1e7c6e005a8..149b6ce3df7 100644
--- a/tests/baselines/reference/parserES5ForOfStatement16.js
+++ b/tests/baselines/reference/parserES5ForOfStatement16.js
@@ -3,6 +3,6 @@ for (var {a, b} of X) {
 }
 
 //// [parserES5ForOfStatement16.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i], a = _a.a, b = _a.b;
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i], a = _a.a, b = _a.b;
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement18.js b/tests/baselines/reference/parserES5ForOfStatement18.js
index 905ba9c1d1e..0427adb52d8 100644
--- a/tests/baselines/reference/parserES5ForOfStatement18.js
+++ b/tests/baselines/reference/parserES5ForOfStatement18.js
@@ -2,6 +2,6 @@
 for (var of of of) { }
 
 //// [parserES5ForOfStatement18.js]
-for (var _i = 0; _i < of.length; _i++) {
-    var of = of[_i];
+for (var _i = 0, of_1 = of; _i < of_1.length; _i++) {
+    var of = of_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement2.js b/tests/baselines/reference/parserES5ForOfStatement2.js
index 287602dfb9c..43b557d9c8f 100644
--- a/tests/baselines/reference/parserES5ForOfStatement2.js
+++ b/tests/baselines/reference/parserES5ForOfStatement2.js
@@ -3,6 +3,6 @@ for (var of X) {
 }
 
 //// [parserES5ForOfStatement2.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var _a = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var _a = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js
index dcdffbc3cf0..e5d7ebcac21 100644
--- a/tests/baselines/reference/parserES5ForOfStatement21.js
+++ b/tests/baselines/reference/parserES5ForOfStatement21.js
@@ -2,6 +2,6 @@
 for (var of of) { }
 
 //// [parserES5ForOfStatement21.js]
-for (var _i = 0; _i < of.length; _i++) {
-    var _a = of[_i];
+for (var _i = 0, of_1 = of; _i < of_1.length; _i++) {
+    var _a = of_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement3.js b/tests/baselines/reference/parserES5ForOfStatement3.js
index a99e96a23b8..953a59fb9b8 100644
--- a/tests/baselines/reference/parserES5ForOfStatement3.js
+++ b/tests/baselines/reference/parserES5ForOfStatement3.js
@@ -3,6 +3,6 @@ for (var a, b of X) {
 }
 
 //// [parserES5ForOfStatement3.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var a = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var a = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js
index f1558005f20..8ad35187e51 100644
--- a/tests/baselines/reference/parserES5ForOfStatement4.js
+++ b/tests/baselines/reference/parserES5ForOfStatement4.js
@@ -3,6 +3,6 @@ for (var a = 1 of X) {
 }
 
 //// [parserES5ForOfStatement4.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var a = 1 = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var a = 1 = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement5.js b/tests/baselines/reference/parserES5ForOfStatement5.js
index 328b2fba0a7..3138b05e499 100644
--- a/tests/baselines/reference/parserES5ForOfStatement5.js
+++ b/tests/baselines/reference/parserES5ForOfStatement5.js
@@ -3,6 +3,6 @@ for (var a: number of X) {
 }
 
 //// [parserES5ForOfStatement5.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var a = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var a = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js
index 15747b93ba9..75454de208e 100644
--- a/tests/baselines/reference/parserES5ForOfStatement6.js
+++ b/tests/baselines/reference/parserES5ForOfStatement6.js
@@ -3,6 +3,6 @@ for (var a = 1, b = 2 of X) {
 }
 
 //// [parserES5ForOfStatement6.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var a = 1 = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var a = 1 = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js
index 29e4de8787f..ef3a02e45eb 100644
--- a/tests/baselines/reference/parserES5ForOfStatement7.js
+++ b/tests/baselines/reference/parserES5ForOfStatement7.js
@@ -3,6 +3,6 @@ for (var a: number = 1, b: string = "" of X) {
 }
 
 //// [parserES5ForOfStatement7.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var a = 1 = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var a = 1 = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement8.js b/tests/baselines/reference/parserES5ForOfStatement8.js
index 5c449fc6433..7aa61972601 100644
--- a/tests/baselines/reference/parserES5ForOfStatement8.js
+++ b/tests/baselines/reference/parserES5ForOfStatement8.js
@@ -3,6 +3,6 @@ for (var v of X) {
 }
 
 //// [parserES5ForOfStatement8.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var v = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var v = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement9.js b/tests/baselines/reference/parserES5ForOfStatement9.js
index 6b63d58a88a..8202d2812c1 100644
--- a/tests/baselines/reference/parserES5ForOfStatement9.js
+++ b/tests/baselines/reference/parserES5ForOfStatement9.js
@@ -3,6 +3,6 @@ for (let v of X) {
 }
 
 //// [parserES5ForOfStatement9.js]
-for (var _i = 0; _i < X.length; _i++) {
-    var v = X[_i];
+for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
+    var v = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserErrorRecovery_Block3.errors.txt b/tests/baselines/reference/parserErrorRecovery_Block3.errors.txt
index 9d391e39007..e6033d05215 100644
--- a/tests/baselines/reference/parserErrorRecovery_Block3.errors.txt
+++ b/tests/baselines/reference/parserErrorRecovery_Block3.errors.txt
@@ -1,18 +1,18 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/Blocks/parserErrorRecovery_Block3.ts(2,18): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/Blocks/parserErrorRecovery_Block3.ts(2,18): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/Blocks/parserErrorRecovery_Block3.ts(4,5): error TS1128: Declaration or statement expected.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/Blocks/parserErrorRecovery_Block3.ts(4,18): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/Blocks/parserErrorRecovery_Block3.ts(4,18): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/Blocks/parserErrorRecovery_Block3.ts (3 errors) ====
     class C  {
         private a(): boolean {
                      ~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     
         private b(): boolean {
         ~~~~~~~
 !!! error TS1128: Declaration or statement expected.
                      ~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt
deleted file mode 100644
index 707e68c2c45..00000000000
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts(12,21): error TS1110: Type expected.
-
-
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts (1 errors) ====
-    // Interface
-    interface IPoint {
-        getDist(): number;
-    }
-    
-    // Module
-    module Shapes {
-    
-        // Class
-        export class Point implements IPoint {
-    
-            public con: "hello";
-                        ~~~~~~~
-!!! error TS1110: Type expected.
-            // Constructor
-            constructor (public x: number, public y: number) { }
-    
-            // Instance member
-            getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
-    
-            // Static member
-            static origin = new Point(0, 0);
-        }
-    
-    }
-    
-    // Local variables
-    var p: IPoint = new Shapes.Point(3, 4);
-    var dist = p.getDist();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
index ae2509c3f49..8055cd9d494 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
@@ -38,7 +38,6 @@ var Shapes;
         function Point(x, y) {
             this.x = x;
             this.y = y;
-            this.con = "hello";
         }
         // Instance member
         Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); };
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols
new file mode 100644
index 00000000000..7b8be05f923
--- /dev/null
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols
@@ -0,0 +1,67 @@
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts ===
+// Interface
+interface IPoint {
+>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
+
+    getDist(): number;
+>getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+}
+
+// Module
+module Shapes {
+>Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1))
+
+    // Class
+    export class Point implements IPoint {
+>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
+
+        public con: "hello";
+>con : Symbol(con, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 9, 42))
+
+        // Constructor
+        constructor (public x: number, public y: number) { }
+>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+
+        // Instance member
+        getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
+>getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 60))
+>Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --))
+>this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+
+        // Static member
+        static origin = new Point(0, 0);
+>origin : Symbol(Point.origin, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 16, 74))
+>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+    }
+
+}
+
+// Local variables
+var p: IPoint = new Shapes.Point(3, 4);
+>p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3))
+>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
+>Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1))
+>Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+
+var dist = p.getDist();
+>dist : Symbol(dist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 26, 3))
+>p.getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+>p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3))
+>getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
new file mode 100644
index 00000000000..b38bbbfe64d
--- /dev/null
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
@@ -0,0 +1,78 @@
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts ===
+// Interface
+interface IPoint {
+>IPoint : IPoint
+
+    getDist(): number;
+>getDist : () => number
+}
+
+// Module
+module Shapes {
+>Shapes : typeof Shapes
+
+    // Class
+    export class Point implements IPoint {
+>Point : Point
+>IPoint : IPoint
+
+        public con: "hello";
+>con : "hello"
+
+        // Constructor
+        constructor (public x: number, public y: number) { }
+>x : number
+>y : number
+
+        // Instance member
+        getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
+>getDist : () => number
+>Math.sqrt(this.x * this.x + this.y * this.y) : number
+>Math.sqrt : (x: number) => number
+>Math : Math
+>sqrt : (x: number) => number
+>this.x * this.x + this.y * this.y : number
+>this.x * this.x : number
+>this.x : number
+>this : this
+>x : number
+>this.x : number
+>this : this
+>x : number
+>this.y * this.y : number
+>this.y : number
+>this : this
+>y : number
+>this.y : number
+>this : this
+>y : number
+
+        // Static member
+        static origin = new Point(0, 0);
+>origin : Point
+>new Point(0, 0) : Point
+>Point : typeof Point
+>0 : number
+>0 : number
+    }
+
+}
+
+// Local variables
+var p: IPoint = new Shapes.Point(3, 4);
+>p : IPoint
+>IPoint : IPoint
+>new Shapes.Point(3, 4) : Shapes.Point
+>Shapes.Point : typeof Shapes.Point
+>Shapes : typeof Shapes
+>Point : typeof Shapes.Point
+>3 : number
+>4 : number
+
+var dist = p.getDist();
+>dist : number
+>p.getDist() : number
+>p.getDist : () => number
+>p : IPoint
+>getDist : () => number
+
diff --git a/tests/baselines/reference/parserErrorRecovery_ModuleElement1.errors.txt b/tests/baselines/reference/parserErrorRecovery_ModuleElement1.errors.txt
index 4b8be3e17ad..05b31b7af8e 100644
--- a/tests/baselines/reference/parserErrorRecovery_ModuleElement1.errors.txt
+++ b/tests/baselines/reference/parserErrorRecovery_ModuleElement1.errors.txt
@@ -1,13 +1,16 @@
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement1.ts(2,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement1.ts(3,1): error TS7027: Unreachable code detected.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement1.ts(4,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ModuleElements/parserErrorRecovery_ModuleElement1.ts (3 errors) ====
     return foo;
     }
     ~
 !!! error TS1128: Declaration or statement expected.
     return bar;
+    ~~~~~~
+!!! error TS7027: Unreachable code detected.
     }
     ~
 !!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
index 0cf731cb516..09502f6b888 100644
--- a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts(2,7): error TS1094: An accessor cannot have type parameters.
-tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts(2,7): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts(2,7): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypePa
           ~~~
 !!! error TS1094: An accessor cannot have type parameters.
           ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserLabeledStatement1.d.errors.txt b/tests/baselines/reference/parserLabeledStatement1.d.errors.txt
index 11de61548a3..2ce51b0bb4c 100644
--- a/tests/baselines/reference/parserLabeledStatement1.d.errors.txt
+++ b/tests/baselines/reference/parserLabeledStatement1.d.errors.txt
@@ -1,11 +1,14 @@
 tests/cases/conformance/parser/ecmascript5/Statements/parserLabeledStatement1.d.ts(1,1): error TS1036: Statements are not allowed in ambient contexts.
+tests/cases/conformance/parser/ecmascript5/Statements/parserLabeledStatement1.d.ts(1,1): error TS7028: Unused label.
 tests/cases/conformance/parser/ecmascript5/Statements/parserLabeledStatement1.d.ts(2,3): error TS2304: Cannot find name 'bar'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserLabeledStatement1.d.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserLabeledStatement1.d.ts (3 errors) ====
     foo:
     ~~~
 !!! error TS1036: Statements are not allowed in ambient contexts.
+    ~~~
+!!! error TS7028: Unused label.
       bar();
       ~~~
 !!! error TS2304: Cannot find name 'bar'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessor1.errors.txt b/tests/baselines/reference/parserMemberAccessor1.errors.txt
index aa7cdcdafa3..2a3fd7d7028 100644
--- a/tests/baselines/reference/parserMemberAccessor1.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessor1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts(2,7): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts(2,7): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts (1 errors) ====
     class C {
       get foo() { }
           ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
       set foo(a) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
index ac96e7d94b7..c2db31a5398 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts(2,7): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts(2,7): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts (1 errors) ====
     class C {
       get a() { }
           ~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
index 9a04674d6d7..ece110db165 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts(2,5): error TS1031: 'export' modifier cannot appear on a class element.
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts(2,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts(2,16): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemb
         ~~~~~~
 !!! error TS1031: 'export' modifier cannot appear on a class element.
                    ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
index 0d14a2adab8..a4ea29518d1 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts(2,8): error TS1054: A 'get' accessor cannot have parameters.
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts(2,8): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts(2,8): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemb
            ~~~
 !!! error TS1054: A 'get' accessor cannot have parameters.
            ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
index 69e87dff659..7b66bee844f 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts(2,7): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts(2,7): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts (1 errors) ====
     class C {
       get "b"() { }
           ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
index 93a1a5d14e1..a37fe230f76 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts(2,7): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts(2,7): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts (1 errors) ====
     class C {
       get 0() { }
           ~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
index b7f67da49b7..2b0bd40a4f2 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts(2,12): error TS1028: Accessibility modifier already seen.
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts(2,23): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts(2,23): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemb
                ~~~~~~
 !!! error TS1028: Accessibility modifier already seen.
                           ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
index e5a39c149f6..67ba09b8c72 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,12): error TS1030: 'static' modifier already seen.
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,23): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,23): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemb
                ~~~~~~
 !!! error TS1030: 'static' modifier already seen.
                           ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
index 2da32a5807b..31d001aeafc 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts(2,12): error TS1029: 'public' modifier must precede 'static' modifier.
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts(2,23): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts(2,23): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts (2 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemb
                ~~~~~~
 !!! error TS1029: 'public' modifier must precede 'static' modifier.
                           ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+!!! error TS2378: A 'get' accessor must return a value.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserParameterList5.errors.txt b/tests/baselines/reference/parserParameterList5.errors.txt
index 231a5bbb162..5f0899fa1a2 100644
--- a/tests/baselines/reference/parserParameterList5.errors.txt
+++ b/tests/baselines/reference/parserParameterList5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts(1,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts(1,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts(1,16): error TS2369: A parameter property is only allowed in a constructor implementation.
 tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts(1,29): error TS2304: Cannot find name 'C'.
 
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.t
 ==== tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts (3 errors) ====
     function A(): (public B) => C {
                   ~~~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
                    ~~~~~~~~
 !!! error TS2369: A parameter property is only allowed in a constructor implementation.
                                 ~
diff --git a/tests/baselines/reference/parser_breakTarget3.js b/tests/baselines/reference/parser_breakTarget3.js
index 0eceba87bf8..91ba9fb5993 100644
--- a/tests/baselines/reference/parser_breakTarget3.js
+++ b/tests/baselines/reference/parser_breakTarget3.js
@@ -1,4 +1,5 @@
 //// [parser_breakTarget3.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/parser_breakTarget3.symbols b/tests/baselines/reference/parser_breakTarget3.symbols
index 99ec413987a..35184471d4d 100644
--- a/tests/baselines/reference/parser_breakTarget3.symbols
+++ b/tests/baselines/reference/parser_breakTarget3.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  break target1;
diff --git a/tests/baselines/reference/parser_breakTarget3.types b/tests/baselines/reference/parser_breakTarget3.types
index 7cdcb74d7da..b1ce9f8d94d 100644
--- a/tests/baselines/reference/parser_breakTarget3.types
+++ b/tests/baselines/reference/parser_breakTarget3.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/parser_breakTarget4.js b/tests/baselines/reference/parser_breakTarget4.js
index c6cadb5efa1..4516cf3e8f9 100644
--- a/tests/baselines/reference/parser_breakTarget4.js
+++ b/tests/baselines/reference/parser_breakTarget4.js
@@ -1,4 +1,5 @@
 //// [parser_breakTarget4.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/parser_breakTarget4.symbols b/tests/baselines/reference/parser_breakTarget4.symbols
index 042df67d9b2..f4d4b2e4bff 100644
--- a/tests/baselines/reference/parser_breakTarget4.symbols
+++ b/tests/baselines/reference/parser_breakTarget4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  break target2;
diff --git a/tests/baselines/reference/parser_breakTarget4.types b/tests/baselines/reference/parser_breakTarget4.types
index 7315175800e..04bb129c919 100644
--- a/tests/baselines/reference/parser_breakTarget4.types
+++ b/tests/baselines/reference/parser_breakTarget4.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/parser_breakTarget5.errors.txt b/tests/baselines/reference/parser_breakTarget5.errors.txt
index 8221cbebb4c..5943649c97b 100644
--- a/tests/baselines/reference/parser_breakTarget5.errors.txt
+++ b/tests/baselines/reference/parser_breakTarget5.errors.txt
@@ -1,8 +1,11 @@
+tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget5.ts(1,1): error TS7028: Unused label.
 tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget5.ts(5,7): error TS1107: Jump target cannot cross function boundary.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget5.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget5.ts (2 errors) ====
     target:
+    ~~~~~~
+!!! error TS7028: Unused label.
     while (true) {
       function f() {
         while (true) {
diff --git a/tests/baselines/reference/parser_continueNotInIterationStatement4.errors.txt b/tests/baselines/reference/parser_continueNotInIterationStatement4.errors.txt
index efade17a52a..94392259568 100644
--- a/tests/baselines/reference/parser_continueNotInIterationStatement4.errors.txt
+++ b/tests/baselines/reference/parser_continueNotInIterationStatement4.errors.txt
@@ -1,8 +1,11 @@
+tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueNotInIterationStatement4.ts(1,1): error TS7028: Unused label.
 tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueNotInIterationStatement4.ts(4,5): error TS1107: Jump target cannot cross function boundary.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueNotInIterationStatement4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueNotInIterationStatement4.ts (2 errors) ====
     TWO:
+    ~~~
+!!! error TS7028: Unused label.
     while (true){
       var x = () => {
         continue TWO;
diff --git a/tests/baselines/reference/parser_continueTarget3.js b/tests/baselines/reference/parser_continueTarget3.js
index 76a98a0e204..ea1559346de 100644
--- a/tests/baselines/reference/parser_continueTarget3.js
+++ b/tests/baselines/reference/parser_continueTarget3.js
@@ -1,4 +1,5 @@
 //// [parser_continueTarget3.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/parser_continueTarget3.symbols b/tests/baselines/reference/parser_continueTarget3.symbols
index 2038671d215..c522444ca1a 100644
--- a/tests/baselines/reference/parser_continueTarget3.symbols
+++ b/tests/baselines/reference/parser_continueTarget3.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  continue target1;
diff --git a/tests/baselines/reference/parser_continueTarget3.types b/tests/baselines/reference/parser_continueTarget3.types
index 33c931c7959..fd8aedc357f 100644
--- a/tests/baselines/reference/parser_continueTarget3.types
+++ b/tests/baselines/reference/parser_continueTarget3.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/parser_continueTarget4.js b/tests/baselines/reference/parser_continueTarget4.js
index 795cab2e2ad..9ccaaac27e7 100644
--- a/tests/baselines/reference/parser_continueTarget4.js
+++ b/tests/baselines/reference/parser_continueTarget4.js
@@ -1,4 +1,5 @@
 //// [parser_continueTarget4.ts]
+
 target1:
 target2:
 while (true) {
diff --git a/tests/baselines/reference/parser_continueTarget4.symbols b/tests/baselines/reference/parser_continueTarget4.symbols
index 2b47099715e..b7e770f9bf9 100644
--- a/tests/baselines/reference/parser_continueTarget4.symbols
+++ b/tests/baselines/reference/parser_continueTarget4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4.ts ===
-target1:
+
+No type information for this code.target1:
 No type information for this code.target2:
 No type information for this code.while (true) {
 No type information for this code.  continue target2;
diff --git a/tests/baselines/reference/parser_continueTarget4.types b/tests/baselines/reference/parser_continueTarget4.types
index cb0367283ce..be1e5458f4b 100644
--- a/tests/baselines/reference/parser_continueTarget4.types
+++ b/tests/baselines/reference/parser_continueTarget4.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4.ts ===
+
 target1:
 >target1 : any
 
diff --git a/tests/baselines/reference/parser_continueTarget5.errors.txt b/tests/baselines/reference/parser_continueTarget5.errors.txt
index ffeee7a07b3..b9b1f2edb94 100644
--- a/tests/baselines/reference/parser_continueTarget5.errors.txt
+++ b/tests/baselines/reference/parser_continueTarget5.errors.txt
@@ -1,8 +1,11 @@
+tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget5.ts(1,1): error TS7028: Unused label.
 tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget5.ts(5,7): error TS1107: Jump target cannot cross function boundary.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget5.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget5.ts (2 errors) ====
     target:
+    ~~~~~~
+!!! error TS7028: Unused label.
     while (true) {
       function f() {
         while (true) {
diff --git a/tests/baselines/reference/parser_duplicateLabel1.errors.txt b/tests/baselines/reference/parser_duplicateLabel1.errors.txt
index 4733a240e36..a4319aaa7b9 100644
--- a/tests/baselines/reference/parser_duplicateLabel1.errors.txt
+++ b/tests/baselines/reference/parser_duplicateLabel1.errors.txt
@@ -1,8 +1,11 @@
+tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel1.ts(1,1): error TS7028: Unused label.
 tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel1.ts(2,1): error TS1114: Duplicate label 'target'
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel1.ts (2 errors) ====
     target:
+    ~~~~~~
+!!! error TS7028: Unused label.
     target:
     ~~~~~~
 !!! error TS1114: Duplicate label 'target'
diff --git a/tests/baselines/reference/parser_duplicateLabel2.errors.txt b/tests/baselines/reference/parser_duplicateLabel2.errors.txt
index 92078593e47..123949fa5aa 100644
--- a/tests/baselines/reference/parser_duplicateLabel2.errors.txt
+++ b/tests/baselines/reference/parser_duplicateLabel2.errors.txt
@@ -1,8 +1,11 @@
+tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel2.ts(1,1): error TS7028: Unused label.
 tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel2.ts(3,3): error TS1114: Duplicate label 'target'
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel2.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel2.ts (2 errors) ====
     target:
+    ~~~~~~
+!!! error TS7028: Unused label.
     while (true) {
       target:
       ~~~~~~
diff --git a/tests/baselines/reference/parser_duplicateLabel3.js b/tests/baselines/reference/parser_duplicateLabel3.js
index 9bd6c56356a..c2ea2769f18 100644
--- a/tests/baselines/reference/parser_duplicateLabel3.js
+++ b/tests/baselines/reference/parser_duplicateLabel3.js
@@ -1,4 +1,5 @@
 //// [parser_duplicateLabel3.ts]
+
 target:
 while (true) {
   function f() {
diff --git a/tests/baselines/reference/parser_duplicateLabel3.symbols b/tests/baselines/reference/parser_duplicateLabel3.symbols
index 20627a0e2b8..7e238eb2916 100644
--- a/tests/baselines/reference/parser_duplicateLabel3.symbols
+++ b/tests/baselines/reference/parser_duplicateLabel3.symbols
@@ -1,8 +1,9 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.ts ===
+
 target:
 while (true) {
   function f() {
->f : Symbol(f, Decl(parser_duplicateLabel3.ts, 1, 14))
+>f : Symbol(f, Decl(parser_duplicateLabel3.ts, 2, 14))
 
     target:
     while (true) {
diff --git a/tests/baselines/reference/parser_duplicateLabel3.types b/tests/baselines/reference/parser_duplicateLabel3.types
index 05cfe708161..88ea435bf3e 100644
--- a/tests/baselines/reference/parser_duplicateLabel3.types
+++ b/tests/baselines/reference/parser_duplicateLabel3.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.ts ===
+
 target:
 >target : any
 
diff --git a/tests/baselines/reference/parser_duplicateLabel4.js b/tests/baselines/reference/parser_duplicateLabel4.js
index 569a9bcd102..a9491314426 100644
--- a/tests/baselines/reference/parser_duplicateLabel4.js
+++ b/tests/baselines/reference/parser_duplicateLabel4.js
@@ -1,4 +1,5 @@
 //// [parser_duplicateLabel4.ts]
+
 target:
 while (true) {
 }
diff --git a/tests/baselines/reference/parser_duplicateLabel4.symbols b/tests/baselines/reference/parser_duplicateLabel4.symbols
index 564531bf71b..e7123de1600 100644
--- a/tests/baselines/reference/parser_duplicateLabel4.symbols
+++ b/tests/baselines/reference/parser_duplicateLabel4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4.ts ===
-target:
+
+No type information for this code.target:
 No type information for this code.while (true) {
 No type information for this code.}
 No type information for this code.
diff --git a/tests/baselines/reference/parser_duplicateLabel4.types b/tests/baselines/reference/parser_duplicateLabel4.types
index d09529301ca..b70dd12c695 100644
--- a/tests/baselines/reference/parser_duplicateLabel4.types
+++ b/tests/baselines/reference/parser_duplicateLabel4.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4.ts ===
+
 target:
 >target : any
 
diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.types b/tests/baselines/reference/primtiveTypesAreIdentical.types
index bbff4623f0b..0b8e7dadf7d 100644
--- a/tests/baselines/reference/primtiveTypesAreIdentical.types
+++ b/tests/baselines/reference/primtiveTypesAreIdentical.types
@@ -50,19 +50,19 @@ function foo4(x: any) { }
 >x : any
 
 function foo5(x: 'a');
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
->x : 'a'
+>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; }
+>x : "a"
 
 function foo5(x: 'a');
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
->x : 'a'
+>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; }
+>x : "a"
 
 function foo5(x: string);
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
+>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; }
 >x : string
 
 function foo5(x: any) { }
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
+>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; }
 >x : any
 
 enum E { A }
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 7ef36232b8d..af837fd2031 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a1d591a0497..94371fe696d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index ee020b0ff80..2f0cd8e1230 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 133c266cc9e..94348f987ce 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:../../ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:../ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:../ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:../ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 9dad0db002a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index 0e907c1a2ca..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index a1d591a0497..a580c050d07 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index ee020b0ff80..2f0cd8e1230 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 0b573b627cf..3f16355ad76 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:../../ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:../test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index 3eaebd5c136..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index cbb2dc36492..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index fc53d59d7cb..de704afeedb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 4f87045fd25..22aaecafe2d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index ed7bcd289e7..24fb56c1fd2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -18,9 +18,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index a9e2e3f0e3c..c0dbdb42cdf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:../../ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:../ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:../ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:../ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 9dad0db002a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 0e907c1a2ca..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 4f87045fd25..2eab0f87324 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index ed7bcd289e7..24fb56c1fd2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -18,9 +18,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index c4c267ec395..963b3f3bb22 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:../../ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: /tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:../test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 3eaebd5c136..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index cbb2dc36492..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 18e06e5bc50..25cd156c4ab 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..c532c3846d9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index b02c7fdd8c2..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index 8fe95a1506f..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 6432d5ae91e..4869993ca92 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -17,15 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index da94013dea3..4462b142d98 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
+JsFile: test.js
+mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
 sourceRoot: 
-sources: ../../../ref/m1.ts
+sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../../ref/m1.ts
+emittedFile:bin/test.js
+sourceFile:../ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:../../../ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../../outputdir_module_multifolder_ref/m2.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: 
-sources: ../../../outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../test.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
-sourceRoot: 
-sources: ../../test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../../test.ts
--------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:../../test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:../../test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:../../test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:../../test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:../../test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:../../test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:../../test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:../../test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:../../test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:../../test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index 52b5e682660..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 652d934d602..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index a2a29b4dcfc..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index be0b3a580f5..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..2974abdc1cc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index f9d0dd89e9c..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index 589c5838a2c..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 6432d5ae91e..4869993ca92 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -17,15 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index f348cfad93c..5b0497285e2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
-sourceRoot: 
-sources: ../../../ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../../ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: 
-sources: ../../../outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
-sourceRoot: 
-sources: ../../test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../../test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map===================================================================
 JsFile: test.js
 mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
 sourceRoot: 
-sources: 
+sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts
 ===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index b0e6a265bc9..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 15bddd32fe5..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 16422a234c5..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index eae921435ac..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index f6e3eb542f4..d3d9bd9dc85 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..6377a26395e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index 86c0ba41238..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index 7f5576a8a9c..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index f703a63b71f..742acdc7a25 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 759b9dab302..d8ab3db1266 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
+JsFile: test.js
+mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
 sourceRoot: 
-sources: ../m1.ts
+sources: ../m1.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:../m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:../m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
-sourceRoot: 
-sources: ../test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:../test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:../test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:../test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:../test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:../test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:../test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:../test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:../test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 6e24571a3f2..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 80d6bbf450b..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..f491a9ec373 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index c8a4f5c91a4..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index ce271e4a3cd..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index f703a63b71f..742acdc7a25 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 75228e5ea64..1eef0eba6f2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
-sourceRoot: 
-sources: ../m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:../m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map===================================================================
 JsFile: test.js
 mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
 sourceRoot: 
-sources: ../test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
-sourceRoot: 
-sources: 
+sources: ../m1.ts,../test.ts
 ===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index 080dcf6e818..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index de9ec1f9859..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 7ff280253f1..176c3f78407 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..f77c1351b15 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index d8f4cc74008..21d6e50f28a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 18b397608e4..d63cf86d236 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
+JsFile: test.js
+mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
 sourceRoot: 
-sources: ../../ref/m1.ts
+sources: ../ref/m1.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../ref/m1.ts
+emittedFile:bin/test.js
+sourceFile:../ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:../../ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
-sourceRoot: 
-sources: ../test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:../test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:../test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:../test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:../test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:../test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:../test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:../test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:../test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index e819d557c40..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 88e67e19b36..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 3b2cd1a24c4..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 80d6bbf450b..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..bfdacf69428 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index d8f4cc74008..21d6e50f28a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 97c6b8a85e4..20f2ab47188 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
-sourceRoot: 
-sources: ../../ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map===================================================================
 JsFile: test.js
 mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
 sourceRoot: 
-sources: ../test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
+sources: ../ref/m1.ts,../test.ts
 ===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index a420241c901..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 420650feeac..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index f6319258d8f..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 15d4e3e1c9b..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index c4c79e0454b..bd14cd07502 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b63911a2bc8..ca8dd0934b5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
index 8e87f61b8df..f3b0bdd119e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index f1cc6df9de8..cfd0952c941 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: ../../mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: ../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/test.ts
+sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/ref/m2.ts,../outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:../outputdir_mixed_subfolder/ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 4f0b35f21c7..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index 81bb9202e5a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b63911a2bc8..02be1ec09fb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
index 8e87f61b8df..f3b0bdd119e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 0a373a20359..931a09b3ae6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: ../../mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: ../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/test.ts
+sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/ref/m2.ts,../outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index f13773b3384..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 98da596cfa4..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index c0138423cae..59405bccb9c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 630508cb9f8..794d2a58176 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 4ed441e2552..0d6c009961b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index fd08e128cfe..cb14a553f05 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: ../../../../mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: ../../mapFiles/outAndOutDirFile.js.map
 sourceRoot: 
-sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/test.ts
+sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/ref/m2.ts,../outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:../outputdir_mixed_subfolder/ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=../../mapFiles/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index e4c8f7b3610..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 81bb9202e5a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 630508cb9f8..43710b5f061 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 4ed441e2552..0d6c009961b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index eb9ad2993b2..eddbc79711c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: ../../../../mapFiles/ref/m2.js.map
-sourceRoot: 
-sources: ../../outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: ../../mapFiles/outAndOutDirFile.js.map
 sourceRoot: 
-sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/test.ts
+sources: ../outputdir_mixed_subfolder/ref/m1.ts,../outputdir_mixed_subfolder/ref/m2.ts,../outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=../../mapFiles/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index d78261fe225..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 98da596cfa4..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index f359cef4be2..8b109433561 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..a7235c6c2b3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index 9745ad1a4ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index ad9b3f68611..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index f3c86f22eb7..283c0703f90 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index c2eacec3bdc..47e1835365a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: ../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
+JsFile: test.js
+mapUrl: ../../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../../../projects/outputdir_module_multifolder/ref/m1.ts
+sources: ../projects/outputdir_module_multifolder/ref/m1.ts,../projects/outputdir_module_multifolder_ref/m2.ts,../projects/outputdir_module_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
+emittedFile:bin/test.js
+sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: ../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: 
-sources: ../../projects/outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../projects/outputdir_module_multifolder/test.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/outputdir_module_multifolder/test.js.map
-sourceRoot: 
-sources: ../../projects/outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../../projects/outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index 09fbf68994d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index e7200adafdb..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 90dee0800c7..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index f2b1ea70110..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..ca280b23052 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index c2ac2bc2710..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index 573ce2ac6c5..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index f3c86f22eb7..283c0703f90 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 1d6a282976d..ce08ef2c878 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: ../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
-sourceRoot: 
-sources: ../../../projects/outputdir_module_multifolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: ../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: 
-sources: ../../projects/outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/outputdir_module_multifolder/test.js.map
-sourceRoot: 
-sources: ../../projects/outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../../projects/outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map===================================================================
 JsFile: test.js
 mapUrl: ../../../mapFiles/test.js.map
 sourceRoot: 
-sources: 
+sources: ../projects/outputdir_module_multifolder/ref/m1.ts,../projects/outputdir_module_multifolder_ref/m2.ts,../projects/outputdir_module_multifolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 87f1f3a51b7..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 074ab743af3..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 6e2fb8d7851..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 85da8e39421..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 58e831a041d..8ff2bbdb75b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..b94a5ff18e5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index 1fe3446e4bc..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index e2625035edb..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index fe0b8045a5c..b4efe9ebb39 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 410dc94963f..8099c2f176a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: ../mapFiles/m1.js.map
+JsFile: test.js
+mapUrl: ../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../outputdir_module_simple/m1.ts
+sources: ../outputdir_module_simple/m1.ts,../outputdir_module_simple/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:../outputdir_module_simple/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:../outputdir_module_simple/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=../mapFiles/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: ../mapFiles/test.js.map
-sourceRoot: 
-sources: ../outputdir_module_simple/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:../outputdir_module_simple/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:../outputdir_module_simple/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:../outputdir_module_simple/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:../outputdir_module_simple/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:../outputdir_module_simple/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:../outputdir_module_simple/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:../outputdir_module_simple/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:../outputdir_module_simple/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:../outputdir_module_simple/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:../outputdir_module_simple/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 14471b6e983..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 5ce16293424..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..847236565f8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 73a399fe253..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index 0950101384d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index fe0b8045a5c..b4efe9ebb39 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 0af20dc5ef9..4c009331988 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: ../mapFiles/m1.js.map
-sourceRoot: 
-sources: ../outputdir_module_simple/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:../outputdir_module_simple/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=../mapFiles/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: ../mapFiles/test.js.map
-sourceRoot: 
-sources: ../outputdir_module_simple/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../outputdir_module_simple/test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
 JsFile: test.js
 mapUrl: ../../mapFiles/test.js.map
 sourceRoot: 
-sources: 
+sources: ../outputdir_module_simple/m1.ts,../outputdir_module_simple/test.ts
 ===================================================================
 >>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index 1a2a4fc5e6a..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index c0654a8e141..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 58e831a041d..ccc0a7b503b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..ae6d9b42221 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index a87c7d36d8e..51ad7ddf1b2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index fe747e98d9c..e666ef224a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: ../../mapFiles/ref/m1.js.map
+JsFile: test.js
+mapUrl: ../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../../outputdir_module_subfolder/ref/m1.ts
+sources: ../outputdir_module_subfolder/ref/m1.ts,../outputdir_module_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../outputdir_module_subfolder/ref/m1.ts
+emittedFile:bin/test.js
+sourceFile:../outputdir_module_subfolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: ../mapFiles/test.js.map
-sourceRoot: 
-sources: ../outputdir_module_subfolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:../outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:../outputdir_module_subfolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:../outputdir_module_subfolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:../outputdir_module_subfolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:../outputdir_module_subfolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:../outputdir_module_subfolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:../outputdir_module_subfolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:../outputdir_module_subfolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:../outputdir_module_subfolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:../outputdir_module_subfolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index 3e8406858e2..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 66acf4aace7..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 84b62ed0fc7..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 6139e8293b0..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..b8c7cced3ae 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index a87c7d36d8e..51ad7ddf1b2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 8f609cc28d9..a57632c4e07 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: ../../mapFiles/ref/m1.js.map
-sourceRoot: 
-sources: ../../outputdir_module_subfolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:../../outputdir_module_subfolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: ../mapFiles/test.js.map
-sourceRoot: 
-sources: ../outputdir_module_subfolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:../outputdir_module_subfolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
 JsFile: test.js
 mapUrl: ../../mapFiles/test.js.map
 sourceRoot: 
-sources: 
+sources: ../outputdir_module_subfolder/ref/m1.ts,../outputdir_module_subfolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 2dbac1edb8e..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 7e9c3643b99..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index c6dd0639fb7..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 64b21aa3115..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
index 8fafee438e6..acd2d113c02 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -30,4 +30,4 @@ var instance1 = new c1();
 function f1() {
     return instance1;
 }
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 03cefb2f8d3..fc3b27ea65c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_multifolder/ref/m1.ts","../projects/outputdir_multifolder_ref/m2.ts","../projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index d173bd36fb2..534e9184f7b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,12 +1,12 @@
 ===================================================================
 JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
+mapUrl: ../../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../outputdir_multifolder/ref/m1.ts,../outputdir_multifolder_ref/m2.ts,../outputdir_multifolder/test.ts
+sources: ../projects/outputdir_multifolder/ref/m1.ts,../projects/outputdir_multifolder_ref/m2.ts,../projects/outputdir_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
-sourceFile:../outputdir_multifolder/ref/m1.ts
+sourceFile:../projects/outputdir_multifolder/ref/m1.ts
 -------------------------------------------------------------------
 >>>var m1_a1 = 10;
 1 >
@@ -143,7 +143,7 @@ sourceFile:../outputdir_multifolder/ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
-sourceFile:../outputdir_multifolder_ref/m2.ts
+sourceFile:../projects/outputdir_multifolder_ref/m2.ts
 -------------------------------------------------------------------
 >>>var m2_a1 = 10;
 1->
@@ -280,7 +280,7 @@ sourceFile:../outputdir_multifolder_ref/m2.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
-sourceFile:../outputdir_multifolder/test.ts
+sourceFile:../projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
@@ -427,11 +427,11 @@ sourceFile:../outputdir_multifolder/test.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1)
 2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
index 8fafee438e6..acd2d113c02 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
@@ -30,4 +30,4 @@ var instance1 = new c1();
 function f1() {
     return instance1;
 }
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
index 03cefb2f8d3..fc3b27ea65c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_multifolder/ref/m1.ts","../projects/outputdir_multifolder_ref/m2.ts","../projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index d173bd36fb2..534e9184f7b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,12 +1,12 @@
 ===================================================================
 JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
+mapUrl: ../../../mapFiles/test.js.map
 sourceRoot: 
-sources: ../outputdir_multifolder/ref/m1.ts,../outputdir_multifolder_ref/m2.ts,../outputdir_multifolder/test.ts
+sources: ../projects/outputdir_multifolder/ref/m1.ts,../projects/outputdir_multifolder_ref/m2.ts,../projects/outputdir_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
-sourceFile:../outputdir_multifolder/ref/m1.ts
+sourceFile:../projects/outputdir_multifolder/ref/m1.ts
 -------------------------------------------------------------------
 >>>var m1_a1 = 10;
 1 >
@@ -143,7 +143,7 @@ sourceFile:../outputdir_multifolder/ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
-sourceFile:../outputdir_multifolder_ref/m2.ts
+sourceFile:../projects/outputdir_multifolder_ref/m2.ts
 -------------------------------------------------------------------
 >>>var m2_a1 = 10;
 1->
@@ -280,7 +280,7 @@ sourceFile:../outputdir_multifolder_ref/m2.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
-sourceFile:../outputdir_multifolder/test.ts
+sourceFile:../projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
@@ -427,11 +427,11 @@ sourceFile:../outputdir_multifolder/test.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1)
 2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index af0071d7e46..6fbac81a12d 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index df57785d945..c6996bb53b9 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json
index f987aa49ffe..b65b2477c8e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 0c806666ef0..0fa723ff01b 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
+sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index aa404804b45..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index c2157bc3b1b..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index df57785d945..0b202d40b8c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json
index f987aa49ffe..b65b2477c8e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index aede30c6f73..bfe9f5dff6a 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
+sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index a39f0f50e5f..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 0230aad40a5..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 2ebe138ffda..8c16871c4a7 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index e7042dca90a..d78e3b4607a 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 2bb23cdc610..9b7785a024b 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 5637274312d..6746d0609b6 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: http://www.typescriptlang.org/outAndOutDirFile.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
+sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index aa404804b45..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index c2157bc3b1b..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index e7042dca90a..363ef3c21bf 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 2bb23cdc610..9b7785a024b 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index fa3d5513061..14ca884e9f7 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: http://www.typescriptlang.org/outAndOutDirFile.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
+sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts,file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index a39f0f50e5f..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 0230aad40a5..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 52f1b822100..0734d350e11 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..211bf71cbed 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index 66c8fa96a0b..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index e926e95f3c3..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
index e061982b32f..2ff88c9696f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 1fce6af3084..5805c876be8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
+JsFile: test.js
+mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
+sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts,file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts,file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:diskFile1.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>});
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index e8004c87aad..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 37bc8039271..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 01ad8f96e78..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 4e7e9721b83..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..1c42486b782 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index ec29dfcad18..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index 721fdf3827f..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
index e061982b32f..2ff88c9696f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index aaf57c9d055..e66e92ff5cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: 
+sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts,file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts,file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 7b14808a067..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index c88465aaec4..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index b9191db7d5f..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 6a18d277c10..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 52f1b822100..77db9e80a53 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..445268f27c1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index 1a4d200cdcb..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index d2270dfd2ce..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
index e636ce61f7e..1dbc9780b95 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 7c3fae48716..36bfe394d39 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/m1.js.map
+JsFile: test.js
+mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts
+sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts,file:///tests/cases/projects/outputdir_module_simple/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_simple/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index d752d7f8395..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index de9d99184d2..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..a7424e92122 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 02ca4ab81c7..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index bc2e2667bcd..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
index e636ce61f7e..1dbc9780b95 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 804e4408446..ef808a08b3f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/m1.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_simple/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
+sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts,file:///tests/cases/projects/outputdir_module_simple/test.ts
 ===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index 1d5a32f0ad5..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index b9c164bb732..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 52f1b822100..10c38a74411 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..439677f8aba 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 05da8c15292..b33bd42f045 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 894bcf6cef4..617b90f7c81 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/ref/m1.js.map
+JsFile: test.js
+mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
+sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_subfolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index 73309eabe30..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index ec8a7690d47..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 270604ea7cb..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 35691a873b8..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..44276925bda 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 05da8c15292..b33bd42f045 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 9a7f754c534..16bcb98e00c 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/ref/m1.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_subfolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
+sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 8f31dc2aaa2..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 95de442e92d..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 9bb4ed0180a..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index fee2f4cb129..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index af0071d7e46..6fbac81a12d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 7a70d18105c..37bb9be8a95 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
index c36f3ade5e0..2de7a33388a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 49c44cde80e..1a75ab0b601 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index aa404804b45..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index 04f168a6289..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 7a70d18105c..a6626039aa2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
index c36f3ade5e0..2de7a33388a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index d54d4d6245e..d1ab16ddf2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index a39f0f50e5f..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 0ce68e169af..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 2ebe138ffda..8c16871c4a7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 53e31e30260..f3058d9f878 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 4741b9cf9e1..8d29a569320 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -18,9 +18,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 7793026dd6e..2a4bc95cbc2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: http://www.typescriptlang.org/outAndOutDirFile.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index aa404804b45..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 04f168a6289..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 53e31e30260..ba9f4ee590c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 4741b9cf9e1..8d29a569320 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -18,9 +18,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index a6deca12207..da3d501acb7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/ref/m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: http://www.typescriptlang.org/outAndOutDirFile.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index a39f0f50e5f..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 0ce68e169af..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 52f1b822100..0734d350e11 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d3e851981ec..85e465474d3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index 3b00d82ab66..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index e926e95f3c3..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 3ecf4bc4cc4..ae51d051ff0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -17,15 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index deb74d2ae36..20a97890399 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
+JsFile: test.js
+mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/ref/m1.ts
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:diskFile1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder_ref/m2.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>});
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index e8004c87aad..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 8c257bd1111..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 01ad8f96e78..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 8612cd0d108..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index d3e851981ec..f84040526ba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index 058e405b606..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index 721fdf3827f..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 3ecf4bc4cc4..ae51d051ff0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -17,15 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 5f476cfb8ed..909ae1c3750 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:outputdir_module_multifolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: 
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 7b14808a067..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index e7f54a4a2e1..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index b9191db7d5f..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 4ac74c2fcdb..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 52f1b822100..77db9e80a53 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index d3e851981ec..2ace469f902 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index 1a4d200cdcb..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index 6751f2f82cd..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 2cfc9aebda2..d8ff0027520 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 8b526ff5859..bd33dbb5ec7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/m1.js.map
+JsFile: test.js
+mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: m1.ts
+sources: m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index d752d7f8395..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index a57b57d2b17..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index d3e851981ec..3b75f2878c9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 02ca4ab81c7..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index ca45773f423..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 2cfc9aebda2..d8ff0027520 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index ff984bf74ee..d9df59725a9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/m1.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
+sources: m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index 1d5a32f0ad5..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 41d3e11e995..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 52f1b822100..10c38a74411 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d3e851981ec..29e01bc0bc6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index cfa0ec5cb81..cd7c4867bc3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 67e50350919..557f15f4e2a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/ref/m1.js.map
+JsFile: test.js
+mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts
+sources: ref/m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index 73309eabe30..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 6c5413f630e..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 270604ea7cb..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index a57b57d2b17..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index d3e851981ec..4409af8d0a7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index cfa0ec5cb81..cd7c4867bc3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index c5bce1a19d5..3a403373a8f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: http://www.typescriptlang.org/ref/m1.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map===================================================================
 JsFile: test.js
 mapUrl: http://www.typescriptlang.org/test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
+sources: ref/m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 8f31dc2aaa2..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 35e7e9a48dd..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 9bb4ed0180a..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index d0638b6c34c..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index ad3b4896eec..40bdaa24fc9 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json
index 975fcf59ca9..1b96d09cd3a 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json
@@ -14,8 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 2c61fd1d935..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json
index 975fcf59ca9..1b96d09cd3a 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json
@@ -14,8 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index b7c7f5d8139..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index ad3b4896eec..40bdaa24fc9 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 2b0a20e739a..f2ea5b95015 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -15,8 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 2c61fd1d935..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 2b0a20e739a..f2ea5b95015 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -15,8 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index b7c7f5d8139..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index e69de29bb2d..0814424ca39 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -0,0 +1,44 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/diskFile0.js
deleted file mode 100644
index 2c61fd1d935..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/diskFile0.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/diskFile1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/diskFile1.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/diskFile1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
index 66eced5cc01..ef27e5d6f40 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
@@ -14,12 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js",
-        "test.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index c2a6326846e..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index f83ccabfd35..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/diskFile0.js
deleted file mode 100644
index b7c7f5d8139..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/diskFile0.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/diskFile1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/diskFile1.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/diskFile1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
index 66eced5cc01..ef27e5d6f40 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
@@ -14,12 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js",
-        "test.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 37f4ec486b2..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index d1c1b22a85b..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index e69de29bb2d..d07eebbd726 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -0,0 +1,29 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index c2a6326846e..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
index 166aaa982e7..11bd042a34c 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
@@ -13,10 +13,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js",
-        "m1.d.ts",
-        "test.js",
-        "test.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index b6c62f75f3c..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 37f4ec486b2..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
index 166aaa982e7..11bd042a34c 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
@@ -13,10 +13,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js",
-        "m1.d.ts",
-        "test.js",
-        "test.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index d016c5ff00a..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index e69de29bb2d..a1bb15d7b35 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -0,0 +1,29 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
index f11b95edde9..d37850e3f0b 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
@@ -13,10 +13,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js",
-        "test.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index c2a6326846e..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index ef183a5773c..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
index f11b95edde9..d37850e3f0b 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
@@ -13,10 +13,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js",
-        "test.d.ts",
         "bin/test.js",
         "bin/test.d.ts"
     ]
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 37f4ec486b2..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 548a35e714c..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/prologueEmit/amd/out.js b/tests/baselines/reference/project/prologueEmit/amd/out.js
index fb0ca5dfac0..42313b7ce64 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -1,11 +1,11 @@
-var _this = this;
-// Add a lambda to ensure global 'this' capture is triggered
-(function () { return _this.window; });
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
+var _this = this;
+// Add a lambda to ensure global 'this' capture is triggered
+(function () { return _this.window; });
 // class inheritance to ensure __extends is emitted
 var m;
 (function (m) {
diff --git a/tests/baselines/reference/project/prologueEmit/node/out.js b/tests/baselines/reference/project/prologueEmit/node/out.js
index fb0ca5dfac0..42313b7ce64 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -1,11 +1,11 @@
-var _this = this;
-// Add a lambda to ensure global 'this' capture is triggered
-(function () { return _this.window; });
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
+var _this = this;
+// Add a lambda to ensure global 'this' capture is triggered
+(function () { return _this.window; });
 // class inheritance to ensure __extends is emitted
 var m;
 (function (m) {
diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
new file mode 100644
index 00000000000..ef77af7372e
--- /dev/null
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== globalThisCapture.ts (0 errors) ====
+    // Add a lambda to ensure global 'this' capture is triggered
+    (()=>this.window);
+    
+==== __extends.ts (0 errors) ====
+    // class inheritance to ensure __extends is emitted
+    module m {
+        export class base {}
+        export class child extends base {}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
index dfbdd679685..cde83785831 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
@@ -2,11 +2,11 @@ error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/Fo
 
 
 !!! error TS6059: File 'fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
-==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
+==== fileC.ts (0 errors) ====
     class C {
     }
     
-==== FolderA/FolderB/fileB.ts (0 errors) ====
+==== fileB.ts (0 errors) ====
     /// <reference path='FolderC/fileC.ts'/>
     class B {
         public c: C;
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
index dfbdd679685..cde83785831 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
@@ -2,11 +2,11 @@ error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/Fo
 
 
 !!! error TS6059: File 'fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
-==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
+==== fileC.ts (0 errors) ====
     class C {
     }
     
-==== FolderA/FolderB/fileB.ts (0 errors) ====
+==== fileB.ts (0 errors) ====
     /// <reference path='FolderC/fileC.ts'/>
     class B {
         public c: C;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 5af28cf8560..13e9de8f87f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 65bbb0e67c2..3aa34b0f833 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index 381b239c573..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index 09c6092f164..1772111176c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index bbad2c102f9..7ede7f02c36 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 65bbb0e67c2..cf4a14ae9e9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 2963737a5a0..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index 09c6092f164..1772111176c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index c409dc99f14..7330eac1399 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1750a5975ae..81bb710c580 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 820efe6d9d1..454bdf3acb0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 381b239c573..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 6fb17fa06b8..8d7c349b481 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -18,9 +18,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 8536097d111..b686585c977 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 820efe6d9d1..f7d00d1aff9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 2963737a5a0..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 6fb17fa06b8..8d7c349b481 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -18,9 +18,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 47e9f1da73a..71a33c01806 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: /tests/cases/projects/outputdir_mixed_subfolder/src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..994e21ca032 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index e53f2e0a755..0fd0b2def0c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index c4c57a82e12..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 71e1da5d3cc..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index b3e80123c04..722a6fbd4da 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -17,15 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index e1bca270ba0..8c710d9c4da 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder/ref/m1.ts
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:diskFile1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder_ref/m2.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>});
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 5cca04a0f25..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index aeb0a1c3c5d..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index e53f2e0a755..027f9569ebc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index 7e08245de72..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index de341c87ec1..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index b3e80123c04..722a6fbd4da 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -17,15 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 63e22ab64ba..e129af6a045 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:outputdir_module_multifolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: 
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 14c09e444a5..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 0b67e7ee481..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..f385e49ecd1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 42e5a82e74b..a910369c3e4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index 89373fc1cfa..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index e2621b2fa52..f9e2736f65a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 0fc6cd6eb2a..827aa235ef2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: m1.ts
+sources: m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 372f1052b89..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 945ed0583ad..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index 42e5a82e74b..487d57bd2ae 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index 9bf6e024b3f..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index e2621b2fa52..f9e2736f65a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 08491d50151..0a161bb4886 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: 
+sources: m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index c2e7dfa443b..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index a7792ef5242..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..18d212c7e69 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 279042a1a0f..30bac946d14 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 6f750f89857..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index a43e0f69172..50dc5aaf60f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 5e87f2ef555..af6c2b21fdc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: ref/m1.ts
+sources: ref/m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 6c8aeb3190b..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index f65cfa554d1..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index 279042a1a0f..622f2c91c95 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 19b046a427c..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index a43e0f69172..50dc5aaf60f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -16,12 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 67fc9030f41..5d837611e49 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: 
+sources: ref/m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 46c9f29e55a..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index c63a0943976..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 5af28cf8560..13e9de8f87f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 86afcf32e25..62f932a571e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index 0927206ec1b..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
index 82ef1c7d882..2dcfc8a5a2c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 94b86ffdde1..d722bc8936a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: ../src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: ../src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 86afcf32e25..03976e6a8d6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 84f18c56247..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
index 82ef1c7d882..2dcfc8a5a2c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 12a6fdbc6dd..b71c21b5b99 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: ../src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: ../src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1750a5975ae..81bb710c580 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 13b958b1025..a9529891ffd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 0927206ec1b..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index d5f4fd9c654..4247e9dadc2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 11e34ee5a2e..d1799c07a98 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: ../src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: ../src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 13b958b1025..23957761470 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 84f18c56247..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index d5f4fd9c654..4247e9dadc2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 5b9ec51c270..2a0cc630cc0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: ../src/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: ../src/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..994e21ca032 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 512eba0e11a..39dcc66e06b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index 414fa845b2e..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 0cdc44d330d..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 69a577baffd..77179246af5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 9c817da60e9..43c4340ba37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: ../src/
-sources: outputdir_module_multifolder/ref/m1.ts
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: ../src/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:diskFile1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder_ref/m2.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>});
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 5cca04a0f25..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 20138821cfe..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index 512eba0e11a..a3ab2ebecdb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index 92fd6e19cfb..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 292dcb61933..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 69a577baffd..77179246af5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index e34bffc6f61..7ef7adace73 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: ../src/
-sources: outputdir_module_multifolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:outputdir_module_multifolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: ../src/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: ../src/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 14c09e444a5..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index a603394fc15..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..f385e49ecd1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 512eba0e11a..262e5cdc1f3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index e0af3af9b22..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index a4a6698d3ca..8213a1478ae 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index c259bb45210..fc0f367f343 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: ../src/
-sources: m1.ts
+sources: m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 372f1052b89..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 22f07c17544..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index 512eba0e11a..f55a72e7977 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index 05c53f0182e..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index a4a6698d3ca..8213a1478ae 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 65bea50d84f..2910ad61478 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: ../src/
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: ../src/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
+sources: m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index c2e7dfa443b..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 1e72e2a2203..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..18d212c7e69 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 512eba0e11a..dc294ebd160 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index aaae11bb5b5..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 71896f202b2..a5966ef08b8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 7be1fe1fb8f..83f9ef1f262 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: ../src/
-sources: ref/m1.ts
+sources: ref/m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 6c8aeb3190b..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 22f07c17544..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index 512eba0e11a..f803a29f3bf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 702b574b614..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 71896f202b2..a5966ef08b8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 5a3d45c1960..b05ffee34ca 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: ../src/
-sources: ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: ../src/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
+sources: ref/m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 46c9f29e55a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index b3972a3cfc1..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 5af28cf8560..13e9de8f87f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a1d591a0497..94371fe696d 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index cbb7eed4953..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json
index 3270fe610aa..39cb44f229f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json
@@ -15,9 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
index b1d3f293b7e..821236c5c85 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: 
-sources: m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:../ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:../ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:../ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index a1d591a0497..a580c050d07 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 0826e9e95f3..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json
index 3270fe610aa..39cb44f229f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json
@@ -15,9 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 676e8f264ec..e37948398a3 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: 
-sources: m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:../test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1750a5975ae..81bb710c580 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 4f87045fd25..22aaecafe2d 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index aabf49f904d..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 3a260af84a0..117a18c7c7a 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index a73c3b0852a..4394eb0748e 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: 
-sources: ../../../ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:../../../ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:../ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:../ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:../ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 4f87045fd25..2eab0f87324 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index e31d90a8f0c..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 3a260af84a0..117a18c7c7a 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 77ff10492be..9486ad5e3a7 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: 
-sources: ../../../ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:../../../ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
+sources: ../ref/m1.ts,../ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:../test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:../test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:../test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:../test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..994e21ca032 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..c532c3846d9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index cbb7eed4953..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 51755e4c9a3..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
index 3d2df95ad66..7ba960c4bef 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -15,15 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 74ecef44103..6c8bdf4da74 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: 
-sources: m1.ts
+sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:m1.ts
+emittedFile:bin/test.js
+sourceFile:../ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../../outputdir_module_multifolder_ref/m2.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: 
-sources: m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../test.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 5cca04a0f25..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 462fa38ab42..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..2974abdc1cc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index 0826e9e95f3..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 095951a67d0..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
index 3d2df95ad66..7ba960c4bef 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -15,15 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
index f8d10678ca0..70054e8f1c6 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: 
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: 
-sources: m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: 
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
+sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 14c09e444a5..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 3b3ef6b145c..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..f385e49ecd1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..6377a26395e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index 51755e4c9a3..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
index 9ff29662d40..c9889aff69b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -14,12 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
index a1646bc14e5..71c0a41b2d1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: 
-sources: m1.ts
+sources: ../m1.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:m1.ts
+emittedFile:bin/test.js
+sourceFile:../m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../test.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 372f1052b89..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 9bcc170386c..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..f491a9ec373 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index 095951a67d0..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
index 9ff29662d40..c9889aff69b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -14,12 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
index 4ff8b4fa8c7..056b7a1c7f2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: 
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: 
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
+sources: ../m1.ts,../test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index c2e7dfa443b..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 7bae4ed7491..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..18d212c7e69 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index c1e0281a2ab..f77c1351b15 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 51755e4c9a3..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
index 9d200ef685d..da85c1bf06c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -14,12 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
index d0abf20190f..9c12e1749ca 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: 
-sources: m1.ts
+sources: ../ref/m1.ts,../test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:m1.ts
+emittedFile:bin/test.js
+sourceFile:../ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
+sourceFile:../test.ts
+-------------------------------------------------------------------
 >>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 6c8aeb3190b..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 9bcc170386c..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index c1e0281a2ab..bfdacf69428 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 095951a67d0..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
index 9d200ef685d..da85c1bf06c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -14,12 +14,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 205f70497ad..282a64dbc6f 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: 
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: 
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
+sources: ../ref/m1.ts,../test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 46c9f29e55a..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 56d42d8bdfd..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 5af28cf8560..13e9de8f87f 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 7a70d18105c..37bb9be8a95 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
deleted file mode 100644
index 04f168a6289..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 50a4518a1b0..7316c8b01c9 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index d4cac643490..51a641cb750 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index d61b4c3b876..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 7a70d18105c..a6626039aa2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
deleted file mode 100644
index 0ce68e169af..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 50a4518a1b0..7316c8b01c9 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -16,9 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m2.js.map",
-        "ref/m2.js",
-        "ref/m2.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index cb96dcbf7d7..38aecc15857 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1750a5975ae..81bb710c580 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -8,6 +8,20 @@ var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
 }
+define("ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
 var a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 53e31e30260..f3058d9f878 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 04f168a6289..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index b6ef6b5bd51..e165908b72c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index d54fa316273..df760dc79b0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,180 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
->>>    exports.m2_a1 = 10;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
-1 >export var 
-2 >    m2_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
----
->>>    var m2_c1 = (function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
----
->>>        function m2_c1() {
-1->^^^^^^^^
-2 >        ^^->
-1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>        }
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>        return m2_c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-1->
-2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class m2_c1 {
-  >         public m2_c1_p1: number;
-  >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_c1 = m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
-1->
-2 >    m2_c1
-3 >                  {
-  >                     public m2_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
----
->>>    exports.m2_instance1 = new m2_c1();
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
-1->
-  >
-  >export var 
-2 >    m2_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m2_c1
-6 >                                    ()
-7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
----
->>>    function m2_f1() {
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
----
->>>        return exports.m2_instance1;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^^^^^^^^^^^^^^^
-5 >                                   ^
-1->export function m2_f1() {
-  >    
-2 >        return
-3 >               
-4 >               m2_instance1
-5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>    exports.m2_f1 = m2_f1;
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-1->
-2 >    m2_f1
-3 >                 () {
-  >                     return m2_instance1;
-  >                 }
-4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
----
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -306,7 +134,7 @@ sourceFile:ref/m1.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
@@ -315,16 +143,182 @@ sourceFile:ref/m1.ts
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
+sourceFile:ref/m2.ts
+-------------------------------------------------------------------
+>>>define("ref/m2", ["require", "exports"], function (require, exports) {
+>>>    exports.m2_a1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^->
+1->export var 
+2 >    m2_a1
+3 >                  = 
+4 >                    10
+5 >                      ;
+1->Emitted(12, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1)
+---
+>>>    var m2_c1 = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        function m2_c1() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^->
+1->export class m2_c1 {
+  >    public m2_c1_p1: number;
+  >
+2 >        }
+1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+---
+>>>        return m2_c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->
+2 >        }
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class m2_c1 {
+  >         public m2_c1_p1: number;
+  >     }
+1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_c1 = m2_c1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+5 >                          ^^^^^^^^^^^^^^->
+1->
+2 >    m2_c1
+3 >                  {
+  >                     public m2_c1_p1: number;
+  >                 }
+4 >                         
+1->Emitted(18, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1)
+---
+>>>    exports.m2_instance1 = new m2_c1();
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^
+5 >                               ^^^^^
+6 >                                    ^^
+7 >                                      ^
+1->
+  >
+  >export var 
+2 >    m2_instance1
+3 >                         = 
+4 >                           new 
+5 >                               m2_c1
+6 >                                    ()
+7 >                                      ;
+1->Emitted(19, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1)
+---
+>>>    function m2_f1() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1)
+---
+>>>        return exports.m2_instance1;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^
+5 >                                   ^
+1->export function m2_f1() {
+  >    
+2 >        return
+3 >               
+4 >               m2_instance1
+5 >                                   ;
+1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >    }
+1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+---
+>>>    exports.m2_f1 = m2_f1;
+1->^^^^
+2 >    ^^^^^^^^^^^^^
+3 >                 ^^^^^^^^
+4 >                         ^
+1->
+2 >    m2_f1
+3 >                 () {
+  >                     return m2_instance1;
+  >                 }
+4 >                         
+1->Emitted(23, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1)
+---
+-------------------------------------------------------------------
+emittedFile:bin/outAndOutDirFile.js
 sourceFile:test.ts
 -------------------------------------------------------------------
+>>>});
 >>>/// <reference path='ref/m1.ts'/>
-1->
+1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                 ^->
-1->
+1 >
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -332,8 +326,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(26, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -350,25 +344,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(28, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -378,16 +372,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -401,10 +395,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -425,21 +419,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(33, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -453,11 +447,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -466,7 +460,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index 9b9cdd4a214..c3a64f5b6eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -1,10 +1,17 @@
-/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
 declare var m1_a1: number;
 declare class m1_c1 {
     m1_c1_p1: number;
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 53e31e30260..ba9f4ee590c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
deleted file mode 100644
index 0ce68e169af..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
new file mode 100644
index 00000000000..ea1bbf2ba6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index b6ef6b5bd51..e165908b72c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -17,9 +17,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "outdir/outAndOutDirFolder/ref/m2.js.map",
-        "outdir/outAndOutDirFolder/ref/m2.js",
-        "outdir/outAndOutDirFolder/ref/m2.d.ts",
         "bin/outAndOutDirFile.js.map",
         "bin/outAndOutDirFile.js",
         "bin/outAndOutDirFile.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 8bd8c2ac035..c8507ca7df8 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -1,179 +1,8 @@
 ===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:outdir/outAndOutDirFolder/ref/m2.js
-sourceFile:ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: outAndOutDirFile.js
 mapUrl: outAndOutDirFile.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
+sources: ref/m1.ts,ref/m2.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -322,8 +151,8 @@ sourceFile:test.ts
 3 >                                 ^->
 1->
 2 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -331,8 +160,8 @@ sourceFile:test.ts
 1->
   >
 2 >/// <reference path='ref/m2.ts'/>
-1->Emitted(12, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
+1->Emitted(12, 1) Source(2, 1) + SourceIndex(2)
+2 >Emitted(12, 34) Source(2, 34) + SourceIndex(2)
 ---
 >>>var a1 = 10;
 1 >
@@ -349,25 +178,25 @@ sourceFile:test.ts
 4 >       = 
 5 >         10
 6 >           ;
-1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(14, 1) Source(4, 1) + SourceIndex(1)
+1->Emitted(14, 1) Source(4, 1) + SourceIndex(2)
 ---
 >>>    function c1() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>    }
 1->^^^^
@@ -377,16 +206,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(1) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>})();
 1 >
@@ -400,10 +229,10 @@ sourceFile:test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(1) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(1) name (c1)
-3 >Emitted(18, 2) Source(4, 1) + SourceIndex(1)
-4 >Emitted(18, 6) Source(6, 2) + SourceIndex(1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
+4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>var instance1 = new c1();
 1->
@@ -424,21 +253,21 @@ sourceFile:test.ts
 6 >                    c1
 7 >                      ()
 8 >                        ;
-1->Emitted(19, 1) Source(8, 1) + SourceIndex(1)
-2 >Emitted(19, 5) Source(8, 5) + SourceIndex(1)
-3 >Emitted(19, 14) Source(8, 14) + SourceIndex(1)
-4 >Emitted(19, 17) Source(8, 17) + SourceIndex(1)
-5 >Emitted(19, 21) Source(8, 21) + SourceIndex(1)
-6 >Emitted(19, 23) Source(8, 23) + SourceIndex(1)
-7 >Emitted(19, 25) Source(8, 25) + SourceIndex(1)
-8 >Emitted(19, 26) Source(8, 26) + SourceIndex(1)
+1->Emitted(19, 1) Source(8, 1) + SourceIndex(2)
+2 >Emitted(19, 5) Source(8, 5) + SourceIndex(2)
+3 >Emitted(19, 14) Source(8, 14) + SourceIndex(2)
+4 >Emitted(19, 17) Source(8, 17) + SourceIndex(2)
+5 >Emitted(19, 21) Source(8, 21) + SourceIndex(2)
+6 >Emitted(19, 23) Source(8, 23) + SourceIndex(2)
+7 >Emitted(19, 25) Source(8, 25) + SourceIndex(2)
+8 >Emitted(19, 26) Source(8, 26) + SourceIndex(2)
 ---
 >>>function f1() {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1)
+1 >Emitted(20, 1) Source(9, 1) + SourceIndex(2)
 ---
 >>>    return instance1;
 1->^^^^
@@ -452,11 +281,11 @@ sourceFile:test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(1) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(1) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(1) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(1) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(1) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>}
 1 >
@@ -465,7 +294,7 @@ sourceFile:test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(1) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(1) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>//# sourceMappingURL=outAndOutDirFile.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..994e21ca032 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,45 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
+define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+    exports.a3 = m2.m2_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d3e851981ec..85e465474d3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
deleted file mode 100644
index 3b00d82ab66..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
deleted file mode 100644
index 144ad24e2de..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m2_a1 = 10;
-    var m2_c1 = (function () {
-        function m2_c1() {
-        }
-        return m2_c1;
-    })();
-    exports.m2_c1 = m2_c1;
-    exports.m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return exports.m2_instance1;
-    }
-    exports.m2_f1 = m2_f1;
-});
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 8c257bd1111..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index cc2a6c9b1aa..27485e45ad9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 86764c6d57a..d2331ef3579 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/ref/m1.ts
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:diskFile1.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder_ref/m2.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>});
+>>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
 >>>    exports.m2_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -193,24 +187,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >                  = 
 4 >                    10
 5 >                      ;
-1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0)
+1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1)
+2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1)
+3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1)
+4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1)
+5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1)
 ---
 >>>    var m2_c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function m2_c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -220,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
+2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
 ---
 >>>    })();
 1 >^^^^
@@ -243,10 +237,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
+2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_c1 = m2_c1;
 1->^^^^
@@ -260,10 +254,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     public m2_c1_p1: number;
   >                 }
 4 >                         
-1->Emitted(8, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1)
+3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1)
+4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_instance1 = new m2_c1();
 1->^^^^
@@ -282,20 +276,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 5 >                               m2_c1
 6 >                                    ()
 7 >                                      ;
-1->Emitted(9, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0)
+1->Emitted(23, 5) Source(6, 12) + SourceIndex(1)
+2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1)
+3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1)
+4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1)
+5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1)
+6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1)
+7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1)
 ---
 >>>    function m2_f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1)
 ---
 >>>        return exports.m2_instance1;
 1->^^^^^^^^
@@ -309,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
+2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
+3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
+4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
+5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
 ---
 >>>    }
 1 >^^^^
@@ -322,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
+2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -336,23 +330,17 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
   >                     return m2_instance1;
   >                 }
 4 >                         
-1->Emitted(13, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(7, 17) + SourceIndex(1)
+2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1)
+3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1)
+4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1)
 ---
->>>});
->>>//# sourceMappingURL=m2.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -367,24 +355,24 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0)
+1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2)
+2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2)
+3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2)
+4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2)
+5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
+1->Emitted(31, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -394,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
+2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -417,10 +405,10 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0)
+1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1)
+2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1)
+3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2)
+4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -434,10 +422,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(4, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0)
+1->Emitted(36, 5) Source(4, 14) + SourceIndex(2)
+2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2)
+3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2)
+4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -456,20 +444,20 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(8, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0)
+1->Emitted(37, 5) Source(8, 12) + SourceIndex(2)
+2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2)
+3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2)
+4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2)
+5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2)
+6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2)
+7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0)
+1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -483,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1)
+2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1)
+3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1)
+4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1)
+5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -496,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1)
+2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -511,10 +499,10 @@ sourceFile:outputdir_module_multifolder/test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0)
+1->Emitted(41, 5) Source(9, 17) + SourceIndex(2)
+2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2)
+3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2)
+4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -534,13 +522,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(13, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0)
+1->Emitted(42, 5) Source(13, 12) + SourceIndex(2)
+2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2)
+3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2)
+4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2)
+5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2)
+6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2)
+7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2)
 ---
 >>>    exports.a3 = m2.m2_c1;
 1->^^^^
@@ -558,19 +546,13 @@ sourceFile:outputdir_module_multifolder/test.ts
 5 >                   .
 6 >                    m2_c1
 7 >                         ;
-1->Emitted(15, 5) Source(14, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
+1->Emitted(43, 5) Source(14, 12) + SourceIndex(2)
+2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2)
+3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2)
+4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2)
+5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2)
+6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2)
+7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 5cca04a0f25..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-    exports.a3 = m2.m2_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index 8612cd0d108..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..9b6af66589a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
index d3e851981ec..f84040526ba 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
deleted file mode 100644
index 058e405b606..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js
deleted file mode 100644
index ec0a73b5af8..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m2_a1 = 10;
-var m2_c1 = (function () {
-    function m2_c1() {
-    }
-    return m2_c1;
-})();
-exports.m2_c1 = m2_c1;
-exports.m2_instance1 = new m2_c1();
-function m2_f1() {
-    return exports.m2_instance1;
-}
-exports.m2_f1 = m2_f1;
-//# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
deleted file mode 100644
index c09a3c0c32a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile2.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m2_a1: number;
-export declare class m2_c1 {
-    m2_c1_p1: number;
-}
-export declare var m2_instance1: m2_c1;
-export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index e7f54a4a2e1..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..247f9e4f2f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,39 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    export var m2_a1 = 10;
+    export class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    export var m2_instance1 = new m2_c1();
+    export function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
+    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index cc2a6c9b1aa..27485e45ad9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -16,15 +16,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "../outputdir_module_multifolder_ref/m2.js.map",
-        "../outputdir_module_multifolder_ref/m2.js",
-        "../outputdir_module_multifolder_ref/m2.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index eb2dff17042..95f7d3cee8f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -1,620 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:outputdir_module_multifolder/ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: m2.js
-mapUrl: m2.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder_ref/m2.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:diskFile1.js
-sourceFile:outputdir_module_multifolder_ref/m2.ts
--------------------------------------------------------------------
->>>exports.m2_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m2_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m2_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m2_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m2_c1 {
-  >    public m2_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
----
->>>    return m2_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m2_c1 {
-  >     public m2_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_c1 = m2_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m2_c1
-3 >              {
-  >                 public m2_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m2_instance1 = new m2_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m2_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m2_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m2_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m2_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m2_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m2_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
----
->>>exports.m2_f1 = m2_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m2_f1
-3 >             () {
-  >                 return m2_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m2.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:outputdir_module_multifolder/test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>var m2 = require("../outputdir_module_multifolder_ref/m2");
-1->
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^
-7 >                                                          ^
-1->
-  >
-2 >import 
-3 >    m2
-4 >       = require(
-5 >                 "../outputdir_module_multifolder_ref/m2"
-6 >                                                         )
-7 >                                                          ;
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0)
-5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0)
-6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0)
-7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
-3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(4, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(10, 1) Source(8, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(9, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(15, 1) Source(13, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0)
----
->>>exports.a3 = m2.m2_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >export var 
-2 >a3
-3 >           = 
-4 >             m2
-5 >               .
-6 >                m2_c1
-7 >                     ;
-1->Emitted(16, 1) Source(14, 12) + SourceIndex(0)
-2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0)
-3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0)
-4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0)
-5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0)
-6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
-7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
+sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 4afd4e69f2d..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import m1 = require("ref/m1");
-import m2 = require("../outputdir_module_multifolder_ref/m2");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
-export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 14c09e444a5..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var m1 = require("ref/m1");
-var m2 = require("../outputdir_module_multifolder_ref/m2");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-exports.a3 = m2.m2_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 4ac74c2fcdb..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..f385e49ecd1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index d3e851981ec..2ace469f902 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map
deleted file mode 100644
index 6751f2f82cd..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 5419c5a8225..4d92e8a8951 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 3e447368494..e0c060eb889 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: m1.ts
+sources: m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:m1.js
+emittedFile:bin/test.js
 sourceFile:m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 372f1052b89..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index a57b57d2b17..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..df062274b3e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
index d3e851981ec..3b75f2878c9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map
deleted file mode 100644
index ca45773f423..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..12592331fb5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 5419c5a8225..4d92e8a8951 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "m1.js.map",
-        "m1.js",
-        "m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 4d3c5799e27..dfbb5f48fff 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:m1.js
-sourceFile:m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
+sources: m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index 250d2615a79..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js
deleted file mode 100644
index c2e7dfa443b..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index 41d3e11e995..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 6f3fefb9498..18d212c7e69 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1 +1,30 @@
+define("ref/m1", ["require", "exports"], function (require, exports) {
+    exports.m1_a1 = 10;
+    var m1_c1 = (function () {
+        function m1_c1() {
+        }
+        return m1_c1;
+    })();
+    exports.m1_c1 = m1_c1;
+    exports.m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return exports.m1_instance1;
+    }
+    exports.m1_f1 = m1_f1;
+});
+define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d3e851981ec..29e01bc0bc6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
deleted file mode 100644
index bbaba444ba2..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    exports.m1_a1 = 10;
-    var m1_c1 = (function () {
-        function m1_c1() {
-        }
-        return m1_c1;
-    })();
-    exports.m1_c1 = m1_c1;
-    exports.m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return exports.m1_instance1;
-    }
-    exports.m1_f1 = m1_f1;
-});
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
deleted file mode 100644
index 6c5413f630e..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index d80dacb3444..e1f6d3c6e36 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 54c26748c78..54624487a57 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,14 +1,14 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
+JsFile: test.js
+mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts
+sources: ref/m1.ts,test.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:ref/m1.js
+emittedFile:bin/test.js
 sourceFile:ref/m1.ts
 -------------------------------------------------------------------
->>>define(["require", "exports"], function (require, exports) {
+>>>define("ref/m1", ["require", "exports"], function (require, exports) {
 >>>    exports.m1_a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^
@@ -169,18 +169,12 @@ sourceFile:ref/m1.ts
 3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0)
 4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0)
 ---
->>>});
->>>//# sourceMappingURL=m1.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
 -------------------------------------------------------------------
-emittedFile:test.js
+emittedFile:bin/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
->>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+>>>});
+>>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -194,24 +188,24 @@ sourceFile:test.ts
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1)
+2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1)
+3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1)
+4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1)
+5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function c1() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1)
+1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -221,16 +215,16 @@ sourceFile:test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor)
+2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1)
+1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1)
 ---
 >>>    })();
 1 >^^^^
@@ -244,10 +238,10 @@ sourceFile:test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1)
+2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1)
+3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.c1 = c1;
 1->^^^^
@@ -261,10 +255,10 @@ sourceFile:test.ts
   >                  public p1: number;
   >              }
 4 >                   
-1->Emitted(8, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0)
+1->Emitted(22, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1)
+3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1)
+4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
@@ -283,20 +277,20 @@ sourceFile:test.ts
 5 >                            c1
 6 >                              ()
 7 >                                ;
-1->Emitted(9, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0)
+1->Emitted(23, 5) Source(7, 12) + SourceIndex(1)
+2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1)
+3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1)
+4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1)
+5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1)
+6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1)
+7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1)
 ---
 >>>        return exports.instance1;
 1->^^^^^^^^
@@ -310,11 +304,11 @@ sourceFile:test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1)
+1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1)
+2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1)
+3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1)
+4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1)
+5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1)
 ---
 >>>    }
 1 >^^^^
@@ -323,8 +317,8 @@ sourceFile:test.ts
 1 >
   >
 2 >    }
-1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1)
+1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1)
+2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1)
 ---
 >>>    exports.f1 = f1;
 1->^^^^
@@ -338,10 +332,10 @@ sourceFile:test.ts
   >                  return instance1;
   >              }
 4 >                   
-1->Emitted(13, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0)
+1->Emitted(27, 5) Source(8, 17) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1)
+3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1)
+4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
@@ -360,19 +354,13 @@ sourceFile:test.ts
 5 >                   .
 6 >                    m1_c1
 7 >                         ;
-1->Emitted(14, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
+1->Emitted(28, 5) Source(12, 12) + SourceIndex(1)
+2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1)
+3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1)
+4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1)
+5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1)
+6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1)
+7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js
deleted file mode 100644
index 6c8aeb3190b..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-    exports.a1 = 10;
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    exports.c1 = c1;
-    exports.instance1 = new c1();
-    function f1() {
-        return exports.instance1;
-    }
-    exports.f1 = f1;
-    exports.a2 = m1.m1_c1;
-});
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
deleted file mode 100644
index a57b57d2b17..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
index e69de29bb2d..18eee0fd4df 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
index d3e851981ec..4409af8d0a7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
deleted file mode 100644
index 4a53b24b156..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare var m1_a1: number;
-export declare class m1_c1 {
-    m1_c1_p1: number;
-}
-export declare var m1_instance1: m1_c1;
-export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js
deleted file mode 100644
index 1b4470e2b37..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-exports.m1_a1 = 10;
-var m1_c1 = (function () {
-    function m1_c1() {
-    }
-    return m1_c1;
-})();
-exports.m1_c1 = m1_c1;
-exports.m1_instance1 = new m1_c1();
-function m1_f1() {
-    return exports.m1_instance1;
-}
-exports.m1_f1 = m1_f1;
-//# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
deleted file mode 100644
index 35e7e9a48dd..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..42154149020
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    export var m1_a1 = 10;
+    export class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    export var m1_instance1 = new m1_c1();
+    export function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    import m1 = require("ref/m1");
+    export var a1 = 10;
+    export class c1 {
+        public p1: number;
+    }
+    
+    export var instance1 = new c1();
+    export function f1() {
+        return instance1;
+    }
+    
+    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index d80dacb3444..e1f6d3c6e36 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -15,12 +15,6 @@
         "test.ts"
     ],
     "emittedFiles": [
-        "ref/m1.js.map",
-        "ref/m1.js",
-        "ref/m1.d.ts",
-        "test.js.map",
-        "test.js",
-        "test.d.ts",
         "bin/test.js.map",
         "bin/test.js",
         "bin/test.d.ts"
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index cf41966a818..2903ad0141c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -1,399 +1,7 @@
 ===================================================================
-JsFile: m1.js
-mapUrl: m1.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:ref/m1.js
-sourceFile:ref/m1.ts
--------------------------------------------------------------------
->>>exports.m1_a1 = 10;
-1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
-1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
-1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0)
----
->>>var m1_c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
----
->>>    function m1_c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1->export class m1_c1 {
-  >    public m1_c1_p1: number;
-  >
-2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
----
->>>    return m1_c1;
-1->^^^^
-2 >    ^^^^^^^^^^^^
-1->
-2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class m1_c1 {
-  >     public m1_c1_p1: number;
-  > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
-3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_c1 = m1_c1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
-1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(7, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0)
----
->>>exports.m1_instance1 = new m1_c1();
-1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
-1->
-  >
-  >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
-1->Emitted(8, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0)
----
->>>function m1_f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0)
----
->>>    return exports.m1_instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^^^^
-5 >                               ^
-1->export function m1_f1() {
-  >    
-2 >    return
-3 >           
-4 >           m1_instance1
-5 >                               ;
-1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
----
->>>exports.m1_f1 = m1_f1;
-1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
-1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(12, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
 sourceRoot: http://typescript.codeplex.com/
-sources: test.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:test.js
-sourceFile:test.ts
--------------------------------------------------------------------
->>>var m1 = require("ref/m1");
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
-1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0)
----
->>>exports.a1 = 10;
-1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
-1 >
-  >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
-1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0)
----
->>>var c1 = (function () {
-1->
-2 >^^^^^^^^^^^^^^^^^^^^->
-1->
-  >
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
----
->>>    function c1() {
-1->^^^^
-2 >    ^^->
-1->
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1)
----
->>>    }
-1->^^^^
-2 >    ^
-3 >     ^^^^^^^^^^->
-1->export class c1 {
-  >    public p1: number;
-  >
-2 >    }
-1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor)
----
->>>    return c1;
-1->^^^^
-2 >    ^^^^^^^^^
-1->
-2 >    }
-1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > export class c1 {
-  >     public p1: number;
-  > }
-1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1)
-3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0)
-4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0)
----
->>>exports.c1 = c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
-1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(8, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0)
----
->>>exports.instance1 = new c1();
-1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
-1->
-  >
-  >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
-1->Emitted(9, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0)
----
->>>function f1() {
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0)
----
->>>    return exports.instance1;
-1->^^^^
-2 >    ^^^^^^
-3 >          ^
-4 >           ^^^^^^^^^^^^^^^^^
-5 >                            ^
-1->export function f1() {
-  >    
-2 >    return
-3 >           
-4 >           instance1
-5 >                            ;
-1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1)
----
->>>exports.f1 = f1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
-1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(13, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0)
----
->>>exports.a2 = m1.m1_c1;
-1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
-1->
-  >
-  >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
-1->Emitted(14, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
----
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
+sources: ref/m1.ts,test.ts
 ===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
deleted file mode 100644
index a61d8541048..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import m1 = require("ref/m1");
-export declare var a1: number;
-export declare class c1 {
-    p1: number;
-}
-export declare var instance1: c1;
-export declare function f1(): c1;
-export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js
deleted file mode 100644
index 46c9f29e55a..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var m1 = require("ref/m1");
-exports.a1 = 10;
-var c1 = (function () {
-    function c1() {
-    }
-    return c1;
-})();
-exports.c1 = c1;
-exports.instance1 = new c1();
-function f1() {
-    return exports.instance1;
-}
-exports.f1 = f1;
-exports.a2 = m1.m1_c1;
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map
deleted file mode 100644
index d0638b6c34c..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53a35eb2c84
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,36 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== m2.ts (0 errors) ====
+    var m2_a1 = 10;
+    class m2_c1 {
+        public m2_c1_p1: number;
+    }
+    
+    var m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return m2_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..53fc18f86c7
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..eb358c3b79d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,14 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== test.ts (0 errors) ====
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
new file mode 100644
index 00000000000..376cfa761b8
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,25 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== m1.ts (0 errors) ====
+    var m1_a1 = 10;
+    class m1_c1 {
+        public m1_c1_p1: number;
+    }
+    
+    var m1_instance1 = new m1_c1();
+    function m1_f1() {
+        return m1_instance1;
+    }
+==== test.ts (0 errors) ====
+    /// <reference path='ref/m1.ts'/>
+    var a1 = 10;
+    class c1 {
+        public p1: number;
+    }
+    
+    var instance1 = new c1();
+    function f1() {
+        return instance1;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
new file mode 100644
index 00000000000..dbe3dfdbbae
--- /dev/null
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -0,0 +1,27 @@
+//// [tests/cases/conformance/es6/modules/reExportDefaultExport.ts] ////
+
+//// [m1.ts]
+
+export default function f() {
+}
+export {f};
+
+
+//// [m2.ts]
+import foo from "./m1";
+import {f} from "./m1";
+
+f();
+foo();
+
+//// [m1.js]
+function f() {
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = f;
+exports.f = f;
+//// [m2.js]
+var m1_1 = require("./m1");
+var m1_2 = require("./m1");
+m1_2.f();
+m1_1.default();
diff --git a/tests/baselines/reference/reExportDefaultExport.symbols b/tests/baselines/reference/reExportDefaultExport.symbols
new file mode 100644
index 00000000000..cd0d6e493c9
--- /dev/null
+++ b/tests/baselines/reference/reExportDefaultExport.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/modules/m1.ts ===
+
+export default function f() {
+>f : Symbol(f, Decl(m1.ts, 0, 0))
+}
+export {f};
+>f : Symbol(f, Decl(m1.ts, 3, 8))
+
+
+=== tests/cases/conformance/es6/modules/m2.ts ===
+import foo from "./m1";
+>foo : Symbol(foo, Decl(m2.ts, 0, 6))
+
+import {f} from "./m1";
+>f : Symbol(f, Decl(m2.ts, 1, 8))
+
+f();
+>f : Symbol(f, Decl(m2.ts, 1, 8))
+
+foo();
+>foo : Symbol(foo, Decl(m2.ts, 0, 6))
+
diff --git a/tests/baselines/reference/reExportDefaultExport.types b/tests/baselines/reference/reExportDefaultExport.types
new file mode 100644
index 00000000000..f775571ac2c
--- /dev/null
+++ b/tests/baselines/reference/reExportDefaultExport.types
@@ -0,0 +1,24 @@
+=== tests/cases/conformance/es6/modules/m1.ts ===
+
+export default function f() {
+>f : () => void
+}
+export {f};
+>f : () => void
+
+
+=== tests/cases/conformance/es6/modules/m2.ts ===
+import foo from "./m1";
+>foo : () => void
+
+import {f} from "./m1";
+>f : () => void
+
+f();
+>f() : void
+>f : () => void
+
+foo();
+>foo() : void
+>foo : () => void
+
diff --git a/tests/baselines/reference/reachabilityChecks1.errors.txt b/tests/baselines/reference/reachabilityChecks1.errors.txt
new file mode 100644
index 00000000000..18a453969a1
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks1.errors.txt
@@ -0,0 +1,99 @@
+tests/cases/compiler/reachabilityChecks1.ts(3,1): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks1.ts(7,5): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks1.ts(19,5): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks1.ts(31,5): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks1.ts(48,5): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks1.ts(61,5): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks1.ts(70,5): error TS7027: Unreachable code detected.
+
+
+==== tests/cases/compiler/reachabilityChecks1.ts (7 errors) ====
+    
+    while (true);
+    var x = 1;
+    ~~~
+!!! error TS7027: Unreachable code detected.
+    
+    module A {
+        while (true);
+        let x;
+        ~~~
+!!! error TS7027: Unreachable code detected.
+    }
+    
+    module A1 {
+        do {} while(true);
+        module A {
+            interface F {}
+        }
+    }
+    
+    module A2 {
+        while (true);
+        module A {
+        ~~~~~~
+!!! error TS7027: Unreachable code detected.
+            var x = 1;
+        }
+    }
+    
+    module A3 {
+        while (true);
+        type T = string;
+    }
+    
+    module A4 {
+        while (true);
+        module A {
+        ~~~~~~
+!!! error TS7027: Unreachable code detected.
+            const enum E { X }
+        }
+    }
+    
+    function f1(x) {
+        if (x) {
+            return;
+        }
+        else {
+            throw new Error("123");
+        }
+        var x;
+    }
+    
+    function f2() {
+        return;
+        class A {
+        ~~~~~
+!!! error TS7027: Unreachable code detected.
+        }
+    }
+    
+    module B {
+        for (; ;);
+        module C {
+        }
+    }
+    
+    function f3() {
+        do {
+        } while (true);
+        enum E {
+        ~~~~
+!!! error TS7027: Unreachable code detected.
+            X = 1
+        }
+    }
+    
+    function f4() {
+        if (true) {
+            throw new Error();
+        }
+        const enum E {
+        ~~~~~
+!!! error TS7027: Unreachable code detected.
+            X = 1
+        }
+    }
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/reachabilityChecks1.js b/tests/baselines/reference/reachabilityChecks1.js
new file mode 100644
index 00000000000..dcbfbe89de4
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks1.js
@@ -0,0 +1,156 @@
+//// [reachabilityChecks1.ts]
+
+while (true);
+var x = 1;
+
+module A {
+    while (true);
+    let x;
+}
+
+module A1 {
+    do {} while(true);
+    module A {
+        interface F {}
+    }
+}
+
+module A2 {
+    while (true);
+    module A {
+        var x = 1;
+    }
+}
+
+module A3 {
+    while (true);
+    type T = string;
+}
+
+module A4 {
+    while (true);
+    module A {
+        const enum E { X }
+    }
+}
+
+function f1(x) {
+    if (x) {
+        return;
+    }
+    else {
+        throw new Error("123");
+    }
+    var x;
+}
+
+function f2() {
+    return;
+    class A {
+    }
+}
+
+module B {
+    for (; ;);
+    module C {
+    }
+}
+
+function f3() {
+    do {
+    } while (true);
+    enum E {
+        X = 1
+    }
+}
+
+function f4() {
+    if (true) {
+        throw new Error();
+    }
+    const enum E {
+        X = 1
+    }
+}
+
+
+
+//// [reachabilityChecks1.js]
+while (true)
+    ;
+var x = 1;
+var A;
+(function (A) {
+    while (true)
+        ;
+    var x;
+})(A || (A = {}));
+var A1;
+(function (A1) {
+    do { } while (true);
+})(A1 || (A1 = {}));
+var A2;
+(function (A2) {
+    while (true)
+        ;
+    var A;
+    (function (A) {
+        var x = 1;
+    })(A || (A = {}));
+})(A2 || (A2 = {}));
+var A3;
+(function (A3) {
+    while (true)
+        ;
+})(A3 || (A3 = {}));
+var A4;
+(function (A4) {
+    while (true)
+        ;
+    var A;
+    (function (A) {
+        var E;
+        (function (E) {
+            E[E["X"] = 0] = "X";
+        })(E || (E = {}));
+    })(A || (A = {}));
+})(A4 || (A4 = {}));
+function f1(x) {
+    if (x) {
+        return;
+    }
+    else {
+        throw new Error("123");
+    }
+    var x;
+}
+function f2() {
+    return;
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+}
+var B;
+(function (B) {
+    for (;;)
+        ;
+})(B || (B = {}));
+function f3() {
+    do {
+    } while (true);
+    var E;
+    (function (E) {
+        E[E["X"] = 1] = "X";
+    })(E || (E = {}));
+}
+function f4() {
+    if (true) {
+        throw new Error();
+    }
+    var E;
+    (function (E) {
+        E[E["X"] = 1] = "X";
+    })(E || (E = {}));
+}
diff --git a/tests/baselines/reference/reachabilityChecks2.errors.txt b/tests/baselines/reference/reachabilityChecks2.errors.txt
new file mode 100644
index 00000000000..cd48f84f8e1
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks2.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/reachabilityChecks2.ts(5,1): error TS7027: Unreachable code detected.
+
+
+==== tests/cases/compiler/reachabilityChecks2.ts (1 errors) ====
+    
+    while (true) { }
+    const enum E { X }
+    
+    module A4 {
+    ~~~~~~
+!!! error TS7027: Unreachable code detected.
+        while (true);
+        module A {
+            const enum E { X }
+        }
+    }
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/reachabilityChecks2.js b/tests/baselines/reference/reachabilityChecks2.js
new file mode 100644
index 00000000000..a17b51b4ca6
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks2.js
@@ -0,0 +1,21 @@
+//// [reachabilityChecks2.ts]
+
+while (true) { }
+const enum E { X }
+
+module A4 {
+    while (true);
+    module A {
+        const enum E { X }
+    }
+}
+
+
+
+//// [reachabilityChecks2.js]
+while (true) { }
+var A4;
+(function (A4) {
+    while (true)
+        ;
+})(A4 || (A4 = {}));
diff --git a/tests/baselines/reference/reachabilityChecks3.errors.txt b/tests/baselines/reference/reachabilityChecks3.errors.txt
new file mode 100644
index 00000000000..1114f245f44
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks3.errors.txt
@@ -0,0 +1,27 @@
+tests/cases/compiler/reachabilityChecks3.ts(3,1): error TS7028: Unused label.
+tests/cases/compiler/reachabilityChecks3.ts(12,5): error TS7028: Unused label.
+tests/cases/compiler/reachabilityChecks3.ts(15,17): error TS7028: Unused label.
+
+
+==== tests/cases/compiler/reachabilityChecks3.ts (3 errors) ====
+    
+    let x = 1;
+    loop: while (true) {
+    ~~~~
+!!! error TS7028: Unused label.
+        if (x == 100) {
+            break;
+        }
+        else {
+            x++;
+        }
+    }
+    {
+        x: 100
+        ~
+!!! error TS7028: Unused label.
+    }
+    
+    var y = () => { f: 1 }
+                    ~
+!!! error TS7028: Unused label.
\ No newline at end of file
diff --git a/tests/baselines/reference/reachabilityChecks3.js b/tests/baselines/reference/reachabilityChecks3.js
new file mode 100644
index 00000000000..dd22453938d
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks3.js
@@ -0,0 +1,31 @@
+//// [reachabilityChecks3.ts]
+
+let x = 1;
+loop: while (true) {
+    if (x == 100) {
+        break;
+    }
+    else {
+        x++;
+    }
+}
+{
+    x: 100
+}
+
+var y = () => { f: 1 }
+
+//// [reachabilityChecks3.js]
+var x = 1;
+loop: while (true) {
+    if (x == 100) {
+        break;
+    }
+    else {
+        x++;
+    }
+}
+{
+    x: 100;
+}
+var y = function () { f: 1; };
diff --git a/tests/baselines/reference/reachabilityChecks4.errors.txt b/tests/baselines/reference/reachabilityChecks4.errors.txt
new file mode 100644
index 00000000000..ba9519462e7
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks4.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/compiler/reachabilityChecks4.ts(7,9): error TS7029: Fallthrough case in switch.
+
+
+==== tests/cases/compiler/reachabilityChecks4.ts (1 errors) ====
+    
+    function foo(x, y) {
+        switch (x) {
+            case 1:
+            case 2:
+                return 1;
+            case 3:
+            ~~~~
+!!! error TS7029: Fallthrough case in switch.
+                if (y) {
+                    return 2;
+                }
+            case 4:
+                return 3;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/reachabilityChecks4.js b/tests/baselines/reference/reachabilityChecks4.js
new file mode 100644
index 00000000000..588644c5a05
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks4.js
@@ -0,0 +1,30 @@
+//// [reachabilityChecks4.ts]
+
+function foo(x, y) {
+    switch (x) {
+        case 1:
+        case 2:
+            return 1;
+        case 3:
+            if (y) {
+                return 2;
+            }
+        case 4:
+            return 3;
+    }
+}
+
+//// [reachabilityChecks4.js]
+function foo(x, y) {
+    switch (x) {
+        case 1:
+        case 2:
+            return 1;
+        case 3:
+            if (y) {
+                return 2;
+            }
+        case 4:
+            return 3;
+    }
+}
diff --git a/tests/baselines/reference/reachabilityChecks5.errors.txt b/tests/baselines/reference/reachabilityChecks5.errors.txt
new file mode 100644
index 00000000000..147dbe264a3
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks5.errors.txt
@@ -0,0 +1,162 @@
+tests/cases/compiler/reachabilityChecks5.ts(6,17): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(19,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/compiler/reachabilityChecks5.ts(31,17): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(41,17): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(52,17): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(80,17): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(86,13): error TS7027: Unreachable code detected.
+tests/cases/compiler/reachabilityChecks5.ts(94,17): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(116,18): error TS7030: Not all code paths return a value.
+tests/cases/compiler/reachabilityChecks5.ts(123,13): error TS7027: Unreachable code detected.
+
+
+==== tests/cases/compiler/reachabilityChecks5.ts (10 errors) ====
+    
+    function f0(x): number {
+        while (true);
+    }
+    
+    function f1(x): number {
+                    ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        if (x) {
+            return 1
+        }
+    }
+    
+    function f2(x): number {
+        while (x) {
+            throw new Error();
+        }
+        return 1;
+    }
+    
+    function f3(x): number {
+                    ~~~~~~
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+        while (x) {
+            throw new Error();
+        }
+    }
+    
+    function f3_1 (x): number {
+        while (x) {
+        }
+        throw new Error();
+    }
+    
+    function f4(x): number {
+                    ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            if (x) {
+                return 1;
+            }
+        }
+        catch (e) {
+        }
+    }
+    
+    function f5(x): number {
+                    ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            if (x) {
+                return 1;
+            }
+        }
+        catch (e) {
+            return 2;
+        }
+    }
+    
+    function f6(x): number {
+                    ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            if (x) {
+                return 1;
+            }
+            else 
+            {
+                throw new Error();
+            }
+        }
+        catch (e) {
+        }
+    }
+    
+    function f7(x): number {
+        try {
+            if (x) {
+                return 1;
+            }
+            else {
+                throw new Error();
+            }
+        }
+        catch (e) {
+            return 1;
+        }
+    }
+    
+    function f8(x): number {
+                    ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            if (true) {
+                x++;
+            }
+            else {
+                return 1;
+                ~~~~~~
+!!! error TS7027: Unreachable code detected.
+            }
+        }
+        catch (e) {
+            return 1;
+        }
+    }
+    
+    function f9(x): number {
+                    ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            while (false) {
+                return 1;
+            }
+        }
+        catch (e) {
+            return 1;
+        }
+    }
+    
+    function f10(x): number {
+        try {
+            do {
+                x++;
+            } while (true);
+        }
+        catch (e) {
+            return 1;
+        }
+    }
+    
+    function f11(x): number {
+                     ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        test:
+        try {
+            do {
+                do {
+                    break test;
+                } while (true);
+                x++;
+                ~
+!!! error TS7027: Unreachable code detected.
+            } while (true);
+        }
+        catch (e) {
+            return 1;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/reachabilityChecks5.js b/tests/baselines/reference/reachabilityChecks5.js
new file mode 100644
index 00000000000..a6c507ac87b
--- /dev/null
+++ b/tests/baselines/reference/reachabilityChecks5.js
@@ -0,0 +1,247 @@
+//// [reachabilityChecks5.ts]
+
+function f0(x): number {
+    while (true);
+}
+
+function f1(x): number {
+    if (x) {
+        return 1
+    }
+}
+
+function f2(x): number {
+    while (x) {
+        throw new Error();
+    }
+    return 1;
+}
+
+function f3(x): number {
+    while (x) {
+        throw new Error();
+    }
+}
+
+function f3_1 (x): number {
+    while (x) {
+    }
+    throw new Error();
+}
+
+function f4(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+    }
+    catch (e) {
+    }
+}
+
+function f5(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 2;
+    }
+}
+
+function f6(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+        else 
+        {
+            throw new Error();
+        }
+    }
+    catch (e) {
+    }
+}
+
+function f7(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+        else {
+            throw new Error();
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f8(x): number {
+    try {
+        if (true) {
+            x++;
+        }
+        else {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f9(x): number {
+    try {
+        while (false) {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f10(x): number {
+    try {
+        do {
+            x++;
+        } while (true);
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f11(x): number {
+    test:
+    try {
+        do {
+            do {
+                break test;
+            } while (true);
+            x++;
+        } while (true);
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+//// [reachabilityChecks5.js]
+function f0(x) {
+    while (true)
+        ;
+}
+function f1(x) {
+    if (x) {
+        return 1;
+    }
+}
+function f2(x) {
+    while (x) {
+        throw new Error();
+    }
+    return 1;
+}
+function f3(x) {
+    while (x) {
+        throw new Error();
+    }
+}
+function f3_1(x) {
+    while (x) {
+    }
+    throw new Error();
+}
+function f4(x) {
+    try {
+        if (x) {
+            return 1;
+        }
+    }
+    catch (e) {
+    }
+}
+function f5(x) {
+    try {
+        if (x) {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 2;
+    }
+}
+function f6(x) {
+    try {
+        if (x) {
+            return 1;
+        }
+        else {
+            throw new Error();
+        }
+    }
+    catch (e) {
+    }
+}
+function f7(x) {
+    try {
+        if (x) {
+            return 1;
+        }
+        else {
+            throw new Error();
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+function f8(x) {
+    try {
+        if (true) {
+            x++;
+        }
+        else {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+function f9(x) {
+    try {
+        while (false) {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+function f10(x) {
+    try {
+        do {
+            x++;
+        } while (true);
+    }
+    catch (e) {
+        return 1;
+    }
+}
+function f11(x) {
+    test: try {
+        do {
+            do {
+                break test;
+            } while (true);
+            x++;
+        } while (true);
+    }
+    catch (e) {
+        return 1;
+    }
+}
diff --git a/tests/baselines/reference/recursiveFunctionTypes.errors.txt b/tests/baselines/reference/recursiveFunctionTypes.errors.txt
index c69549403c4..8d5303c0669 100644
--- a/tests/baselines/reference/recursiveFunctionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveFunctionTypes.errors.txt
@@ -2,8 +2,8 @@ tests/cases/compiler/recursiveFunctionTypes.ts(1,35): error TS2322: Type 'number
 tests/cases/compiler/recursiveFunctionTypes.ts(3,5): error TS2322: Type '() => typeof fn' is not assignable to type 'number'.
 tests/cases/compiler/recursiveFunctionTypes.ts(4,5): error TS2322: Type '() => typeof fn' is not assignable to type '() => number'.
   Type '() => typeof fn' is not assignable to type 'number'.
-tests/cases/compiler/recursiveFunctionTypes.ts(11,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-tests/cases/compiler/recursiveFunctionTypes.ts(12,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/recursiveFunctionTypes.ts(11,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/compiler/recursiveFunctionTypes.ts(12,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/recursiveFunctionTypes.ts(17,5): error TS2322: Type '() => I<typeof f3>' is not assignable to type 'number'.
 tests/cases/compiler/recursiveFunctionTypes.ts(22,5): error TS2345: Argument of type 'number' is not assignable to parameter of type '(t: typeof g) => void'.
 tests/cases/compiler/recursiveFunctionTypes.ts(25,1): error TS2322: Type 'number' is not assignable to type '() => any'.
@@ -34,10 +34,10 @@ tests/cases/compiler/recursiveFunctionTypes.ts(43,4): error TS2345: Argument of
     
     function f2(): typeof g2 { } 
                    ~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function g2(): typeof f2 { } 
                    ~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     
     interface I<T> { }
     function f3(): I<typeof f3> { return f3; }
diff --git a/tests/baselines/reference/recursiveLetConst.errors.txt b/tests/baselines/reference/recursiveLetConst.errors.txt
index b02d0819a3f..88ecb379e5e 100644
--- a/tests/baselines/reference/recursiveLetConst.errors.txt
+++ b/tests/baselines/reference/recursiveLetConst.errors.txt
@@ -3,6 +3,7 @@ tests/cases/compiler/recursiveLetConst.ts(3,12): error TS2448: Block-scoped vari
 tests/cases/compiler/recursiveLetConst.ts(4,11): error TS2448: Block-scoped variable 'y' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(5,14): error TS2448: Block-scoped variable 'y1' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(6,14): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(7,1): error TS7027: Unreachable code detected.
 tests/cases/compiler/recursiveLetConst.ts(7,16): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(8,15): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(9,15): error TS2448: Block-scoped variable 'v' used before its declaration.
@@ -10,7 +11,7 @@ tests/cases/compiler/recursiveLetConst.ts(10,17): error TS2448: Block-scoped var
 tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped variable 'x2' used before its declaration.
 
 
-==== tests/cases/compiler/recursiveLetConst.ts (10 errors) ====
+==== tests/cases/compiler/recursiveLetConst.ts (11 errors) ====
     'use strict'
     let x = x + 1;
             ~
@@ -28,6 +29,8 @@ tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped var
                  ~
 !!! error TS2448: Block-scoped variable 'v' used before its declaration.
     for (let [v] = v; ;) { }
+    ~~~
+!!! error TS7027: Unreachable code detected.
                    ~
 !!! error TS2448: Block-scoped variable 'v' used before its declaration.
     for (let v in v) { }
diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js
index 36d2712e040..f913ddec012 100644
--- a/tests/baselines/reference/recursiveMods.js
+++ b/tests/baselines/reference/recursiveMods.js
@@ -1,4 +1,5 @@
 //// [recursiveMods.ts]
+
 export module Foo {
 	export class C {}
 }
diff --git a/tests/baselines/reference/recursiveMods.symbols b/tests/baselines/reference/recursiveMods.symbols
index 1e7e8fa1c84..5f6d6f87721 100644
--- a/tests/baselines/reference/recursiveMods.symbols
+++ b/tests/baselines/reference/recursiveMods.symbols
@@ -1,44 +1,45 @@
 === tests/cases/compiler/recursiveMods.ts ===
+
 export module Foo {
->Foo : Symbol(Foo, Decl(recursiveMods.ts, 0, 0), Decl(recursiveMods.ts, 2, 1))
+>Foo : Symbol(Foo, Decl(recursiveMods.ts, 0, 0), Decl(recursiveMods.ts, 3, 1))
 
 	export class C {}
->C : Symbol(C, Decl(recursiveMods.ts, 0, 19))
+>C : Symbol(C, Decl(recursiveMods.ts, 1, 19))
 }
 
 export module Foo {
->Foo : Symbol(Foo, Decl(recursiveMods.ts, 0, 0), Decl(recursiveMods.ts, 2, 1))
+>Foo : Symbol(Foo, Decl(recursiveMods.ts, 0, 0), Decl(recursiveMods.ts, 3, 1))
 
 	function Bar() : C {
->Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 19))
->C : Symbol(C, Decl(recursiveMods.ts, 0, 19))
+>Bar : Symbol(Bar, Decl(recursiveMods.ts, 5, 19))
+>C : Symbol(C, Decl(recursiveMods.ts, 1, 19))
 
 		if (true) { return Bar();}
->Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 19))
+>Bar : Symbol(Bar, Decl(recursiveMods.ts, 5, 19))
 
 		return new C();
->C : Symbol(C, Decl(recursiveMods.ts, 0, 19))
+>C : Symbol(C, Decl(recursiveMods.ts, 1, 19))
 	}
 
 	function Baz() : C {
->Baz : Symbol(Baz, Decl(recursiveMods.ts, 9, 2))
->C : Symbol(C, Decl(recursiveMods.ts, 0, 19))
+>Baz : Symbol(Baz, Decl(recursiveMods.ts, 10, 2))
+>C : Symbol(C, Decl(recursiveMods.ts, 1, 19))
 
 		var c = Baz();
->c : Symbol(c, Decl(recursiveMods.ts, 12, 5))
->Baz : Symbol(Baz, Decl(recursiveMods.ts, 9, 2))
+>c : Symbol(c, Decl(recursiveMods.ts, 13, 5))
+>Baz : Symbol(Baz, Decl(recursiveMods.ts, 10, 2))
 
 		return Bar();
->Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 19))
+>Bar : Symbol(Bar, Decl(recursiveMods.ts, 5, 19))
 	}
 
 	function Gar() {
->Gar : Symbol(Gar, Decl(recursiveMods.ts, 14, 2))
+>Gar : Symbol(Gar, Decl(recursiveMods.ts, 15, 2))
 
 		var c : C = Baz();
->c : Symbol(c, Decl(recursiveMods.ts, 17, 5))
->C : Symbol(C, Decl(recursiveMods.ts, 0, 19))
->Baz : Symbol(Baz, Decl(recursiveMods.ts, 9, 2))
+>c : Symbol(c, Decl(recursiveMods.ts, 18, 5))
+>C : Symbol(C, Decl(recursiveMods.ts, 1, 19))
+>Baz : Symbol(Baz, Decl(recursiveMods.ts, 10, 2))
 
 		return;
 	}
diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types
index d7f28f84975..d4db816daf7 100644
--- a/tests/baselines/reference/recursiveMods.types
+++ b/tests/baselines/reference/recursiveMods.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/recursiveMods.ts ===
+
 export module Foo {
 >Foo : typeof Foo
 
diff --git a/tests/baselines/reference/recursiveNamedLambdaCall.errors.txt b/tests/baselines/reference/recursiveNamedLambdaCall.errors.txt
index 7729d1e780f..04ddc371ac7 100644
--- a/tests/baselines/reference/recursiveNamedLambdaCall.errors.txt
+++ b/tests/baselines/reference/recursiveNamedLambdaCall.errors.txt
@@ -1,11 +1,12 @@
 tests/cases/compiler/recursiveNamedLambdaCall.ts(3,8): error TS2304: Cannot find name 'top'.
 tests/cases/compiler/recursiveNamedLambdaCall.ts(3,15): error TS2304: Cannot find name 'top'.
+tests/cases/compiler/recursiveNamedLambdaCall.ts(7,6): error TS7027: Unreachable code detected.
 tests/cases/compiler/recursiveNamedLambdaCall.ts(8,7): error TS2304: Cannot find name 'top'.
 tests/cases/compiler/recursiveNamedLambdaCall.ts(10,14): error TS2304: Cannot find name 'setTimeout'.
 tests/cases/compiler/recursiveNamedLambdaCall.ts(14,6): error TS2304: Cannot find name 'detach'.
 
 
-==== tests/cases/compiler/recursiveNamedLambdaCall.ts (5 errors) ====
+==== tests/cases/compiler/recursiveNamedLambdaCall.ts (6 errors) ====
     var promise = function( obj ) {
     	
     		if ( top && top.doScroll ) {
@@ -17,6 +18,8 @@ tests/cases/compiler/recursiveNamedLambdaCall.ts(14,6): error TS2304: Cannot fin
     				if ( false ) {
     
     					try {
+    					~~~
+!!! error TS7027: Unreachable code detected.
     						top.doScroll("left");
     						~~~
 !!! error TS2304: Cannot find name 'top'.
diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt
index 090b2d0d43e..d6e2d04073d 100644
--- a/tests/baselines/reference/reservedWords2.errors.txt
+++ b/tests/baselines/reference/reservedWords2.errors.txt
@@ -14,6 +14,7 @@ tests/cases/compiler/reservedWords2.ts(5,9): error TS2300: Duplicate identifier
 tests/cases/compiler/reservedWords2.ts(5,10): error TS1003: Identifier expected.
 tests/cases/compiler/reservedWords2.ts(5,18): error TS1005: '=>' expected.
 tests/cases/compiler/reservedWords2.ts(6,1): error TS2304: Cannot find name 'module'.
+tests/cases/compiler/reservedWords2.ts(6,1): error TS7027: Unreachable code detected.
 tests/cases/compiler/reservedWords2.ts(6,8): error TS1005: ';' expected.
 tests/cases/compiler/reservedWords2.ts(7,11): error TS2300: Duplicate identifier '(Missing)'.
 tests/cases/compiler/reservedWords2.ts(7,11): error TS1005: ':' expected.
@@ -31,7 +32,7 @@ tests/cases/compiler/reservedWords2.ts(10,5): error TS2300: Duplicate identifier
 tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected.
 
 
-==== tests/cases/compiler/reservedWords2.ts (31 errors) ====
+==== tests/cases/compiler/reservedWords2.ts (32 errors) ====
     import while = require("dfdf");
     ~~~~~~
 !!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
@@ -70,6 +71,8 @@ tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected.
     module void {}
     ~~~~~~
 !!! error TS2304: Cannot find name 'module'.
+    ~~~~~~
+!!! error TS7027: Unreachable code detected.
            ~~~~
 !!! error TS1005: ';' expected.
     var {while, return} = { while: 1, return: 2 };
diff --git a/tests/baselines/reference/returnInConstructor1.errors.txt b/tests/baselines/reference/returnInConstructor1.errors.txt
index eca0037b4a3..dbe3b9e5ee8 100644
--- a/tests/baselines/reference/returnInConstructor1.errors.txt
+++ b/tests/baselines/reference/returnInConstructor1.errors.txt
@@ -1,10 +1,20 @@
+tests/cases/compiler/returnInConstructor1.ts(11,16): error TS2322: Type 'number' is not assignable to type 'B'.
+  Property 'foo' is missing in type 'Number'.
 tests/cases/compiler/returnInConstructor1.ts(11,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
+tests/cases/compiler/returnInConstructor1.ts(25,16): error TS2322: Type 'string' is not assignable to type 'D'.
+  Property 'foo' is missing in type 'String'.
 tests/cases/compiler/returnInConstructor1.ts(25,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
+tests/cases/compiler/returnInConstructor1.ts(39,16): error TS2322: Type '{ foo: number; }' is not assignable to type 'F'.
+  Types of property 'foo' are incompatible.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/returnInConstructor1.ts(39,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
+tests/cases/compiler/returnInConstructor1.ts(55,16): error TS2322: Type 'G' is not assignable to type 'H'.
+  Types of property 'foo' are incompatible.
+    Type '() => void' is not assignable to type 'string'.
 tests/cases/compiler/returnInConstructor1.ts(55,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
 
 
-==== tests/cases/compiler/returnInConstructor1.ts (4 errors) ====
+==== tests/cases/compiler/returnInConstructor1.ts (8 errors) ====
     class A {
         foo() { }
         constructor() {
@@ -17,6 +27,9 @@ tests/cases/compiler/returnInConstructor1.ts(55,16): error TS2409: Return type o
         constructor() {
             return 1; // error
                    ~
+!!! error TS2322: Type 'number' is not assignable to type 'B'.
+!!! 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
         }
     }
@@ -33,6 +46,9 @@ tests/cases/compiler/returnInConstructor1.ts(55,16): error TS2409: Return type o
         constructor() {
             return "test"; // error
                    ~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'D'.
+!!! error TS2322:   Property 'foo' is missing in type 'String'.
+                   ~~~~~~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }
     }
@@ -49,6 +65,10 @@ tests/cases/compiler/returnInConstructor1.ts(55,16): error TS2409: Return type o
         constructor() {
             return { foo: 1 }; //error
                    ~~~~~~~~~~
+!!! error TS2322: Type '{ foo: number; }' is not assignable to type 'F'.
+!!! error TS2322:   Types of property 'foo' are incompatible.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+                   ~~~~~~~~~~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }
     }
@@ -67,6 +87,10 @@ tests/cases/compiler/returnInConstructor1.ts(55,16): error TS2409: Return type o
             super();
             return new G(); //error
                    ~~~~~~~
+!!! error TS2322: Type 'G' is not assignable to type 'H'.
+!!! error TS2322:   Types of property 'foo' are incompatible.
+!!! error TS2322:     Type '() => void' is not assignable to type 'string'.
+                   ~~~~~~~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }
     }
diff --git a/tests/baselines/reference/returnStatement1.js b/tests/baselines/reference/returnStatement1.js
index c4ccc3cadde..3f5c5561b2a 100644
--- a/tests/baselines/reference/returnStatement1.js
+++ b/tests/baselines/reference/returnStatement1.js
@@ -1,4 +1,5 @@
 //// [returnStatement1.ts]
+
 function f() {
     return function (s) {
         var x = s;
diff --git a/tests/baselines/reference/returnStatement1.symbols b/tests/baselines/reference/returnStatement1.symbols
index acec9f76003..6727cba0df5 100644
--- a/tests/baselines/reference/returnStatement1.symbols
+++ b/tests/baselines/reference/returnStatement1.symbols
@@ -1,13 +1,14 @@
 === tests/cases/compiler/returnStatement1.ts ===
+
 function f() {
 >f : Symbol(f, Decl(returnStatement1.ts, 0, 0))
 
     return function (s) {
->s : Symbol(s, Decl(returnStatement1.ts, 1, 21))
+>s : Symbol(s, Decl(returnStatement1.ts, 2, 21))
 
         var x = s;
->x : Symbol(x, Decl(returnStatement1.ts, 2, 11))
->s : Symbol(s, Decl(returnStatement1.ts, 1, 21))
+>x : Symbol(x, Decl(returnStatement1.ts, 3, 11))
+>s : Symbol(s, Decl(returnStatement1.ts, 2, 21))
 
     };
     ("harmless extra line");
diff --git a/tests/baselines/reference/returnStatement1.types b/tests/baselines/reference/returnStatement1.types
index ff30148af5a..b7e166ffa75 100644
--- a/tests/baselines/reference/returnStatement1.types
+++ b/tests/baselines/reference/returnStatement1.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/returnStatement1.ts ===
+
 function f() {
 >f : () => (s: any) => void
 
diff --git a/tests/baselines/reference/returnTypeParameter.errors.txt b/tests/baselines/reference/returnTypeParameter.errors.txt
index 11c0888f47c..1bd9f6a63f6 100644
--- a/tests/baselines/reference/returnTypeParameter.errors.txt
+++ b/tests/baselines/reference/returnTypeParameter.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/returnTypeParameter.ts(1,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+tests/cases/compiler/returnTypeParameter.ts(1,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/returnTypeParameter.ts(2,34): error TS2304: Cannot find name 'T'.
 
 
 ==== tests/cases/compiler/returnTypeParameter.ts (2 errors) ====
     function f<T>(a: T): T { } // error, no return statement
                          ~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function f2<T>(a: T): T { return T; } // bug was that this satisfied the return statement requirement
                                      ~
 !!! error TS2304: Cannot find name 'T'.
\ No newline at end of file
diff --git a/tests/baselines/reference/scanner10.1.1-8gs.errors.txt b/tests/baselines/reference/scanner10.1.1-8gs.errors.txt
index 54cd92dc0ca..23d89cdf7ff 100644
--- a/tests/baselines/reference/scanner10.1.1-8gs.errors.txt
+++ b/tests/baselines/reference/scanner10.1.1-8gs.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/conformance/scanner/ecmascript5/scanner10.1.1-8gs.ts(16,7): error TS2304: Cannot find name 'NotEarlyError'.
+tests/cases/conformance/scanner/ecmascript5/scanner10.1.1-8gs.ts(17,1): error TS7027: Unreachable code detected.
 tests/cases/conformance/scanner/ecmascript5/scanner10.1.1-8gs.ts(17,5): error TS1212: Identifier expected. 'public' is a reserved word in strict mode
 
 
-==== tests/cases/conformance/scanner/ecmascript5/scanner10.1.1-8gs.ts (2 errors) ====
+==== tests/cases/conformance/scanner/ecmascript5/scanner10.1.1-8gs.ts (3 errors) ====
     /// Copyright (c) 2012 Ecma International.  All rights reserved. 
     /// Ecma International makes this code available under the terms and conditions set
     /// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
@@ -22,6 +23,8 @@ tests/cases/conformance/scanner/ecmascript5/scanner10.1.1-8gs.ts(17,5): error TS
           ~~~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'NotEarlyError'.
     var public = 1;
+    ~~~
+!!! error TS7027: Unreachable code detected.
         ~~~~~~
 !!! error TS1212: Identifier expected. 'public' is a reserved word in strict mode
     
\ No newline at end of file
diff --git a/tests/baselines/reference/setterWithReturn.errors.txt b/tests/baselines/reference/setterWithReturn.errors.txt
index 481116327b8..6aed49105b8 100644
--- a/tests/baselines/reference/setterWithReturn.errors.txt
+++ b/tests/baselines/reference/setterWithReturn.errors.txt
@@ -1,9 +1,10 @@
 tests/cases/compiler/setterWithReturn.ts(2,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/setterWithReturn.ts(4,20): error TS2408: Setters cannot return a value.
+tests/cases/compiler/setterWithReturn.ts(7,13): error TS7027: Unreachable code detected.
 tests/cases/compiler/setterWithReturn.ts(7,20): error TS2408: Setters cannot return a value.
 
 
-==== tests/cases/compiler/setterWithReturn.ts (3 errors) ====
+==== tests/cases/compiler/setterWithReturn.ts (4 errors) ====
     class C234 {
         public set p1(arg1) {
                    ~~
@@ -15,6 +16,8 @@ tests/cases/compiler/setterWithReturn.ts(7,20): error TS2408: Setters cannot ret
             }
             else {
                 return 0;
+                ~~~~~~
+!!! error TS7027: Unreachable code detected.
                        ~
 !!! error TS2408: Setters cannot return a value.
             }
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt
new file mode 100644
index 00000000000..35fc45421c4
--- /dev/null
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './missingModule'.
+
+
+==== tests/cases/compiler/existingModule.ts (0 errors) ====
+    
+    export var x = 1;
+    
+==== tests/cases/compiler/test.ts (1 errors) ====
+    import {x} from './existingModule';
+    import {foo} from './missingModule';
+                      ~~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module './missingModule'.
+    
+    declare function use(a: any): void;
+    
+    const test = { x, foo };
+    
+    use(x);
+    use(foo);
\ No newline at end of file
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
new file mode 100644
index 00000000000..1cb7fc677cd
--- /dev/null
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
@@ -0,0 +1,25 @@
+//// [tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts] ////
+
+//// [existingModule.ts]
+
+export var x = 1;
+
+//// [test.ts]
+import {x} from './existingModule';
+import {foo} from './missingModule';
+
+declare function use(a: any): void;
+
+const test = { x, foo };
+
+use(x);
+use(foo);
+
+//// [existingModule.js]
+exports.x = 1;
+//// [test.js]
+var existingModule_1 = require('./existingModule');
+var missingModule_1 = require('./missingModule');
+const test = { x: existingModule_1.x, foo: missingModule_1.foo };
+use(existingModule_1.x);
+use(missingModule_1.foo);
diff --git a/tests/baselines/reference/sourceMapValidationFor.errors.txt b/tests/baselines/reference/sourceMapValidationFor.errors.txt
index 7fe75d640d2..6949d7545ed 100644
--- a/tests/baselines/reference/sourceMapValidationFor.errors.txt
+++ b/tests/baselines/reference/sourceMapValidationFor.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/sourceMapValidationFor.ts(2,5): error TS2304: Cannot find name 'WScript'.
 tests/cases/compiler/sourceMapValidationFor.ts(6,5): error TS2304: Cannot find name 'WScript'.
+tests/cases/compiler/sourceMapValidationFor.ts(20,1): error TS7027: Unreachable code detected.
 
 
-==== tests/cases/compiler/sourceMapValidationFor.ts (2 errors) ====
+==== tests/cases/compiler/sourceMapValidationFor.ts (3 errors) ====
     for (var i = 0; i < 10; i++) {
         WScript.Echo("i: " + i);
         ~~~~~~~
@@ -27,6 +28,8 @@ tests/cases/compiler/sourceMapValidationFor.ts(6,5): error TS2304: Cannot find n
     for (var k = 0;; k++) {
     }
     for (k = 0;; k++)
+    ~~~
+!!! error TS7027: Unreachable code detected.
     {
     }
     for (; k < 10; k++) {
diff --git a/tests/baselines/reference/sourceMapValidationLabeled.js b/tests/baselines/reference/sourceMapValidationLabeled.js
index 7aabc47ea4e..50669b870ab 100644
--- a/tests/baselines/reference/sourceMapValidationLabeled.js
+++ b/tests/baselines/reference/sourceMapValidationLabeled.js
@@ -1,4 +1,5 @@
 //// [sourceMapValidationLabeled.ts]
+
 x:
 var b = 10;
 
diff --git a/tests/baselines/reference/sourceMapValidationLabeled.js.map b/tests/baselines/reference/sourceMapValidationLabeled.js.map
index d1219f9896f..206ac95b951 100644
--- a/tests/baselines/reference/sourceMapValidationLabeled.js.map
+++ b/tests/baselines/reference/sourceMapValidationLabeled.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationLabeled.js.map]
-{"version":3,"file":"sourceMapValidationLabeled.js","sourceRoot":"","sources":["sourceMapValidationLabeled.ts"],"names":[],"mappings":"AAAA,CAAC,EACD,IAAI,CAAC,GAAG,EAAE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationLabeled.js","sourceRoot":"","sources":["sourceMapValidationLabeled.ts"],"names":[],"mappings":"AACA,CAAC,EACD,IAAI,CAAC,GAAG,EAAE,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationLabeled.sourcemap.txt b/tests/baselines/reference/sourceMapValidationLabeled.sourcemap.txt
index 007208c78f9..7cf1bf896ca 100644
--- a/tests/baselines/reference/sourceMapValidationLabeled.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationLabeled.sourcemap.txt
@@ -18,7 +18,8 @@ sourceFile:sourceMapValidationLabeled.ts
 7 >           ^^
 8 >             ^
 9 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+1 >
+  >
 2 >x
 3 > :
   > 
@@ -27,13 +28,13 @@ sourceFile:sourceMapValidationLabeled.ts
 6 >         = 
 7 >           10
 8 >             ;
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 2) Source(1, 2) + SourceIndex(0)
-3 >Emitted(1, 4) Source(2, 1) + SourceIndex(0)
-4 >Emitted(1, 8) Source(2, 5) + SourceIndex(0)
-5 >Emitted(1, 9) Source(2, 6) + SourceIndex(0)
-6 >Emitted(1, 12) Source(2, 9) + SourceIndex(0)
-7 >Emitted(1, 14) Source(2, 11) + SourceIndex(0)
-8 >Emitted(1, 15) Source(2, 12) + SourceIndex(0)
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 2) Source(2, 2) + SourceIndex(0)
+3 >Emitted(1, 4) Source(3, 1) + SourceIndex(0)
+4 >Emitted(1, 8) Source(3, 5) + SourceIndex(0)
+5 >Emitted(1, 9) Source(3, 6) + SourceIndex(0)
+6 >Emitted(1, 12) Source(3, 9) + SourceIndex(0)
+7 >Emitted(1, 14) Source(3, 11) + SourceIndex(0)
+8 >Emitted(1, 15) Source(3, 12) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationLabeled.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationLabeled.symbols b/tests/baselines/reference/sourceMapValidationLabeled.symbols
index 2a3c4f5606c..bf9abc593b3 100644
--- a/tests/baselines/reference/sourceMapValidationLabeled.symbols
+++ b/tests/baselines/reference/sourceMapValidationLabeled.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/sourceMapValidationLabeled.ts ===
+
 x:
 var b = 10;
->b : Symbol(b, Decl(sourceMapValidationLabeled.ts, 1, 3))
+>b : Symbol(b, Decl(sourceMapValidationLabeled.ts, 2, 3))
 
diff --git a/tests/baselines/reference/sourceMapValidationLabeled.types b/tests/baselines/reference/sourceMapValidationLabeled.types
index 3058869cb0b..7af624ac93b 100644
--- a/tests/baselines/reference/sourceMapValidationLabeled.types
+++ b/tests/baselines/reference/sourceMapValidationLabeled.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/sourceMapValidationLabeled.ts ===
+
 x:
 >x : any
 
diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js
new file mode 100644
index 00000000000..ec6b5682edd
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js
@@ -0,0 +1,10 @@
+//// [sourceMapValidationLambdaSpanningMultipleLines.ts]
+((item: string) =>
+    item
+)
+
+//// [sourceMapValidationLambdaSpanningMultipleLines.js]
+(function (item) {
+    return item;
+});
+//# sourceMappingURL=sourceMapValidationLambdaSpanningMultipleLines.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map
new file mode 100644
index 00000000000..c0151106e7c
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map
@@ -0,0 +1,2 @@
+//// [sourceMapValidationLambdaSpanningMultipleLines.js.map]
+{"version":3,"file":"sourceMapValidationLambdaSpanningMultipleLines.js","sourceRoot":"","sources":["sourceMapValidationLambdaSpanningMultipleLines.ts"],"names":[],"mappings":"AAAA,CAAC,UAAC,IAAY;IACV,OAAA,IAAI;AAAJ,CAAI,CACP,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt
new file mode 100644
index 00000000000..475aa1debef
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt
@@ -0,0 +1,54 @@
+===================================================================
+JsFile: sourceMapValidationLambdaSpanningMultipleLines.js
+mapUrl: sourceMapValidationLambdaSpanningMultipleLines.js.map
+sourceRoot: 
+sources: sourceMapValidationLambdaSpanningMultipleLines.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.js
+sourceFile:sourceMapValidationLambdaSpanningMultipleLines.ts
+-------------------------------------------------------------------
+>>>(function (item) {
+1 >
+2 >^
+3 > ^^^^^^^^^^
+4 >           ^^^^
+5 >               ^^->
+1 >
+2 >(
+3 > (
+4 >           item: string
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 2) Source(1, 2) + SourceIndex(0)
+3 >Emitted(1, 12) Source(1, 3) + SourceIndex(0)
+4 >Emitted(1, 16) Source(1, 15) + SourceIndex(0)
+---
+>>>    return item;
+1->^^^^
+2 >    ^^^^^^^
+3 >           ^^^^
+1->) =>
+  >    
+2 >    
+3 >           item
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(2, 12) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 16) Source(2, 9) + SourceIndex(0)
+---
+>>>});
+1 >
+2 >^
+3 > ^
+4 >  ^
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >item
+3 > 
+  > )
+4 >  
+1 >Emitted(3, 1) Source(2, 5) + SourceIndex(0)
+2 >Emitted(3, 2) Source(2, 9) + SourceIndex(0)
+3 >Emitted(3, 3) Source(3, 2) + SourceIndex(0)
+4 >Emitted(3, 4) Source(3, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=sourceMapValidationLambdaSpanningMultipleLines.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols
new file mode 100644
index 00000000000..c7ff4ca9d9f
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts ===
+((item: string) =>
+>item : Symbol(item, Decl(sourceMapValidationLambdaSpanningMultipleLines.ts, 0, 2))
+
+    item
+>item : Symbol(item, Decl(sourceMapValidationLambdaSpanningMultipleLines.ts, 0, 2))
+
+)
diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types
new file mode 100644
index 00000000000..d39119cbd91
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts ===
+((item: string) =>
+>((item: string) =>    item) : (item: string) => string
+>(item: string) =>    item : (item: string) => string
+>item : string
+
+    item
+>item : string
+
+)
diff --git a/tests/baselines/reference/specializedSignatureInInterface.types b/tests/baselines/reference/specializedSignatureInInterface.types
index c8f76f4cb9b..b9621af7b8b 100644
--- a/tests/baselines/reference/specializedSignatureInInterface.types
+++ b/tests/baselines/reference/specializedSignatureInInterface.types
@@ -11,8 +11,8 @@ interface B extends A {
 >A : A
 
   (key:'foo'):string;
->key : 'foo'
+>key : "foo"
 
   (key:'bar'):string;
->key : 'bar'
+>key : "bar"
 }
diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
index cb86966d65a..b27a935ced6 100644
--- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
+++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
@@ -3,30 +3,30 @@
 // All the below should not be errors
 
 function foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; }
+>x : "a"
 
 function foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : { (x: "a"): any; (x: string): any; }
 >x : string
 
 function foo(x: any) { }
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : { (x: "a"): any; (x: string): any; }
 >x : any
 
 class C {
 >C : C
 
     foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; }
+>x : "a"
 
     foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : { (x: "a"): any; (x: string): any; }
 >x : string
 
     foo(x: any) { }
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : { (x: "a"): any; (x: string): any; }
 >x : any
 }
 
@@ -35,20 +35,20 @@ class C2<T> {
 >T : T
 
     foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
+>x : "a"
 
     foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : string
 
     foo(x: T);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
 >T : T
 
     foo(x: any) { }
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : any
 }
 
@@ -58,20 +58,20 @@ class C3<T extends String> {
 >String : String
 
     foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
+>x : "a"
 
     foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : string
 
     foo(x: T);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
 >T : T
 
     foo(x: any) { }
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : any
 }
 
@@ -79,7 +79,7 @@ interface I {
 >I : I
 
     (x: 'a');
->x : 'a'
+>x : "a"
 
     (x: number);
 >x : number
@@ -88,15 +88,15 @@ interface I {
 >x : string
 
     foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; (x: number): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; (x: number): any; }
+>x : "a"
 
     foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; (x: number): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: number): any; }
 >x : string
 
     foo(x: number);
->foo : { (x: 'a'): any; (x: string): any; (x: number): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: number): any; }
 >x : number
 }
 
@@ -105,7 +105,7 @@ interface I2<T> {
 >T : T
 
     (x: 'a');
->x : 'a'
+>x : "a"
 
     (x: T);
 >x : T
@@ -115,15 +115,15 @@ interface I2<T> {
 >x : string
 
     foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
+>x : "a"
 
     foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : string
 
     foo(x: T);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
 >T : T
 }
@@ -134,7 +134,7 @@ interface I3<T extends String> {
 >String : String
 
     (x: 'a');
->x : 'a'
+>x : "a"
 
     (x: string);
 >x : string
@@ -144,49 +144,49 @@ interface I3<T extends String> {
 >T : T
 
     foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
->x : 'a'
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
+>x : "a"
 
     foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : string
 
     foo(x: T);
->foo : { (x: 'a'): any; (x: string): any; (x: T): any; }
+>foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
 >T : T
 }
 
 var a: {
->a : { (x: string): any; (x: 'a'): any; (x: number): any; foo(x: string): any; foo(x: 'a'): any; foo(x: number): any; }
+>a : { (x: string): any; (x: "a"): any; (x: number): any; foo(x: string): any; foo(x: "a"): any; foo(x: number): any; }
 
     (x: string);
 >x : string
 
     (x: 'a');
->x : 'a'
+>x : "a"
 
     (x: number);
 >x : number
 
     foo(x: string);
->foo : { (x: string): any; (x: 'a'): any; (x: number): any; }
+>foo : { (x: string): any; (x: "a"): any; (x: number): any; }
 >x : string
 
     foo(x: 'a');
->foo : { (x: string): any; (x: 'a'): any; (x: number): any; }
->x : 'a'
+>foo : { (x: string): any; (x: "a"): any; (x: number): any; }
+>x : "a"
 
     foo(x: number);
->foo : { (x: string): any; (x: 'a'): any; (x: number): any; }
+>foo : { (x: string): any; (x: "a"): any; (x: number): any; }
 >x : number
 }
 
 var a2: {
->a2 : { (x: 'a'): any; (x: string): any; <T>(x: T): any; foo(x: string): any; foo(x: 'a'): any; foo<T>(x: T): any; }
+>a2 : { (x: "a"): any; (x: string): any; <T>(x: T): any; foo(x: string): any; foo(x: "a"): any; foo<T>(x: T): any; }
 
     (x: 'a');
->x : 'a'
+>x : "a"
 
     (x: string);
 >x : string
@@ -197,25 +197,25 @@ var a2: {
 >T : T
 
     foo(x: string);
->foo : { (x: string): any; (x: 'a'): any; <T>(x: T): any; }
+>foo : { (x: string): any; (x: "a"): any; <T>(x: T): any; }
 >x : string
 
     foo(x: 'a');
->foo : { (x: string): any; (x: 'a'): any; <T>(x: T): any; }
->x : 'a'
+>foo : { (x: string): any; (x: "a"): any; <T>(x: T): any; }
+>x : "a"
 
     foo<T>(x: T);
->foo : { (x: string): any; (x: 'a'): any; <T>(x: T): any; }
+>foo : { (x: string): any; (x: "a"): any; <T>(x: T): any; }
 >T : T
 >x : T
 >T : T
 }
 
 var a3: {
->a3 : { (x: 'a'): any; <T>(x: T): any; (x: string): any; foo(x: string): any; foo(x: 'a'): any; foo<T extends String>(x: T): any; }
+>a3 : { (x: "a"): any; <T>(x: T): any; (x: string): any; foo(x: string): any; foo(x: "a"): any; foo<T extends String>(x: T): any; }
 
     (x: 'a');
->x : 'a'
+>x : "a"
 
     <T>(x: T);
 >T : T
@@ -226,15 +226,15 @@ var a3: {
 >x : string
 
     foo(x: string);
->foo : { (x: string): any; (x: 'a'): any; <T extends String>(x: T): any; }
+>foo : { (x: string): any; (x: "a"): any; <T extends String>(x: T): any; }
 >x : string
 
     foo(x: 'a');
->foo : { (x: string): any; (x: 'a'): any; <T extends String>(x: T): any; }
->x : 'a'
+>foo : { (x: string): any; (x: "a"): any; <T extends String>(x: T): any; }
+>x : "a"
 
     foo<T extends String>(x: T);
->foo : { (x: string): any; (x: 'a'): any; <T extends String>(x: T): any; }
+>foo : { (x: string): any; (x: "a"): any; <T extends String>(x: T): any; }
 >T : T
 >String : String
 >x : T
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.js b/tests/baselines/reference/stringLiteralCheckedInIf01.js
new file mode 100644
index 00000000000..161c39b96ef
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralCheckedInIf01.js
@@ -0,0 +1,29 @@
+//// [stringLiteralCheckedInIf01.ts]
+
+type S = "a" | "b";
+type T = S[] | S;
+
+function f(foo: T) {
+    if (foo === "a") {
+        return foo;
+    }
+    else if (foo === "b") {
+        return foo;
+    }
+    else { 
+        return (foo as S[])[0];
+    }
+}
+
+//// [stringLiteralCheckedInIf01.js]
+function f(foo) {
+    if (foo === "a") {
+        return foo;
+    }
+    else if (foo === "b") {
+        return foo;
+    }
+    else {
+        return foo[0];
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.symbols b/tests/baselines/reference/stringLiteralCheckedInIf01.symbols
new file mode 100644
index 00000000000..1b4d5e6b071
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralCheckedInIf01.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts ===
+
+type S = "a" | "b";
+>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0))
+
+type T = S[] | S;
+>T : Symbol(T, Decl(stringLiteralCheckedInIf01.ts, 1, 19))
+>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0))
+>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0))
+
+function f(foo: T) {
+>f : Symbol(f, Decl(stringLiteralCheckedInIf01.ts, 2, 17))
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11))
+>T : Symbol(T, Decl(stringLiteralCheckedInIf01.ts, 1, 19))
+
+    if (foo === "a") {
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11))
+
+        return foo;
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11))
+    }
+    else if (foo === "b") {
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11))
+
+        return foo;
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11))
+    }
+    else { 
+        return (foo as S[])[0];
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11))
+>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.types b/tests/baselines/reference/stringLiteralCheckedInIf01.types
new file mode 100644
index 00000000000..75b7eadbc19
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralCheckedInIf01.types
@@ -0,0 +1,41 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts ===
+
+type S = "a" | "b";
+>S : "a" | "b"
+
+type T = S[] | S;
+>T : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+>S : "a" | "b"
+
+function f(foo: T) {
+>f : (foo: ("a" | "b")[] | "a" | "b") => ("a" | "b")[] | "a" | "b"
+>foo : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+
+    if (foo === "a") {
+>foo === "a" : boolean
+>foo : ("a" | "b")[] | "a" | "b"
+>"a" : string
+
+        return foo;
+>foo : ("a" | "b")[] | "a" | "b"
+    }
+    else if (foo === "b") {
+>foo === "b" : boolean
+>foo : ("a" | "b")[] | "a" | "b"
+>"b" : string
+
+        return foo;
+>foo : ("a" | "b")[] | "a" | "b"
+    }
+    else { 
+        return (foo as S[])[0];
+>(foo as S[])[0] : "a" | "b"
+>(foo as S[]) : ("a" | "b")[]
+>foo as S[] : ("a" | "b")[]
+>foo : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+>0 : number
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.js b/tests/baselines/reference/stringLiteralCheckedInIf02.js
new file mode 100644
index 00000000000..22bd6359f61
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralCheckedInIf02.js
@@ -0,0 +1,30 @@
+//// [stringLiteralCheckedInIf02.ts]
+
+type S = "a" | "b";
+type T = S[] | S;
+
+function isS(t: T): t is S {
+    return t === "a" || t === "b";
+}
+
+function f(foo: T) {
+    if (isS(foo)) {
+        return foo;
+    }
+    else { 
+        return foo[0];
+    }
+}
+
+//// [stringLiteralCheckedInIf02.js]
+function isS(t) {
+    return t === "a" || t === "b";
+}
+function f(foo) {
+    if (isS(foo)) {
+        return foo;
+    }
+    else {
+        return foo[0];
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.symbols b/tests/baselines/reference/stringLiteralCheckedInIf02.symbols
new file mode 100644
index 00000000000..629f990b912
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralCheckedInIf02.symbols
@@ -0,0 +1,39 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts ===
+
+type S = "a" | "b";
+>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0))
+
+type T = S[] | S;
+>T : Symbol(T, Decl(stringLiteralCheckedInIf02.ts, 1, 19))
+>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0))
+>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0))
+
+function isS(t: T): t is S {
+>isS : Symbol(isS, Decl(stringLiteralCheckedInIf02.ts, 2, 17))
+>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13))
+>T : Symbol(T, Decl(stringLiteralCheckedInIf02.ts, 1, 19))
+>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13))
+>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0))
+
+    return t === "a" || t === "b";
+>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13))
+>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13))
+}
+
+function f(foo: T) {
+>f : Symbol(f, Decl(stringLiteralCheckedInIf02.ts, 6, 1))
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11))
+>T : Symbol(T, Decl(stringLiteralCheckedInIf02.ts, 1, 19))
+
+    if (isS(foo)) {
+>isS : Symbol(isS, Decl(stringLiteralCheckedInIf02.ts, 2, 17))
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11))
+
+        return foo;
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11))
+    }
+    else { 
+        return foo[0];
+>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11))
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.types b/tests/baselines/reference/stringLiteralCheckedInIf02.types
new file mode 100644
index 00000000000..79f4c6a223a
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralCheckedInIf02.types
@@ -0,0 +1,47 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts ===
+
+type S = "a" | "b";
+>S : "a" | "b"
+
+type T = S[] | S;
+>T : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+>S : "a" | "b"
+
+function isS(t: T): t is S {
+>isS : (t: ("a" | "b")[] | "a" | "b") => t is "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+>t : any
+>S : "a" | "b"
+
+    return t === "a" || t === "b";
+>t === "a" || t === "b" : boolean
+>t === "a" : boolean
+>t : ("a" | "b")[] | "a" | "b"
+>"a" : string
+>t === "b" : boolean
+>t : ("a" | "b")[] | "a" | "b"
+>"b" : string
+}
+
+function f(foo: T) {
+>f : (foo: ("a" | "b")[] | "a" | "b") => "a" | "b"
+>foo : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+
+    if (isS(foo)) {
+>isS(foo) : boolean
+>isS : (t: ("a" | "b")[] | "a" | "b") => t is "a" | "b"
+>foo : ("a" | "b")[] | "a" | "b"
+
+        return foo;
+>foo : "a" | "b"
+    }
+    else { 
+        return foo[0];
+>foo[0] : "a" | "b"
+>foo : ("a" | "b")[]
+>0 : number
+    }
+}
diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.js b/tests/baselines/reference/stringLiteralMatchedInSwitch01.js
new file mode 100644
index 00000000000..b9b24cf0c66
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.js
@@ -0,0 +1,25 @@
+//// [stringLiteralMatchedInSwitch01.ts]
+
+type S = "a" | "b";
+type T = S[] | S;
+
+var foo: T;
+switch (foo) {
+    case "a":
+    case "b":
+        break;
+    default:
+        foo = (foo as S[])[0];
+        break;
+}
+
+//// [stringLiteralMatchedInSwitch01.js]
+var foo;
+switch (foo) {
+    case "a":
+    case "b":
+        break;
+    default:
+        foo = foo[0];
+        break;
+}
diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols b/tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols
new file mode 100644
index 00000000000..0323371c307
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts ===
+
+type S = "a" | "b";
+>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0))
+
+type T = S[] | S;
+>T : Symbol(T, Decl(stringLiteralMatchedInSwitch01.ts, 1, 19))
+>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0))
+>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0))
+
+var foo: T;
+>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3))
+>T : Symbol(T, Decl(stringLiteralMatchedInSwitch01.ts, 1, 19))
+
+switch (foo) {
+>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3))
+
+    case "a":
+    case "b":
+        break;
+    default:
+        foo = (foo as S[])[0];
+>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3))
+>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3))
+>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0))
+
+        break;
+}
diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.types b/tests/baselines/reference/stringLiteralMatchedInSwitch01.types
new file mode 100644
index 00000000000..cfbb77e07e0
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.types
@@ -0,0 +1,37 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts ===
+
+type S = "a" | "b";
+>S : "a" | "b"
+
+type T = S[] | S;
+>T : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+>S : "a" | "b"
+
+var foo: T;
+>foo : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+
+switch (foo) {
+>foo : ("a" | "b")[] | "a" | "b"
+
+    case "a":
+>"a" : string
+
+    case "b":
+>"b" : string
+
+        break;
+    default:
+        foo = (foo as S[])[0];
+>foo = (foo as S[])[0] : "a" | "b"
+>foo : ("a" | "b")[] | "a" | "b"
+>(foo as S[])[0] : "a" | "b"
+>(foo as S[]) : ("a" | "b")[]
+>foo as S[] : ("a" | "b")[]
+>foo : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+>0 : number
+
+        break;
+}
diff --git a/tests/baselines/reference/stringLiteralType.errors.txt b/tests/baselines/reference/stringLiteralType.errors.txt
deleted file mode 100644
index 275db139cf7..00000000000
--- a/tests/baselines/reference/stringLiteralType.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts(1,8): error TS1110: Type expected.
-
-
-==== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts (1 errors) ====
-    var x: 'hi';
-           ~~~~
-!!! error TS1110: Type expected.
-    
-    function f(x: 'hi');
-    function f(x: string);
-    function f(x: any) {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralType.js b/tests/baselines/reference/stringLiteralType.js
index 35f35f1cbef..a6926453c47 100644
--- a/tests/baselines/reference/stringLiteralType.js
+++ b/tests/baselines/reference/stringLiteralType.js
@@ -7,6 +7,6 @@ function f(x: any) {
 }
 
 //// [stringLiteralType.js]
-var x = 'hi';
+var x;
 function f(x) {
 }
diff --git a/tests/baselines/reference/stringLiteralType.symbols b/tests/baselines/reference/stringLiteralType.symbols
new file mode 100644
index 00000000000..687d3052442
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralType.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts ===
+var x: 'hi';
+>x : Symbol(x, Decl(stringLiteralType.ts, 0, 3))
+
+function f(x: 'hi');
+>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22))
+>x : Symbol(x, Decl(stringLiteralType.ts, 2, 11))
+
+function f(x: string);
+>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22))
+>x : Symbol(x, Decl(stringLiteralType.ts, 3, 11))
+
+function f(x: any) {
+>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22))
+>x : Symbol(x, Decl(stringLiteralType.ts, 4, 11))
+}
diff --git a/tests/baselines/reference/stringLiteralType.types b/tests/baselines/reference/stringLiteralType.types
new file mode 100644
index 00000000000..affa995c2f3
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralType.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts ===
+var x: 'hi';
+>x : "hi"
+
+function f(x: 'hi');
+>f : { (x: "hi"): any; (x: string): any; }
+>x : "hi"
+
+function f(x: string);
+>f : { (x: "hi"): any; (x: string): any; }
+>x : string
+
+function f(x: any) {
+>f : { (x: "hi"): any; (x: string): any; }
+>x : any
+}
diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.js b/tests/baselines/reference/stringLiteralTypeAssertion01.js
new file mode 100644
index 00000000000..7877004cf01
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypeAssertion01.js
@@ -0,0 +1,53 @@
+//// [stringLiteralTypeAssertion01.ts]
+
+type S = "a" | "b";
+type T = S[] | S;
+
+var s: S;
+var t: T;
+var str: string;
+
+////////////////
+
+s = <S>t;
+s = t as S;
+
+s = <S>str;
+s = str as S;
+
+////////////////
+
+t = <T>s;
+t = s as T;
+
+t = <T>str;
+t = str as T;
+
+////////////////
+
+str = <string>s;
+str = s as string;
+
+str = <string>t;
+str = t as string;
+
+
+//// [stringLiteralTypeAssertion01.js]
+var s;
+var t;
+var str;
+////////////////
+s = t;
+s = t;
+s = str;
+s = str;
+////////////////
+t = s;
+t = s;
+t = str;
+t = str;
+////////////////
+str = s;
+str = s;
+str = t;
+str = t;
diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.symbols b/tests/baselines/reference/stringLiteralTypeAssertion01.symbols
new file mode 100644
index 00000000000..1491a32b6f8
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypeAssertion01.symbols
@@ -0,0 +1,83 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts ===
+
+type S = "a" | "b";
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+
+type T = S[] | S;
+>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+
+var s: S;
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+
+var t: T;
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19))
+
+var str: string;
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+
+////////////////
+
+s = <S>t;
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+
+s = t as S;
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+
+s = <S>str;
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+
+s = str as S;
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0))
+
+////////////////
+
+t = <T>s;
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19))
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+
+t = s as T;
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19))
+
+t = <T>str;
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19))
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+
+t = str as T;
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19))
+
+////////////////
+
+str = <string>s;
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+
+str = s as string;
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3))
+
+str = <string>t;
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+
+str = t as string;
+>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3))
+>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.types b/tests/baselines/reference/stringLiteralTypeAssertion01.types
new file mode 100644
index 00000000000..f70313f8347
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypeAssertion01.types
@@ -0,0 +1,107 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts ===
+
+type S = "a" | "b";
+>S : "a" | "b"
+
+type T = S[] | S;
+>T : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+>S : "a" | "b"
+
+var s: S;
+>s : "a" | "b"
+>S : "a" | "b"
+
+var t: T;
+>t : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+
+var str: string;
+>str : string
+
+////////////////
+
+s = <S>t;
+>s = <S>t : "a" | "b"
+>s : "a" | "b"
+><S>t : "a" | "b"
+>S : "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+
+s = t as S;
+>s = t as S : "a" | "b"
+>s : "a" | "b"
+>t as S : "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+>S : "a" | "b"
+
+s = <S>str;
+>s = <S>str : "a" | "b"
+>s : "a" | "b"
+><S>str : "a" | "b"
+>S : "a" | "b"
+>str : string
+
+s = str as S;
+>s = str as S : "a" | "b"
+>s : "a" | "b"
+>str as S : "a" | "b"
+>str : string
+>S : "a" | "b"
+
+////////////////
+
+t = <T>s;
+>t = <T>s : ("a" | "b")[] | "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+><T>s : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+>s : "a" | "b"
+
+t = s as T;
+>t = s as T : ("a" | "b")[] | "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+>s as T : ("a" | "b")[] | "a" | "b"
+>s : "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+
+t = <T>str;
+>t = <T>str : ("a" | "b")[] | "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+><T>str : ("a" | "b")[] | "a" | "b"
+>T : ("a" | "b")[] | "a" | "b"
+>str : string
+
+t = str as T;
+>t = str as T : ("a" | "b")[] | "a" | "b"
+>t : ("a" | "b")[] | "a" | "b"
+>str as T : ("a" | "b")[] | "a" | "b"
+>str : string
+>T : ("a" | "b")[] | "a" | "b"
+
+////////////////
+
+str = <string>s;
+>str = <string>s : string
+>str : string
+><string>s : string
+>s : "a" | "b"
+
+str = s as string;
+>str = s as string : string
+>str : string
+>s as string : string
+>s : "a" | "b"
+
+str = <string>t;
+>str = <string>t : string
+>str : string
+><string>t : string
+>t : ("a" | "b")[] | "a" | "b"
+
+str = t as string;
+>str = t as string : string
+>str : string
+>t as string : string
+>t : ("a" | "b")[] | "a" | "b"
+
diff --git a/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js
new file mode 100644
index 00000000000..479256b18b7
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js
@@ -0,0 +1,26 @@
+//// [stringLiteralTypesAndLogicalOrExpressions01.ts]
+
+declare function myRandBool(): boolean;
+
+let a: "foo" = "foo";
+let b = a || "foo";
+let c: "foo" = b;
+let d = b || "bar";
+let e: "foo" | "bar" = d;
+
+
+//// [stringLiteralTypesAndLogicalOrExpressions01.js]
+var a = "foo";
+var b = a || "foo";
+var c = b;
+var d = b || "bar";
+var e = d;
+
+
+//// [stringLiteralTypesAndLogicalOrExpressions01.d.ts]
+declare function myRandBool(): boolean;
+declare let a: "foo";
+declare let b: "foo";
+declare let c: "foo";
+declare let d: "foo" | "bar";
+declare let e: "foo" | "bar";
diff --git a/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols
new file mode 100644
index 00000000000..2a9f28e85a5
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols
@@ -0,0 +1,24 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts ===
+
+declare function myRandBool(): boolean;
+>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 0, 0))
+
+let a: "foo" = "foo";
+>a : Symbol(a, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 3, 3))
+
+let b = a || "foo";
+>b : Symbol(b, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 4, 3))
+>a : Symbol(a, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 3, 3))
+
+let c: "foo" = b;
+>c : Symbol(c, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 5, 3))
+>b : Symbol(b, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 4, 3))
+
+let d = b || "bar";
+>d : Symbol(d, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 6, 3))
+>b : Symbol(b, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 4, 3))
+
+let e: "foo" | "bar" = d;
+>e : Symbol(e, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 7, 3))
+>d : Symbol(d, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 6, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types
new file mode 100644
index 00000000000..ddc79b81857
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts ===
+
+declare function myRandBool(): boolean;
+>myRandBool : () => boolean
+
+let a: "foo" = "foo";
+>a : "foo"
+>"foo" : "foo"
+
+let b = a || "foo";
+>b : "foo"
+>a || "foo" : "foo"
+>a : "foo"
+>"foo" : "foo"
+
+let c: "foo" = b;
+>c : "foo"
+>b : "foo"
+
+let d = b || "bar";
+>d : "foo" | "bar"
+>b || "bar" : "foo" | "bar"
+>b : "foo"
+>"bar" : "bar"
+
+let e: "foo" | "bar" = d;
+>e : "foo" | "bar"
+>d : "foo" | "bar"
+
diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js
new file mode 100644
index 00000000000..1fe1225c6f4
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js
@@ -0,0 +1,23 @@
+//// [stringLiteralTypesAndParenthesizedExpressions01.ts]
+
+declare function myRandBool(): boolean;
+
+let a: "foo" = ("foo");
+let b: "foo" | "bar" = ("foo");
+let c: "foo" = (myRandBool ? "foo" : ("foo"));
+let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar"));
+
+
+//// [stringLiteralTypesAndParenthesizedExpressions01.js]
+var a = ("foo");
+var b = ("foo");
+var c = (myRandBool ? "foo" : ("foo"));
+var d = (myRandBool ? "foo" : ("bar"));
+
+
+//// [stringLiteralTypesAndParenthesizedExpressions01.d.ts]
+declare function myRandBool(): boolean;
+declare let a: "foo";
+declare let b: "foo" | "bar";
+declare let c: "foo";
+declare let d: "foo" | "bar";
diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols
new file mode 100644
index 00000000000..2206a5185c1
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts ===
+
+declare function myRandBool(): boolean;
+>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 0, 0))
+
+let a: "foo" = ("foo");
+>a : Symbol(a, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 3, 3))
+
+let b: "foo" | "bar" = ("foo");
+>b : Symbol(b, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 4, 3))
+
+let c: "foo" = (myRandBool ? "foo" : ("foo"));
+>c : Symbol(c, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 5, 3))
+>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 0, 0))
+
+let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar"));
+>d : Symbol(d, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 6, 3))
+>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 0, 0))
+
diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types
new file mode 100644
index 00000000000..0bb2e1dd3c7
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts ===
+
+declare function myRandBool(): boolean;
+>myRandBool : () => boolean
+
+let a: "foo" = ("foo");
+>a : "foo"
+>("foo") : "foo"
+>"foo" : "foo"
+
+let b: "foo" | "bar" = ("foo");
+>b : "foo" | "bar"
+>("foo") : "foo"
+>"foo" : "foo"
+
+let c: "foo" = (myRandBool ? "foo" : ("foo"));
+>c : "foo"
+>(myRandBool ? "foo" : ("foo")) : "foo"
+>myRandBool ? "foo" : ("foo") : "foo"
+>myRandBool : () => boolean
+>"foo" : "foo"
+>("foo") : "foo"
+>"foo" : "foo"
+
+let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar"));
+>d : "foo" | "bar"
+>(myRandBool ? "foo" : ("bar")) : "foo" | "bar"
+>myRandBool ? "foo" : ("bar") : "foo" | "bar"
+>myRandBool : () => boolean
+>"foo" : "foo"
+>("bar") : "bar"
+>"bar" : "bar"
+
diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.js b/tests/baselines/reference/stringLiteralTypesAndTuples01.js
new file mode 100644
index 00000000000..ae02d12429a
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.js
@@ -0,0 +1,42 @@
+//// [stringLiteralTypesAndTuples01.ts]
+
+// Should all be strings.
+let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"];
+
+type RexOrRaptor = "t-rex" | "raptor"
+let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex'];
+
+rawr(dinosaur);
+
+function rawr(dino: RexOrRaptor) {
+    if (dino === "t-rex") {
+        return "ROAAAAR!";
+    }
+    if (dino === "raptor") {
+        return "yip yip!";
+    }
+
+    throw "Unexpected " + dino;
+}
+
+//// [stringLiteralTypesAndTuples01.js]
+// Should all be strings.
+var _a = ["Hello", "Brave", "New", "World"], hello = _a[0], brave = _a[1], newish = _a[2], world = _a[3];
+var _b = ['I\'m', 'a', 't-rex'], im = _b[0], a = _b[1], dinosaur = _b[2];
+rawr(dinosaur);
+function rawr(dino) {
+    if (dino === "t-rex") {
+        return "ROAAAAR!";
+    }
+    if (dino === "raptor") {
+        return "yip yip!";
+    }
+    throw "Unexpected " + dino;
+}
+
+
+//// [stringLiteralTypesAndTuples01.d.ts]
+declare let hello: string, brave: string, newish: string, world: string;
+declare type RexOrRaptor = "t-rex" | "raptor";
+declare let im: "I'm", a: "a", dinosaur: "t-rex" | "raptor";
+declare function rawr(dino: RexOrRaptor): string;
diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.symbols b/tests/baselines/reference/stringLiteralTypesAndTuples01.symbols
new file mode 100644
index 00000000000..b7ca53517ca
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.symbols
@@ -0,0 +1,41 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts ===
+
+// Should all be strings.
+let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"];
+>hello : Symbol(hello, Decl(stringLiteralTypesAndTuples01.ts, 2, 5))
+>brave : Symbol(brave, Decl(stringLiteralTypesAndTuples01.ts, 2, 11))
+>newish : Symbol(newish, Decl(stringLiteralTypesAndTuples01.ts, 2, 18))
+>world : Symbol(world, Decl(stringLiteralTypesAndTuples01.ts, 2, 26))
+
+type RexOrRaptor = "t-rex" | "raptor"
+>RexOrRaptor : Symbol(RexOrRaptor, Decl(stringLiteralTypesAndTuples01.ts, 2, 71))
+
+let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex'];
+>im : Symbol(im, Decl(stringLiteralTypesAndTuples01.ts, 5, 5))
+>a : Symbol(a, Decl(stringLiteralTypesAndTuples01.ts, 5, 8))
+>dinosaur : Symbol(dinosaur, Decl(stringLiteralTypesAndTuples01.ts, 5, 11))
+>RexOrRaptor : Symbol(RexOrRaptor, Decl(stringLiteralTypesAndTuples01.ts, 2, 71))
+
+rawr(dinosaur);
+>rawr : Symbol(rawr, Decl(stringLiteralTypesAndTuples01.ts, 7, 15))
+>dinosaur : Symbol(dinosaur, Decl(stringLiteralTypesAndTuples01.ts, 5, 11))
+
+function rawr(dino: RexOrRaptor) {
+>rawr : Symbol(rawr, Decl(stringLiteralTypesAndTuples01.ts, 7, 15))
+>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14))
+>RexOrRaptor : Symbol(RexOrRaptor, Decl(stringLiteralTypesAndTuples01.ts, 2, 71))
+
+    if (dino === "t-rex") {
+>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14))
+
+        return "ROAAAAR!";
+    }
+    if (dino === "raptor") {
+>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14))
+
+        return "yip yip!";
+    }
+
+    throw "Unexpected " + dino;
+>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14))
+}
diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.types b/tests/baselines/reference/stringLiteralTypesAndTuples01.types
new file mode 100644
index 00000000000..c874973e3e5
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.types
@@ -0,0 +1,59 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts ===
+
+// Should all be strings.
+let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"];
+>hello : string
+>brave : string
+>newish : string
+>world : string
+>["Hello", "Brave", "New", "World"] : [string, string, string, string]
+>"Hello" : string
+>"Brave" : string
+>"New" : string
+>"World" : string
+
+type RexOrRaptor = "t-rex" | "raptor"
+>RexOrRaptor : "t-rex" | "raptor"
+
+let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex'];
+>im : "I'm"
+>a : "a"
+>dinosaur : "t-rex" | "raptor"
+>RexOrRaptor : "t-rex" | "raptor"
+>['I\'m', 'a', 't-rex'] : ["I'm", "a", "t-rex"]
+>'I\'m' : "I'm"
+>'a' : "a"
+>'t-rex' : "t-rex"
+
+rawr(dinosaur);
+>rawr(dinosaur) : string
+>rawr : (dino: "t-rex" | "raptor") => string
+>dinosaur : "t-rex" | "raptor"
+
+function rawr(dino: RexOrRaptor) {
+>rawr : (dino: "t-rex" | "raptor") => string
+>dino : "t-rex" | "raptor"
+>RexOrRaptor : "t-rex" | "raptor"
+
+    if (dino === "t-rex") {
+>dino === "t-rex" : boolean
+>dino : "t-rex" | "raptor"
+>"t-rex" : string
+
+        return "ROAAAAR!";
+>"ROAAAAR!" : string
+    }
+    if (dino === "raptor") {
+>dino === "raptor" : boolean
+>dino : "t-rex" | "raptor"
+>"raptor" : string
+
+        return "yip yip!";
+>"yip yip!" : string
+    }
+
+    throw "Unexpected " + dino;
+>"Unexpected " + dino : string
+>"Unexpected " : string
+>dino : "t-rex" | "raptor"
+}
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt
new file mode 100644
index 00000000000..6e4f8943fb6
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt
@@ -0,0 +1,57 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (4 errors) ====
+    
+    type Kind = "A" | "B"
+    
+    interface Entity {
+        kind: Kind;
+    }
+    
+    interface A extends Entity {
+        kind: "A";
+        a: number;
+    }
+    
+    interface B extends Entity {
+        kind: "B";
+        b: string;
+    }
+    
+    function hasKind(entity: Entity, kind: "A"): entity is A;
+             ~~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    function hasKind(entity: Entity, kind: "B"): entity is B;
+             ~~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    function hasKind(entity: Entity, kind: Kind): entity is Entity;
+             ~~~~~~~
+!!! error TS2394: Overload signature is not compatible with function implementation.
+    function hasKind(entity: Entity, kind: Kind): boolean {
+        return kind === is;
+                        ~~
+!!! error TS2304: Cannot find name 'is'.
+    }
+    
+    let x: A = {
+        kind: "A",
+        a: 100,
+    }
+    
+    if (hasKind(x, "A")) {
+        let a = x;
+    }
+    else {
+        let b = x;
+    }
+    
+    if (!hasKind(x, "B")) {
+        let c = x;
+    }
+    else {
+        let d = x;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.js b/tests/baselines/reference/stringLiteralTypesAsTags01.js
new file mode 100644
index 00000000000..3fe33ace487
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.js
@@ -0,0 +1,83 @@
+//// [stringLiteralTypesAsTags01.ts]
+
+type Kind = "A" | "B"
+
+interface Entity {
+    kind: Kind;
+}
+
+interface A extends Entity {
+    kind: "A";
+    a: number;
+}
+
+interface B extends Entity {
+    kind: "B";
+    b: string;
+}
+
+function hasKind(entity: Entity, kind: "A"): entity is A;
+function hasKind(entity: Entity, kind: "B"): entity is B;
+function hasKind(entity: Entity, kind: Kind): entity is Entity;
+function hasKind(entity: Entity, kind: Kind): boolean {
+    return kind === is;
+}
+
+let x: A = {
+    kind: "A",
+    a: 100,
+}
+
+if (hasKind(x, "A")) {
+    let a = x;
+}
+else {
+    let b = x;
+}
+
+if (!hasKind(x, "B")) {
+    let c = x;
+}
+else {
+    let d = x;
+}
+
+//// [stringLiteralTypesAsTags01.js]
+function hasKind(entity, kind) {
+    return kind === is;
+}
+var x = {
+    kind: "A",
+    a: 100
+};
+if (hasKind(x, "A")) {
+    var a = x;
+}
+else {
+    var b = x;
+}
+if (!hasKind(x, "B")) {
+    var c = x;
+}
+else {
+    var d = x;
+}
+
+
+//// [stringLiteralTypesAsTags01.d.ts]
+declare type Kind = "A" | "B";
+interface Entity {
+    kind: Kind;
+}
+interface A extends Entity {
+    kind: "A";
+    a: number;
+}
+interface B extends Entity {
+    kind: "B";
+    b: string;
+}
+declare function hasKind(entity: Entity, kind: "A"): entity is A;
+declare function hasKind(entity: Entity, kind: "B"): entity is B;
+declare function hasKind(entity: Entity, kind: Kind): entity is Entity;
+declare let x: A;
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js
new file mode 100644
index 00000000000..558f6bdf4c2
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js
@@ -0,0 +1,68 @@
+//// [stringLiteralTypesAsTypeParameterConstraint01.ts]
+
+function foo<T extends "foo">(f: (x: T) => T) {
+    return f;
+}
+
+function bar<T extends "foo" | "bar">(f: (x: T) => T) {
+    return f;
+}
+
+let f = foo(x => x);
+let fResult = f("foo");
+
+let g = foo((x => x));
+let gResult = g("foo");
+
+let h = bar(x => x);
+let hResult = h("foo");
+hResult = h("bar");
+
+//// [stringLiteralTypesAsTypeParameterConstraint01.js]
+function foo(f) {
+    return f;
+}
+function bar(f) {
+    return f;
+}
+var f = foo(function (x) { return x; });
+var fResult = f("foo");
+var g = foo((function (x) { return x; }));
+var gResult = g("foo");
+var h = bar(function (x) { return x; });
+var hResult = h("foo");
+hResult = h("bar");
+
+
+//// [stringLiteralTypesAsTypeParameterConstraint01.d.ts]
+declare function foo<T extends "foo">(f: (x: T) => T): (x: T) => T;
+declare function bar<T extends "foo" | "bar">(f: (x: T) => T): (x: T) => T;
+declare let f: (x: "foo") => "foo";
+declare let fResult: "foo";
+declare let g: (x: "foo") => "foo";
+declare let gResult: "foo";
+declare let h: (x: "foo" | "bar") => "foo" | "bar";
+declare let hResult: "foo" | "bar";
+
+
+//// [DtsFileErrors]
+
+
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts(3,16): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts(5,16): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts (2 errors) ====
+    declare function foo<T extends "foo">(f: (x: T) => T): (x: T) => T;
+    declare function bar<T extends "foo" | "bar">(f: (x: T) => T): (x: T) => T;
+    declare let f: (x: "foo") => "foo";
+                   ~~~~~~~~~~~~~~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    declare let fResult: "foo";
+    declare let g: (x: "foo") => "foo";
+                   ~~~~~~~~~~~~~~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    declare let gResult: "foo";
+    declare let h: (x: "foo" | "bar") => "foo" | "bar";
+    declare let hResult: "foo" | "bar";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols
new file mode 100644
index 00000000000..fd633b6e4d9
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols
@@ -0,0 +1,60 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts ===
+
+function foo<T extends "foo">(f: (x: T) => T) {
+>foo : Symbol(foo, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 0, 0))
+>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 13))
+>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 30))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 34))
+>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 13))
+>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 13))
+
+    return f;
+>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 30))
+}
+
+function bar<T extends "foo" | "bar">(f: (x: T) => T) {
+>bar : Symbol(bar, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 3, 1))
+>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 13))
+>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 38))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 42))
+>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 13))
+>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 13))
+
+    return f;
+>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 38))
+}
+
+let f = foo(x => x);
+>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 3))
+>foo : Symbol(foo, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 0, 0))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 12))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 12))
+
+let fResult = f("foo");
+>fResult : Symbol(fResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 10, 3))
+>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 3))
+
+let g = foo((x => x));
+>g : Symbol(g, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 3))
+>foo : Symbol(foo, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 0, 0))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 13))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 13))
+
+let gResult = g("foo");
+>gResult : Symbol(gResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 13, 3))
+>g : Symbol(g, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 3))
+
+let h = bar(x => x);
+>h : Symbol(h, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 3))
+>bar : Symbol(bar, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 3, 1))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 12))
+>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 12))
+
+let hResult = h("foo");
+>hResult : Symbol(hResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 16, 3))
+>h : Symbol(h, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 3))
+
+hResult = h("bar");
+>hResult : Symbol(hResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 16, 3))
+>h : Symbol(h, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types
new file mode 100644
index 00000000000..fe9163fc819
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types
@@ -0,0 +1,76 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts ===
+
+function foo<T extends "foo">(f: (x: T) => T) {
+>foo : <T extends "foo">(f: (x: T) => T) => (x: T) => T
+>T : T
+>f : (x: T) => T
+>x : T
+>T : T
+>T : T
+
+    return f;
+>f : (x: T) => T
+}
+
+function bar<T extends "foo" | "bar">(f: (x: T) => T) {
+>bar : <T extends "foo" | "bar">(f: (x: T) => T) => (x: T) => T
+>T : T
+>f : (x: T) => T
+>x : T
+>T : T
+>T : T
+
+    return f;
+>f : (x: T) => T
+}
+
+let f = foo(x => x);
+>f : (x: "foo") => "foo"
+>foo(x => x) : (x: "foo") => "foo"
+>foo : <T extends "foo">(f: (x: T) => T) => (x: T) => T
+>x => x : (x: "foo") => "foo"
+>x : "foo"
+>x : "foo"
+
+let fResult = f("foo");
+>fResult : "foo"
+>f("foo") : "foo"
+>f : (x: "foo") => "foo"
+>"foo" : "foo"
+
+let g = foo((x => x));
+>g : (x: "foo") => "foo"
+>foo((x => x)) : (x: "foo") => "foo"
+>foo : <T extends "foo">(f: (x: T) => T) => (x: T) => T
+>(x => x) : (x: "foo") => "foo"
+>x => x : (x: "foo") => "foo"
+>x : "foo"
+>x : "foo"
+
+let gResult = g("foo");
+>gResult : "foo"
+>g("foo") : "foo"
+>g : (x: "foo") => "foo"
+>"foo" : "foo"
+
+let h = bar(x => x);
+>h : (x: "foo" | "bar") => "foo" | "bar"
+>bar(x => x) : (x: "foo" | "bar") => "foo" | "bar"
+>bar : <T extends "foo" | "bar">(f: (x: T) => T) => (x: T) => T
+>x => x : (x: "foo" | "bar") => "foo" | "bar"
+>x : "foo" | "bar"
+>x : "foo" | "bar"
+
+let hResult = h("foo");
+>hResult : "foo" | "bar"
+>h("foo") : "foo" | "bar"
+>h : (x: "foo" | "bar") => "foo" | "bar"
+>"foo" : "foo"
+
+hResult = h("bar");
+>hResult = h("bar") : "foo" | "bar"
+>hResult : "foo" | "bar"
+>h("bar") : "foo" | "bar"
+>h : (x: "foo" | "bar") => "foo" | "bar"
+>"bar" : "bar"
+
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt
new file mode 100644
index 00000000000..ed6450ad329
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts(6,13): error TS2345: Argument of type '(y: "foo" | "bar") => string' is not assignable to parameter of type '(x: "foo") => "foo"'.
+  Type 'string' is not assignable to type '"foo"'.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts (1 errors) ====
+    
+    function foo<T extends "foo">(f: (x: T) => T) {
+        return f;
+    }
+    
+    let f = foo((y: "foo" | "bar") => y === "foo" ? y : "foo");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2345: Argument of type '(y: "foo" | "bar") => string' is not assignable to parameter of type '(x: "foo") => "foo"'.
+!!! error TS2345:   Type 'string' is not assignable to type '"foo"'.
+    let fResult = f("foo");
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js
new file mode 100644
index 00000000000..c024ac6bc43
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js
@@ -0,0 +1,21 @@
+//// [stringLiteralTypesAsTypeParameterConstraint02.ts]
+
+function foo<T extends "foo">(f: (x: T) => T) {
+    return f;
+}
+
+let f = foo((y: "foo" | "bar") => y === "foo" ? y : "foo");
+let fResult = f("foo");
+
+//// [stringLiteralTypesAsTypeParameterConstraint02.js]
+function foo(f) {
+    return f;
+}
+var f = foo(function (y) { return y === "foo" ? y : "foo"; });
+var fResult = f("foo");
+
+
+//// [stringLiteralTypesAsTypeParameterConstraint02.d.ts]
+declare function foo<T extends "foo">(f: (x: T) => T): (x: T) => T;
+declare let f: any;
+declare let fResult: any;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js
new file mode 100644
index 00000000000..d970310d68e
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js
@@ -0,0 +1,44 @@
+//// [stringLiteralTypesInUnionTypes01.ts]
+
+type T = "foo" | "bar" | "baz";
+
+var x: "foo" | "bar" | "baz" = "foo";
+var y: T = "bar";
+
+if (x === "foo") {
+    let a = x;
+}
+else if (x !== "bar") {
+    let b = x || y;
+}
+else {
+    let c = x;
+    let d = y;
+    let e: (typeof x) | (typeof y) = c || d;
+}
+
+x = y;
+y = x;
+
+//// [stringLiteralTypesInUnionTypes01.js]
+var x = "foo";
+var y = "bar";
+if (x === "foo") {
+    var a = x;
+}
+else if (x !== "bar") {
+    var b = x || y;
+}
+else {
+    var c = x;
+    var d = y;
+    var e = c || d;
+}
+x = y;
+y = x;
+
+
+//// [stringLiteralTypesInUnionTypes01.d.ts]
+declare type T = "foo" | "bar" | "baz";
+declare var x: "foo" | "bar" | "baz";
+declare var y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols
new file mode 100644
index 00000000000..c608929383e
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols
@@ -0,0 +1,52 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts ===
+
+type T = "foo" | "bar" | "baz";
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes01.ts, 0, 0))
+
+var x: "foo" | "bar" | "baz" = "foo";
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+
+var y: T = "bar";
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3))
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes01.ts, 0, 0))
+
+if (x === "foo") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+
+    let a = x;
+>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes01.ts, 7, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+}
+else if (x !== "bar") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+
+    let b = x || y;
+>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes01.ts, 10, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3))
+}
+else {
+    let c = x;
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes01.ts, 13, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+
+    let d = y;
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes01.ts, 14, 7))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3))
+
+    let e: (typeof x) | (typeof y) = c || d;
+>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes01.ts, 15, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3))
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes01.ts, 13, 7))
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes01.ts, 14, 7))
+}
+
+x = y;
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3))
+
+y = x;
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types
new file mode 100644
index 00000000000..e5ff509822b
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types
@@ -0,0 +1,62 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts ===
+
+type T = "foo" | "bar" | "baz";
+>T : "foo" | "bar" | "baz"
+
+var x: "foo" | "bar" | "baz" = "foo";
+>x : "foo" | "bar" | "baz"
+>"foo" : "foo"
+
+var y: T = "bar";
+>y : "foo" | "bar" | "baz"
+>T : "foo" | "bar" | "baz"
+>"bar" : "bar"
+
+if (x === "foo") {
+>x === "foo" : boolean
+>x : "foo" | "bar" | "baz"
+>"foo" : string
+
+    let a = x;
+>a : "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz"
+}
+else if (x !== "bar") {
+>x !== "bar" : boolean
+>x : "foo" | "bar" | "baz"
+>"bar" : string
+
+    let b = x || y;
+>b : "foo" | "bar" | "baz"
+>x || y : "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz"
+>y : "foo" | "bar" | "baz"
+}
+else {
+    let c = x;
+>c : "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz"
+
+    let d = y;
+>d : "foo" | "bar" | "baz"
+>y : "foo" | "bar" | "baz"
+
+    let e: (typeof x) | (typeof y) = c || d;
+>e : "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz"
+>y : "foo" | "bar" | "baz"
+>c || d : "foo" | "bar" | "baz"
+>c : "foo" | "bar" | "baz"
+>d : "foo" | "bar" | "baz"
+}
+
+x = y;
+>x = y : "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz"
+>y : "foo" | "bar" | "baz"
+
+y = x;
+>y = x : "foo" | "bar" | "baz"
+>y : "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz"
+
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js
new file mode 100644
index 00000000000..19b9c837c9d
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js
@@ -0,0 +1,44 @@
+//// [stringLiteralTypesInUnionTypes02.ts]
+
+type T = string | "foo" | "bar" | "baz";
+
+var x: "foo" | "bar" | "baz" | string = "foo";
+var y: T = "bar";
+
+if (x === "foo") {
+    let a = x;
+}
+else if (x !== "bar") {
+    let b = x || y;
+}
+else {
+    let c = x;
+    let d = y;
+    let e: (typeof x) | (typeof y) = c || d;
+}
+
+x = y;
+y = x;
+
+//// [stringLiteralTypesInUnionTypes02.js]
+var x = "foo";
+var y = "bar";
+if (x === "foo") {
+    var a = x;
+}
+else if (x !== "bar") {
+    var b = x || y;
+}
+else {
+    var c = x;
+    var d = y;
+    var e = c || d;
+}
+x = y;
+y = x;
+
+
+//// [stringLiteralTypesInUnionTypes02.d.ts]
+declare type T = string | "foo" | "bar" | "baz";
+declare var x: "foo" | "bar" | "baz" | string;
+declare var y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols
new file mode 100644
index 00000000000..c9b31dc710a
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols
@@ -0,0 +1,52 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts ===
+
+type T = string | "foo" | "bar" | "baz";
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes02.ts, 0, 0))
+
+var x: "foo" | "bar" | "baz" | string = "foo";
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+
+var y: T = "bar";
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3))
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes02.ts, 0, 0))
+
+if (x === "foo") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+
+    let a = x;
+>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes02.ts, 7, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+}
+else if (x !== "bar") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+
+    let b = x || y;
+>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes02.ts, 10, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3))
+}
+else {
+    let c = x;
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes02.ts, 13, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+
+    let d = y;
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes02.ts, 14, 7))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3))
+
+    let e: (typeof x) | (typeof y) = c || d;
+>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes02.ts, 15, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3))
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes02.ts, 13, 7))
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes02.ts, 14, 7))
+}
+
+x = y;
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3))
+
+y = x;
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types
new file mode 100644
index 00000000000..b468c620376
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types
@@ -0,0 +1,62 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts ===
+
+type T = string | "foo" | "bar" | "baz";
+>T : string | "foo" | "bar" | "baz"
+
+var x: "foo" | "bar" | "baz" | string = "foo";
+>x : "foo" | "bar" | "baz" | string
+>"foo" : "foo"
+
+var y: T = "bar";
+>y : string | "foo" | "bar" | "baz"
+>T : string | "foo" | "bar" | "baz"
+>"bar" : "bar"
+
+if (x === "foo") {
+>x === "foo" : boolean
+>x : "foo" | "bar" | "baz" | string
+>"foo" : string
+
+    let a = x;
+>a : "foo" | "bar" | "baz" | string
+>x : "foo" | "bar" | "baz" | string
+}
+else if (x !== "bar") {
+>x !== "bar" : boolean
+>x : "foo" | "bar" | "baz" | string
+>"bar" : string
+
+    let b = x || y;
+>b : string
+>x || y : string
+>x : "foo" | "bar" | "baz" | string
+>y : string | "foo" | "bar" | "baz"
+}
+else {
+    let c = x;
+>c : "foo" | "bar" | "baz" | string
+>x : "foo" | "bar" | "baz" | string
+
+    let d = y;
+>d : string | "foo" | "bar" | "baz"
+>y : string | "foo" | "bar" | "baz"
+
+    let e: (typeof x) | (typeof y) = c || d;
+>e : "foo" | "bar" | "baz" | string
+>x : "foo" | "bar" | "baz" | string
+>y : string | "foo" | "bar" | "baz"
+>c || d : string
+>c : "foo" | "bar" | "baz" | string
+>d : string | "foo" | "bar" | "baz"
+}
+
+x = y;
+>x = y : string | "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz" | string
+>y : string | "foo" | "bar" | "baz"
+
+y = x;
+>y = x : "foo" | "bar" | "baz" | string
+>y : string | "foo" | "bar" | "baz"
+>x : "foo" | "bar" | "baz" | string
+
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js
new file mode 100644
index 00000000000..f6728e0b2fb
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js
@@ -0,0 +1,44 @@
+//// [stringLiteralTypesInUnionTypes03.ts]
+
+type T = number | "foo" | "bar";
+
+var x: "foo" | "bar" | number;
+var y: T = "bar";
+
+if (x === "foo") {
+    let a = x;
+}
+else if (x !== "bar") {
+    let b = x || y;
+}
+else {
+    let c = x;
+    let d = y;
+    let e: (typeof x) | (typeof y) = c || d;
+}
+
+x = y;
+y = x;
+
+//// [stringLiteralTypesInUnionTypes03.js]
+var x;
+var y = "bar";
+if (x === "foo") {
+    var a = x;
+}
+else if (x !== "bar") {
+    var b = x || y;
+}
+else {
+    var c = x;
+    var d = y;
+    var e = c || d;
+}
+x = y;
+y = x;
+
+
+//// [stringLiteralTypesInUnionTypes03.d.ts]
+declare type T = number | "foo" | "bar";
+declare var x: "foo" | "bar" | number;
+declare var y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols
new file mode 100644
index 00000000000..df5498d9a59
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols
@@ -0,0 +1,52 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts ===
+
+type T = number | "foo" | "bar";
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes03.ts, 0, 0))
+
+var x: "foo" | "bar" | number;
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+
+var y: T = "bar";
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3))
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes03.ts, 0, 0))
+
+if (x === "foo") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+
+    let a = x;
+>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes03.ts, 7, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+}
+else if (x !== "bar") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+
+    let b = x || y;
+>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes03.ts, 10, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3))
+}
+else {
+    let c = x;
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes03.ts, 13, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+
+    let d = y;
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes03.ts, 14, 7))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3))
+
+    let e: (typeof x) | (typeof y) = c || d;
+>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes03.ts, 15, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3))
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes03.ts, 13, 7))
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes03.ts, 14, 7))
+}
+
+x = y;
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3))
+
+y = x;
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types
new file mode 100644
index 00000000000..5fca6e69be9
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types
@@ -0,0 +1,61 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts ===
+
+type T = number | "foo" | "bar";
+>T : number | "foo" | "bar"
+
+var x: "foo" | "bar" | number;
+>x : "foo" | "bar" | number
+
+var y: T = "bar";
+>y : number | "foo" | "bar"
+>T : number | "foo" | "bar"
+>"bar" : "bar"
+
+if (x === "foo") {
+>x === "foo" : boolean
+>x : "foo" | "bar" | number
+>"foo" : string
+
+    let a = x;
+>a : "foo" | "bar" | number
+>x : "foo" | "bar" | number
+}
+else if (x !== "bar") {
+>x !== "bar" : boolean
+>x : "foo" | "bar" | number
+>"bar" : string
+
+    let b = x || y;
+>b : "foo" | "bar" | number
+>x || y : "foo" | "bar" | number
+>x : "foo" | "bar" | number
+>y : number | "foo" | "bar"
+}
+else {
+    let c = x;
+>c : "foo" | "bar" | number
+>x : "foo" | "bar" | number
+
+    let d = y;
+>d : number | "foo" | "bar"
+>y : number | "foo" | "bar"
+
+    let e: (typeof x) | (typeof y) = c || d;
+>e : "foo" | "bar" | number
+>x : "foo" | "bar" | number
+>y : number | "foo" | "bar"
+>c || d : "foo" | "bar" | number
+>c : "foo" | "bar" | number
+>d : number | "foo" | "bar"
+}
+
+x = y;
+>x = y : number | "foo" | "bar"
+>x : "foo" | "bar" | number
+>y : number | "foo" | "bar"
+
+y = x;
+>y = x : "foo" | "bar" | number
+>y : number | "foo" | "bar"
+>x : "foo" | "bar" | number
+
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js
new file mode 100644
index 00000000000..dc6cf51ad1e
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js
@@ -0,0 +1,72 @@
+//// [stringLiteralTypesInUnionTypes04.ts]
+
+type T = "" | "foo";
+
+let x: T = "";
+let y: T = "foo";
+
+if (x === "") {
+    let a = x;
+}
+
+if (x !== "") {
+    let b = x;
+}
+
+if (x == "") {
+    let c = x;
+}
+
+if (x != "") {
+    let d = x;
+}
+
+if (x) {
+    let e = x;
+}
+
+if (!x) {
+    let f = x;
+}
+
+if (!!x) {
+    let g = x;
+}
+
+if (!!!x) {
+    let h = x;
+}
+
+//// [stringLiteralTypesInUnionTypes04.js]
+var x = "";
+var y = "foo";
+if (x === "") {
+    var a = x;
+}
+if (x !== "") {
+    var b = x;
+}
+if (x == "") {
+    var c = x;
+}
+if (x != "") {
+    var d = x;
+}
+if (x) {
+    var e = x;
+}
+if (!x) {
+    var f = x;
+}
+if (!!x) {
+    var g = x;
+}
+if (!!!x) {
+    var h = x;
+}
+
+
+//// [stringLiteralTypesInUnionTypes04.d.ts]
+declare type T = "" | "foo";
+declare let x: T;
+declare let y: T;
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols
new file mode 100644
index 00000000000..ced93fcefc9
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols
@@ -0,0 +1,76 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts ===
+
+type T = "" | "foo";
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes04.ts, 0, 0))
+
+let x: T = "";
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes04.ts, 0, 0))
+
+let y: T = "foo";
+>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes04.ts, 4, 3))
+>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes04.ts, 0, 0))
+
+if (x === "") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let a = x;
+>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes04.ts, 7, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (x !== "") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let b = x;
+>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes04.ts, 11, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (x == "") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let c = x;
+>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes04.ts, 15, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (x != "") {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let d = x;
+>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes04.ts, 19, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (x) {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let e = x;
+>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes04.ts, 23, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (!x) {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let f = x;
+>f : Symbol(f, Decl(stringLiteralTypesInUnionTypes04.ts, 27, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (!!x) {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let g = x;
+>g : Symbol(g, Decl(stringLiteralTypesInUnionTypes04.ts, 31, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
+
+if (!!!x) {
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+
+    let h = x;
+>h : Symbol(h, Decl(stringLiteralTypesInUnionTypes04.ts, 35, 7))
+>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3))
+}
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types
new file mode 100644
index 00000000000..ad92dc360d0
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types
@@ -0,0 +1,92 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts ===
+
+type T = "" | "foo";
+>T : "" | "foo"
+
+let x: T = "";
+>x : "" | "foo"
+>T : "" | "foo"
+>"" : ""
+
+let y: T = "foo";
+>y : "" | "foo"
+>T : "" | "foo"
+>"foo" : "foo"
+
+if (x === "") {
+>x === "" : boolean
+>x : "" | "foo"
+>"" : string
+
+    let a = x;
+>a : "" | "foo"
+>x : "" | "foo"
+}
+
+if (x !== "") {
+>x !== "" : boolean
+>x : "" | "foo"
+>"" : string
+
+    let b = x;
+>b : "" | "foo"
+>x : "" | "foo"
+}
+
+if (x == "") {
+>x == "" : boolean
+>x : "" | "foo"
+>"" : string
+
+    let c = x;
+>c : "" | "foo"
+>x : "" | "foo"
+}
+
+if (x != "") {
+>x != "" : boolean
+>x : "" | "foo"
+>"" : string
+
+    let d = x;
+>d : "" | "foo"
+>x : "" | "foo"
+}
+
+if (x) {
+>x : "" | "foo"
+
+    let e = x;
+>e : "" | "foo"
+>x : "" | "foo"
+}
+
+if (!x) {
+>!x : boolean
+>x : "" | "foo"
+
+    let f = x;
+>f : "" | "foo"
+>x : "" | "foo"
+}
+
+if (!!x) {
+>!!x : boolean
+>!x : boolean
+>x : "" | "foo"
+
+    let g = x;
+>g : "" | "foo"
+>x : "" | "foo"
+}
+
+if (!!!x) {
+>!!!x : boolean
+>!!x : boolean
+>!x : boolean
+>x : "" | "foo"
+
+    let h = x;
+>h : "" | "foo"
+>x : "" | "foo"
+}
diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt
new file mode 100644
index 00000000000..1a639a1c222
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,7): error TS1155: 'const' declarations must be initialized
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts (1 errors) ====
+    
+    let a: "";
+    var b: "foo";
+    let c: "bar";
+    const d: "baz";
+          ~
+!!! error TS1155: 'const' declarations must be initialized
+    
+    a = "";
+    b = "foo";
+    c = "bar";
+    
+    let e: "" = "";
+    var f: "foo" = "foo";
+    let g: "bar" = "bar";
+    const h: "baz" = "baz";
+    
+    e = "";
+    f = "foo";
+    g = "bar";
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js
new file mode 100644
index 00000000000..15a4ca5d580
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js
@@ -0,0 +1,46 @@
+//// [stringLiteralTypesInVariableDeclarations01.ts]
+
+let a: "";
+var b: "foo";
+let c: "bar";
+const d: "baz";
+
+a = "";
+b = "foo";
+c = "bar";
+
+let e: "" = "";
+var f: "foo" = "foo";
+let g: "bar" = "bar";
+const h: "baz" = "baz";
+
+e = "";
+f = "foo";
+g = "bar";
+
+//// [stringLiteralTypesInVariableDeclarations01.js]
+var a;
+var b;
+var c;
+var d;
+a = "";
+b = "foo";
+c = "bar";
+var e = "";
+var f = "foo";
+var g = "bar";
+var h = "baz";
+e = "";
+f = "foo";
+g = "bar";
+
+
+//// [stringLiteralTypesInVariableDeclarations01.d.ts]
+declare let a: "";
+declare var b: "foo";
+declare let c: "bar";
+declare const d: "baz";
+declare let e: "";
+declare var f: "foo";
+declare let g: "bar";
+declare const h: "baz";
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt
new file mode 100644
index 00000000000..1592427208b
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt
@@ -0,0 +1,59 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11,10): error TS2354: No best common type exists among return expressions.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (1 errors) ====
+    
+    type PrimitiveName = 'string' | 'number' | 'boolean';
+    
+    function getFalsyPrimitive(x: "string"): string;
+    function getFalsyPrimitive(x: "number"): number;
+    function getFalsyPrimitive(x: "boolean"): boolean;
+    function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+    function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+    function getFalsyPrimitive(x: "number" | "string"): number | string;
+    function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+    function getFalsyPrimitive(x: PrimitiveName) {
+             ~~~~~~~~~~~~~~~~~
+!!! error TS2354: No best common type exists among return expressions.
+        if (x === "string") {
+            return "";
+        }
+        if (x === "number") {
+            return 0;
+        }
+        if (x === "boolean") {
+            return false;
+        }
+    
+        // Should be unreachable.
+        throw "Invalid value";
+    }
+    
+    namespace Consts1 {
+        const EMPTY_STRING = getFalsyPrimitive("string");
+        const ZERO = getFalsyPrimitive('number');
+        const FALSE = getFalsyPrimitive("boolean");
+    }
+    
+    const string: "string" = "string"
+    const number: "number" = "number"
+    const boolean: "boolean" = "boolean"
+    
+    const stringOrNumber = string || number;
+    const stringOrBoolean = string || boolean;
+    const booleanOrNumber = number || boolean;
+    const stringOrBooleanOrNumber = stringOrBoolean || number;
+    
+    namespace Consts2 {
+        const EMPTY_STRING = getFalsyPrimitive(string);
+        const ZERO = getFalsyPrimitive(number);
+        const FALSE = getFalsyPrimitive(boolean);
+    
+        const a = getFalsyPrimitive(stringOrNumber);
+        const b = getFalsyPrimitive(stringOrBoolean);
+        const c = getFalsyPrimitive(booleanOrNumber);
+        const d = getFalsyPrimitive(stringOrBooleanOrNumber);
+    }
+    
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js
new file mode 100644
index 00000000000..73dabd26fab
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js
@@ -0,0 +1,114 @@
+//// [stringLiteralTypesOverloads01.ts]
+
+type PrimitiveName = 'string' | 'number' | 'boolean';
+
+function getFalsyPrimitive(x: "string"): string;
+function getFalsyPrimitive(x: "number"): number;
+function getFalsyPrimitive(x: "boolean"): boolean;
+function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+function getFalsyPrimitive(x: "number" | "string"): number | string;
+function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+function getFalsyPrimitive(x: PrimitiveName) {
+    if (x === "string") {
+        return "";
+    }
+    if (x === "number") {
+        return 0;
+    }
+    if (x === "boolean") {
+        return false;
+    }
+
+    // Should be unreachable.
+    throw "Invalid value";
+}
+
+namespace Consts1 {
+    const EMPTY_STRING = getFalsyPrimitive("string");
+    const ZERO = getFalsyPrimitive('number');
+    const FALSE = getFalsyPrimitive("boolean");
+}
+
+const string: "string" = "string"
+const number: "number" = "number"
+const boolean: "boolean" = "boolean"
+
+const stringOrNumber = string || number;
+const stringOrBoolean = string || boolean;
+const booleanOrNumber = number || boolean;
+const stringOrBooleanOrNumber = stringOrBoolean || number;
+
+namespace Consts2 {
+    const EMPTY_STRING = getFalsyPrimitive(string);
+    const ZERO = getFalsyPrimitive(number);
+    const FALSE = getFalsyPrimitive(boolean);
+
+    const a = getFalsyPrimitive(stringOrNumber);
+    const b = getFalsyPrimitive(stringOrBoolean);
+    const c = getFalsyPrimitive(booleanOrNumber);
+    const d = getFalsyPrimitive(stringOrBooleanOrNumber);
+}
+
+
+
+
+//// [stringLiteralTypesOverloads01.js]
+function getFalsyPrimitive(x) {
+    if (x === "string") {
+        return "";
+    }
+    if (x === "number") {
+        return 0;
+    }
+    if (x === "boolean") {
+        return false;
+    }
+    // Should be unreachable.
+    throw "Invalid value";
+}
+var Consts1;
+(function (Consts1) {
+    var EMPTY_STRING = getFalsyPrimitive("string");
+    var ZERO = getFalsyPrimitive('number');
+    var FALSE = getFalsyPrimitive("boolean");
+})(Consts1 || (Consts1 = {}));
+var string = "string";
+var number = "number";
+var boolean = "boolean";
+var stringOrNumber = string || number;
+var stringOrBoolean = string || boolean;
+var booleanOrNumber = number || boolean;
+var stringOrBooleanOrNumber = stringOrBoolean || number;
+var Consts2;
+(function (Consts2) {
+    var EMPTY_STRING = getFalsyPrimitive(string);
+    var ZERO = getFalsyPrimitive(number);
+    var FALSE = getFalsyPrimitive(boolean);
+    var a = getFalsyPrimitive(stringOrNumber);
+    var b = getFalsyPrimitive(stringOrBoolean);
+    var c = getFalsyPrimitive(booleanOrNumber);
+    var d = getFalsyPrimitive(stringOrBooleanOrNumber);
+})(Consts2 || (Consts2 = {}));
+
+
+//// [stringLiteralTypesOverloads01.d.ts]
+declare type PrimitiveName = 'string' | 'number' | 'boolean';
+declare function getFalsyPrimitive(x: "string"): string;
+declare function getFalsyPrimitive(x: "number"): number;
+declare function getFalsyPrimitive(x: "boolean"): boolean;
+declare function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+declare function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+declare function getFalsyPrimitive(x: "number" | "string"): number | string;
+declare function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+declare namespace Consts1 {
+}
+declare const string: "string";
+declare const number: "number";
+declare const boolean: "boolean";
+declare const stringOrNumber: "string" | "number";
+declare const stringOrBoolean: "string" | "boolean";
+declare const booleanOrNumber: "number" | "boolean";
+declare const stringOrBooleanOrNumber: "string" | "boolean" | "number";
+declare namespace Consts2 {
+}
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt
new file mode 100644
index 00000000000..995cf687b70
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt
@@ -0,0 +1,57 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(9,10): error TS2354: No best common type exists among return expressions.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts (1 errors) ====
+    
+    function getFalsyPrimitive(x: "string"): string;
+    function getFalsyPrimitive(x: "number"): number;
+    function getFalsyPrimitive(x: "boolean"): boolean;
+    function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+    function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+    function getFalsyPrimitive(x: "number" | "string"): number | string;
+    function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+    function getFalsyPrimitive(x: string) {
+             ~~~~~~~~~~~~~~~~~
+!!! error TS2354: No best common type exists among return expressions.
+        if (x === "string") {
+            return "";
+        }
+        if (x === "number") {
+            return 0;
+        }
+        if (x === "boolean") {
+            return false;
+        }
+    
+        // Should be unreachable.
+        throw "Invalid value";
+    }
+    
+    namespace Consts1 {
+        const EMPTY_STRING = getFalsyPrimitive("string");
+        const ZERO = getFalsyPrimitive('number');
+        const FALSE = getFalsyPrimitive("boolean");
+    }
+    
+    const string: "string" = "string"
+    const number: "number" = "number"
+    const boolean: "boolean" = "boolean"
+    
+    const stringOrNumber = string || number;
+    const stringOrBoolean = string || boolean;
+    const booleanOrNumber = number || boolean;
+    const stringOrBooleanOrNumber = stringOrBoolean || number;
+    
+    namespace Consts2 {
+        const EMPTY_STRING = getFalsyPrimitive(string);
+        const ZERO = getFalsyPrimitive(number);
+        const FALSE = getFalsyPrimitive(boolean);
+    
+        const a = getFalsyPrimitive(stringOrNumber);
+        const b = getFalsyPrimitive(stringOrBoolean);
+        const c = getFalsyPrimitive(booleanOrNumber);
+        const d = getFalsyPrimitive(stringOrBooleanOrNumber);
+    }
+    
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.js b/tests/baselines/reference/stringLiteralTypesOverloads02.js
new file mode 100644
index 00000000000..3c53f9380a8
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads02.js
@@ -0,0 +1,111 @@
+//// [stringLiteralTypesOverloads02.ts]
+
+function getFalsyPrimitive(x: "string"): string;
+function getFalsyPrimitive(x: "number"): number;
+function getFalsyPrimitive(x: "boolean"): boolean;
+function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+function getFalsyPrimitive(x: "number" | "string"): number | string;
+function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+function getFalsyPrimitive(x: string) {
+    if (x === "string") {
+        return "";
+    }
+    if (x === "number") {
+        return 0;
+    }
+    if (x === "boolean") {
+        return false;
+    }
+
+    // Should be unreachable.
+    throw "Invalid value";
+}
+
+namespace Consts1 {
+    const EMPTY_STRING = getFalsyPrimitive("string");
+    const ZERO = getFalsyPrimitive('number');
+    const FALSE = getFalsyPrimitive("boolean");
+}
+
+const string: "string" = "string"
+const number: "number" = "number"
+const boolean: "boolean" = "boolean"
+
+const stringOrNumber = string || number;
+const stringOrBoolean = string || boolean;
+const booleanOrNumber = number || boolean;
+const stringOrBooleanOrNumber = stringOrBoolean || number;
+
+namespace Consts2 {
+    const EMPTY_STRING = getFalsyPrimitive(string);
+    const ZERO = getFalsyPrimitive(number);
+    const FALSE = getFalsyPrimitive(boolean);
+
+    const a = getFalsyPrimitive(stringOrNumber);
+    const b = getFalsyPrimitive(stringOrBoolean);
+    const c = getFalsyPrimitive(booleanOrNumber);
+    const d = getFalsyPrimitive(stringOrBooleanOrNumber);
+}
+
+
+
+
+//// [stringLiteralTypesOverloads02.js]
+function getFalsyPrimitive(x) {
+    if (x === "string") {
+        return "";
+    }
+    if (x === "number") {
+        return 0;
+    }
+    if (x === "boolean") {
+        return false;
+    }
+    // Should be unreachable.
+    throw "Invalid value";
+}
+var Consts1;
+(function (Consts1) {
+    var EMPTY_STRING = getFalsyPrimitive("string");
+    var ZERO = getFalsyPrimitive('number');
+    var FALSE = getFalsyPrimitive("boolean");
+})(Consts1 || (Consts1 = {}));
+var string = "string";
+var number = "number";
+var boolean = "boolean";
+var stringOrNumber = string || number;
+var stringOrBoolean = string || boolean;
+var booleanOrNumber = number || boolean;
+var stringOrBooleanOrNumber = stringOrBoolean || number;
+var Consts2;
+(function (Consts2) {
+    var EMPTY_STRING = getFalsyPrimitive(string);
+    var ZERO = getFalsyPrimitive(number);
+    var FALSE = getFalsyPrimitive(boolean);
+    var a = getFalsyPrimitive(stringOrNumber);
+    var b = getFalsyPrimitive(stringOrBoolean);
+    var c = getFalsyPrimitive(booleanOrNumber);
+    var d = getFalsyPrimitive(stringOrBooleanOrNumber);
+})(Consts2 || (Consts2 = {}));
+
+
+//// [stringLiteralTypesOverloads02.d.ts]
+declare function getFalsyPrimitive(x: "string"): string;
+declare function getFalsyPrimitive(x: "number"): number;
+declare function getFalsyPrimitive(x: "boolean"): boolean;
+declare function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+declare function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+declare function getFalsyPrimitive(x: "number" | "string"): number | string;
+declare function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+declare namespace Consts1 {
+}
+declare const string: "string";
+declare const number: "number";
+declare const boolean: "boolean";
+declare const stringOrNumber: "string" | "number";
+declare const stringOrBoolean: "string" | "boolean";
+declare const booleanOrNumber: "number" | "boolean";
+declare const stringOrBooleanOrNumber: "string" | "boolean" | "number";
+declare namespace Consts2 {
+}
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.js b/tests/baselines/reference/stringLiteralTypesOverloads03.js
new file mode 100644
index 00000000000..c1e79160880
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.js
@@ -0,0 +1,104 @@
+//// [stringLiteralTypesOverloads03.ts]
+
+interface Base {
+    x: string;
+    y: number;
+}
+
+interface HelloOrWorld extends Base {
+    p1: boolean;
+}
+
+interface JustHello extends Base {
+    p2: boolean;
+}
+
+interface JustWorld extends Base {
+    p3: boolean;
+}
+
+let hello: "hello";
+let world: "world";
+let helloOrWorld: "hello" | "world";
+
+function f(p: "hello"): JustHello;
+function f(p: "hello" | "world"): HelloOrWorld;
+function f(p: "world"): JustWorld;
+function f(p: string): Base;
+function f(...args: any[]): any {
+    return undefined;
+}
+
+let fResult1 = f(hello);
+let fResult2 = f(world);
+let fResult3 = f(helloOrWorld);
+
+function g(p: string): Base;
+function g(p: "hello"): JustHello;
+function g(p: "hello" | "world"): HelloOrWorld;
+function g(p: "world"): JustWorld;
+function g(...args: any[]): any {
+    return undefined;
+}
+
+let gResult1 = g(hello);
+let gResult2 = g(world);
+let gResult3 = g(helloOrWorld);
+
+//// [stringLiteralTypesOverloads03.js]
+var hello;
+var world;
+var helloOrWorld;
+function f() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i - 0] = arguments[_i];
+    }
+    return undefined;
+}
+var fResult1 = f(hello);
+var fResult2 = f(world);
+var fResult3 = f(helloOrWorld);
+function g() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i - 0] = arguments[_i];
+    }
+    return undefined;
+}
+var gResult1 = g(hello);
+var gResult2 = g(world);
+var gResult3 = g(helloOrWorld);
+
+
+//// [stringLiteralTypesOverloads03.d.ts]
+interface Base {
+    x: string;
+    y: number;
+}
+interface HelloOrWorld extends Base {
+    p1: boolean;
+}
+interface JustHello extends Base {
+    p2: boolean;
+}
+interface JustWorld extends Base {
+    p3: boolean;
+}
+declare let hello: "hello";
+declare let world: "world";
+declare let helloOrWorld: "hello" | "world";
+declare function f(p: "hello"): JustHello;
+declare function f(p: "hello" | "world"): HelloOrWorld;
+declare function f(p: "world"): JustWorld;
+declare function f(p: string): Base;
+declare let fResult1: JustHello;
+declare let fResult2: JustWorld;
+declare let fResult3: HelloOrWorld;
+declare function g(p: string): Base;
+declare function g(p: "hello"): JustHello;
+declare function g(p: "hello" | "world"): HelloOrWorld;
+declare function g(p: "world"): JustWorld;
+declare let gResult1: JustHello;
+declare let gResult2: JustWorld;
+declare let gResult3: Base;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.symbols b/tests/baselines/reference/stringLiteralTypesOverloads03.symbols
new file mode 100644
index 00000000000..a0a48de790f
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.symbols
@@ -0,0 +1,131 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts ===
+
+interface Base {
+>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
+
+    x: string;
+>x : Symbol(x, Decl(stringLiteralTypesOverloads03.ts, 1, 16))
+
+    y: number;
+>y : Symbol(y, Decl(stringLiteralTypesOverloads03.ts, 2, 14))
+}
+
+interface HelloOrWorld extends Base {
+>HelloOrWorld : Symbol(HelloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 4, 1))
+>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
+
+    p1: boolean;
+>p1 : Symbol(p1, Decl(stringLiteralTypesOverloads03.ts, 6, 37))
+}
+
+interface JustHello extends Base {
+>JustHello : Symbol(JustHello, Decl(stringLiteralTypesOverloads03.ts, 8, 1))
+>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
+
+    p2: boolean;
+>p2 : Symbol(p2, Decl(stringLiteralTypesOverloads03.ts, 10, 34))
+}
+
+interface JustWorld extends Base {
+>JustWorld : Symbol(JustWorld, Decl(stringLiteralTypesOverloads03.ts, 12, 1))
+>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
+
+    p3: boolean;
+>p3 : Symbol(p3, Decl(stringLiteralTypesOverloads03.ts, 14, 34))
+}
+
+let hello: "hello";
+>hello : Symbol(hello, Decl(stringLiteralTypesOverloads03.ts, 18, 3))
+
+let world: "world";
+>world : Symbol(world, Decl(stringLiteralTypesOverloads03.ts, 19, 3))
+
+let helloOrWorld: "hello" | "world";
+>helloOrWorld : Symbol(helloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 20, 3))
+
+function f(p: "hello"): JustHello;
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 22, 11))
+>JustHello : Symbol(JustHello, Decl(stringLiteralTypesOverloads03.ts, 8, 1))
+
+function f(p: "hello" | "world"): HelloOrWorld;
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 23, 11))
+>HelloOrWorld : Symbol(HelloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 4, 1))
+
+function f(p: "world"): JustWorld;
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 24, 11))
+>JustWorld : Symbol(JustWorld, Decl(stringLiteralTypesOverloads03.ts, 12, 1))
+
+function f(p: string): Base;
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 25, 11))
+>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
+
+function f(...args: any[]): any {
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>args : Symbol(args, Decl(stringLiteralTypesOverloads03.ts, 26, 11))
+
+    return undefined;
+>undefined : Symbol(undefined)
+}
+
+let fResult1 = f(hello);
+>fResult1 : Symbol(fResult1, Decl(stringLiteralTypesOverloads03.ts, 30, 3))
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>hello : Symbol(hello, Decl(stringLiteralTypesOverloads03.ts, 18, 3))
+
+let fResult2 = f(world);
+>fResult2 : Symbol(fResult2, Decl(stringLiteralTypesOverloads03.ts, 31, 3))
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>world : Symbol(world, Decl(stringLiteralTypesOverloads03.ts, 19, 3))
+
+let fResult3 = f(helloOrWorld);
+>fResult3 : Symbol(fResult3, Decl(stringLiteralTypesOverloads03.ts, 32, 3))
+>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28))
+>helloOrWorld : Symbol(helloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 20, 3))
+
+function g(p: string): Base;
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 34, 11))
+>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
+
+function g(p: "hello"): JustHello;
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 35, 11))
+>JustHello : Symbol(JustHello, Decl(stringLiteralTypesOverloads03.ts, 8, 1))
+
+function g(p: "hello" | "world"): HelloOrWorld;
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 36, 11))
+>HelloOrWorld : Symbol(HelloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 4, 1))
+
+function g(p: "world"): JustWorld;
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 37, 11))
+>JustWorld : Symbol(JustWorld, Decl(stringLiteralTypesOverloads03.ts, 12, 1))
+
+function g(...args: any[]): any {
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>args : Symbol(args, Decl(stringLiteralTypesOverloads03.ts, 38, 11))
+
+    return undefined;
+>undefined : Symbol(undefined)
+}
+
+let gResult1 = g(hello);
+>gResult1 : Symbol(gResult1, Decl(stringLiteralTypesOverloads03.ts, 42, 3))
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>hello : Symbol(hello, Decl(stringLiteralTypesOverloads03.ts, 18, 3))
+
+let gResult2 = g(world);
+>gResult2 : Symbol(gResult2, Decl(stringLiteralTypesOverloads03.ts, 43, 3))
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>world : Symbol(world, Decl(stringLiteralTypesOverloads03.ts, 19, 3))
+
+let gResult3 = g(helloOrWorld);
+>gResult3 : Symbol(gResult3, Decl(stringLiteralTypesOverloads03.ts, 44, 3))
+>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34))
+>helloOrWorld : Symbol(helloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 20, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.types b/tests/baselines/reference/stringLiteralTypesOverloads03.types
new file mode 100644
index 00000000000..643979ee987
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.types
@@ -0,0 +1,137 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts ===
+
+interface Base {
+>Base : Base
+
+    x: string;
+>x : string
+
+    y: number;
+>y : number
+}
+
+interface HelloOrWorld extends Base {
+>HelloOrWorld : HelloOrWorld
+>Base : Base
+
+    p1: boolean;
+>p1 : boolean
+}
+
+interface JustHello extends Base {
+>JustHello : JustHello
+>Base : Base
+
+    p2: boolean;
+>p2 : boolean
+}
+
+interface JustWorld extends Base {
+>JustWorld : JustWorld
+>Base : Base
+
+    p3: boolean;
+>p3 : boolean
+}
+
+let hello: "hello";
+>hello : "hello"
+
+let world: "world";
+>world : "world"
+
+let helloOrWorld: "hello" | "world";
+>helloOrWorld : "hello" | "world"
+
+function f(p: "hello"): JustHello;
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>p : "hello"
+>JustHello : JustHello
+
+function f(p: "hello" | "world"): HelloOrWorld;
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>p : "hello" | "world"
+>HelloOrWorld : HelloOrWorld
+
+function f(p: "world"): JustWorld;
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>p : "world"
+>JustWorld : JustWorld
+
+function f(p: string): Base;
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>p : string
+>Base : Base
+
+function f(...args: any[]): any {
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>args : any[]
+
+    return undefined;
+>undefined : undefined
+}
+
+let fResult1 = f(hello);
+>fResult1 : JustHello
+>f(hello) : JustHello
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>hello : "hello"
+
+let fResult2 = f(world);
+>fResult2 : JustWorld
+>f(world) : JustWorld
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>world : "world"
+
+let fResult3 = f(helloOrWorld);
+>fResult3 : HelloOrWorld
+>f(helloOrWorld) : HelloOrWorld
+>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
+>helloOrWorld : "hello" | "world"
+
+function g(p: string): Base;
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>p : string
+>Base : Base
+
+function g(p: "hello"): JustHello;
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>p : "hello"
+>JustHello : JustHello
+
+function g(p: "hello" | "world"): HelloOrWorld;
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>p : "hello" | "world"
+>HelloOrWorld : HelloOrWorld
+
+function g(p: "world"): JustWorld;
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>p : "world"
+>JustWorld : JustWorld
+
+function g(...args: any[]): any {
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>args : any[]
+
+    return undefined;
+>undefined : undefined
+}
+
+let gResult1 = g(hello);
+>gResult1 : JustHello
+>g(hello) : JustHello
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>hello : "hello"
+
+let gResult2 = g(world);
+>gResult2 : JustWorld
+>g(world) : JustWorld
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>world : "world"
+
+let gResult3 = g(helloOrWorld);
+>gResult3 : Base
+>g(helloOrWorld) : Base
+>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
+>helloOrWorld : "hello" | "world"
+
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads04.js b/tests/baselines/reference/stringLiteralTypesOverloads04.js
new file mode 100644
index 00000000000..fd10ac986a9
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads04.js
@@ -0,0 +1,18 @@
+//// [stringLiteralTypesOverloads04.ts]
+
+declare function f(x: (p: "foo" | "bar") => "foo");
+
+f(y => {
+    let z = y = "foo";
+    return z;
+})
+
+//// [stringLiteralTypesOverloads04.js]
+f(function (y) {
+    var z = y = "foo";
+    return z;
+});
+
+
+//// [stringLiteralTypesOverloads04.d.ts]
+declare function f(x: (p: "foo" | "bar") => "foo"): any;
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads04.symbols b/tests/baselines/reference/stringLiteralTypesOverloads04.symbols
new file mode 100644
index 00000000000..9f468b8bd95
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads04.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts ===
+
+declare function f(x: (p: "foo" | "bar") => "foo");
+>f : Symbol(f, Decl(stringLiteralTypesOverloads04.ts, 0, 0))
+>x : Symbol(x, Decl(stringLiteralTypesOverloads04.ts, 1, 19))
+>p : Symbol(p, Decl(stringLiteralTypesOverloads04.ts, 1, 23))
+
+f(y => {
+>f : Symbol(f, Decl(stringLiteralTypesOverloads04.ts, 0, 0))
+>y : Symbol(y, Decl(stringLiteralTypesOverloads04.ts, 3, 2))
+
+    let z = y = "foo";
+>z : Symbol(z, Decl(stringLiteralTypesOverloads04.ts, 4, 7))
+>y : Symbol(y, Decl(stringLiteralTypesOverloads04.ts, 3, 2))
+
+    return z;
+>z : Symbol(z, Decl(stringLiteralTypesOverloads04.ts, 4, 7))
+
+})
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads04.types b/tests/baselines/reference/stringLiteralTypesOverloads04.types
new file mode 100644
index 00000000000..32d316494ca
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesOverloads04.types
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts ===
+
+declare function f(x: (p: "foo" | "bar") => "foo");
+>f : (x: (p: "foo" | "bar") => "foo") => any
+>x : (p: "foo" | "bar") => "foo"
+>p : "foo" | "bar"
+
+f(y => {
+>f(y => {    let z = y = "foo";    return z;}) : any
+>f : (x: (p: "foo" | "bar") => "foo") => any
+>y => {    let z = y = "foo";    return z;} : (y: "foo" | "bar") => "foo"
+>y : "foo" | "bar"
+
+    let z = y = "foo";
+>z : "foo"
+>y = "foo" : "foo"
+>y : "foo" | "bar"
+>"foo" : "foo"
+
+    return z;
+>z : "foo"
+
+})
diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt
new file mode 100644
index 00000000000..b888c3ca77e
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt
@@ -0,0 +1,33 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (2 errors) ====
+    
+    type Kind = "A" | "B"
+    
+    function kindIs(kind: Kind, is: "A"): kind is "A";
+             ~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    function kindIs(kind: Kind, is: "B"): kind is "B";
+             ~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    function kindIs(kind: Kind, is: Kind): boolean {
+        return kind === is;
+    }
+    
+    var x: Kind = "A";
+    
+    if (kindIs(x, "A")) {
+        let a = x;
+    }
+    else {
+        let b = x;
+    }
+    
+    if (!kindIs(x, "B")) {
+        let c = x;
+    }
+    else {
+        let d = x;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.js b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js
new file mode 100644
index 00000000000..fd4129d272d
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js
@@ -0,0 +1,50 @@
+//// [stringLiteralTypesTypePredicates01.ts]
+
+type Kind = "A" | "B"
+
+function kindIs(kind: Kind, is: "A"): kind is "A";
+function kindIs(kind: Kind, is: "B"): kind is "B";
+function kindIs(kind: Kind, is: Kind): boolean {
+    return kind === is;
+}
+
+var x: Kind = "A";
+
+if (kindIs(x, "A")) {
+    let a = x;
+}
+else {
+    let b = x;
+}
+
+if (!kindIs(x, "B")) {
+    let c = x;
+}
+else {
+    let d = x;
+}
+
+//// [stringLiteralTypesTypePredicates01.js]
+function kindIs(kind, is) {
+    return kind === is;
+}
+var x = "A";
+if (kindIs(x, "A")) {
+    var a = x;
+}
+else {
+    var b = x;
+}
+if (!kindIs(x, "B")) {
+    var c = x;
+}
+else {
+    var d = x;
+}
+
+
+//// [stringLiteralTypesTypePredicates01.d.ts]
+declare type Kind = "A" | "B";
+declare function kindIs(kind: Kind, is: "A"): kind is "A";
+declare function kindIs(kind: Kind, is: "B"): kind is "B";
+declare var x: Kind;
diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt
new file mode 100644
index 00000000000..3851a0b10ef
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts(2,5): error TS2322: Type 'string' is not assignable to type '"ABC"'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts(3,5): error TS2322: Type 'string' is not assignable to type '"DE\nF"'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts(6,5): error TS2322: Type 'string' is not assignable to type '"JK`L"'.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts (3 errors) ====
+    
+    let ABC: "ABC" = `ABC`;
+        ~~~
+!!! error TS2322: Type 'string' is not assignable to type '"ABC"'.
+    let DE_NEWLINE_F: "DE\nF" = `DE
+        ~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type '"DE\nF"'.
+    F`;
+    let G_QUOTE_HI: 'G"HI';
+    let JK_BACKTICK_L: "JK`L" = `JK\`L`;
+        ~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type '"JK`L"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js
new file mode 100644
index 00000000000..8f548afc7bf
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js
@@ -0,0 +1,20 @@
+//// [stringLiteralTypesWithTemplateStrings01.ts]
+
+let ABC: "ABC" = `ABC`;
+let DE_NEWLINE_F: "DE\nF" = `DE
+F`;
+let G_QUOTE_HI: 'G"HI';
+let JK_BACKTICK_L: "JK`L" = `JK\`L`;
+
+//// [stringLiteralTypesWithTemplateStrings01.js]
+var ABC = "ABC";
+var DE_NEWLINE_F = "DE\nF";
+var G_QUOTE_HI;
+var JK_BACKTICK_L = "JK`L";
+
+
+//// [stringLiteralTypesWithTemplateStrings01.d.ts]
+declare let ABC: "ABC";
+declare let DE_NEWLINE_F: "DE\nF";
+declare let G_QUOTE_HI: 'G"HI';
+declare let JK_BACKTICK_L: "JK`L";
diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt
new file mode 100644
index 00000000000..803e4f5cb24
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts(2,5): error TS2322: Type 'string' is not assignable to type '"AB\r\nC"'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts(4,5): error TS2322: Type 'string' is not assignable to type '"DE\nF"'.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts (2 errors) ====
+    
+    let abc: "AB\r\nC" = `AB
+        ~~~
+!!! error TS2322: Type 'string' is not assignable to type '"AB\r\nC"'.
+    C`;
+    let de_NEWLINE_f: "DE\nF" = `DE${"\n"}F`;
+        ~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type '"DE\nF"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js
new file mode 100644
index 00000000000..f5d9045921a
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js
@@ -0,0 +1,14 @@
+//// [stringLiteralTypesWithTemplateStrings02.ts]
+
+let abc: "AB\r\nC" = `AB
+C`;
+let de_NEWLINE_f: "DE\nF" = `DE${"\n"}F`;
+
+//// [stringLiteralTypesWithTemplateStrings02.js]
+var abc = "AB\nC";
+var de_NEWLINE_f = "DE" + "\n" + "F";
+
+
+//// [stringLiteralTypesWithTemplateStrings02.d.ts]
+declare let abc: "AB\r\nC";
+declare let de_NEWLINE_f: "DE\nF";
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js
new file mode 100644
index 00000000000..1576540e244
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js
@@ -0,0 +1,86 @@
+//// [stringLiteralTypesWithVariousOperators01.ts]
+
+let abc: "ABC" = "ABC";
+let xyz: "XYZ" = "XYZ";
+let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+
+let a = "" + abc;
+let b = abc + "";
+let c = 10 + abc;
+let d = abc + 10;
+let e = xyz + abc;
+let f = abc + xyz;
+let g = true + abc;
+let h = abc + true;
+let i = abc + abcOrXyz + xyz;
+let j = abcOrXyz + abcOrXyz;
+let k = +abcOrXyz;
+let l = -abcOrXyz;
+let m = abcOrXyzOrNumber + "";
+let n = "" + abcOrXyzOrNumber;
+let o = abcOrXyzOrNumber + abcOrXyz;
+let p = abcOrXyz + abcOrXyzOrNumber;
+let q = !abcOrXyzOrNumber;
+let r = ~abcOrXyzOrNumber;
+let s = abcOrXyzOrNumber < abcOrXyzOrNumber;
+let t = abcOrXyzOrNumber >= abcOrXyz;
+let u = abc === abcOrXyz;
+let v = abcOrXyz === abcOrXyzOrNumber;
+
+//// [stringLiteralTypesWithVariousOperators01.js]
+var abc = "ABC";
+var xyz = "XYZ";
+var abcOrXyz = abc || xyz;
+var abcOrXyzOrNumber = abcOrXyz || 100;
+var a = "" + abc;
+var b = abc + "";
+var c = 10 + abc;
+var d = abc + 10;
+var e = xyz + abc;
+var f = abc + xyz;
+var g = true + abc;
+var h = abc + true;
+var i = abc + abcOrXyz + xyz;
+var j = abcOrXyz + abcOrXyz;
+var k = +abcOrXyz;
+var l = -abcOrXyz;
+var m = abcOrXyzOrNumber + "";
+var n = "" + abcOrXyzOrNumber;
+var o = abcOrXyzOrNumber + abcOrXyz;
+var p = abcOrXyz + abcOrXyzOrNumber;
+var q = !abcOrXyzOrNumber;
+var r = ~abcOrXyzOrNumber;
+var s = abcOrXyzOrNumber < abcOrXyzOrNumber;
+var t = abcOrXyzOrNumber >= abcOrXyz;
+var u = abc === abcOrXyz;
+var v = abcOrXyz === abcOrXyzOrNumber;
+
+
+//// [stringLiteralTypesWithVariousOperators01.d.ts]
+declare let abc: "ABC";
+declare let xyz: "XYZ";
+declare let abcOrXyz: "ABC" | "XYZ";
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
+declare let a: string;
+declare let b: string;
+declare let c: string;
+declare let d: string;
+declare let e: string;
+declare let f: string;
+declare let g: string;
+declare let h: string;
+declare let i: string;
+declare let j: string;
+declare let k: number;
+declare let l: number;
+declare let m: string;
+declare let n: string;
+declare let o: string;
+declare let p: string;
+declare let q: boolean;
+declare let r: number;
+declare let s: boolean;
+declare let t: boolean;
+declare let u: boolean;
+declare let v: boolean;
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols
new file mode 100644
index 00000000000..cc9c3aa842b
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols
@@ -0,0 +1,116 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts ===
+
+let abc: "ABC" = "ABC";
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let xyz: "XYZ" = "XYZ";
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+
+let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+
+let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let a = "" + abc;
+>a : Symbol(a, Decl(stringLiteralTypesWithVariousOperators01.ts, 6, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let b = abc + "";
+>b : Symbol(b, Decl(stringLiteralTypesWithVariousOperators01.ts, 7, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let c = 10 + abc;
+>c : Symbol(c, Decl(stringLiteralTypesWithVariousOperators01.ts, 8, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let d = abc + 10;
+>d : Symbol(d, Decl(stringLiteralTypesWithVariousOperators01.ts, 9, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let e = xyz + abc;
+>e : Symbol(e, Decl(stringLiteralTypesWithVariousOperators01.ts, 10, 3))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let f = abc + xyz;
+>f : Symbol(f, Decl(stringLiteralTypesWithVariousOperators01.ts, 11, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+
+let g = true + abc;
+>g : Symbol(g, Decl(stringLiteralTypesWithVariousOperators01.ts, 12, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let h = abc + true;
+>h : Symbol(h, Decl(stringLiteralTypesWithVariousOperators01.ts, 13, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+
+let i = abc + abcOrXyz + xyz;
+>i : Symbol(i, Decl(stringLiteralTypesWithVariousOperators01.ts, 14, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+
+let j = abcOrXyz + abcOrXyz;
+>j : Symbol(j, Decl(stringLiteralTypesWithVariousOperators01.ts, 15, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let k = +abcOrXyz;
+>k : Symbol(k, Decl(stringLiteralTypesWithVariousOperators01.ts, 16, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let l = -abcOrXyz;
+>l : Symbol(l, Decl(stringLiteralTypesWithVariousOperators01.ts, 17, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let m = abcOrXyzOrNumber + "";
+>m : Symbol(m, Decl(stringLiteralTypesWithVariousOperators01.ts, 18, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
+let n = "" + abcOrXyzOrNumber;
+>n : Symbol(n, Decl(stringLiteralTypesWithVariousOperators01.ts, 19, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
+let o = abcOrXyzOrNumber + abcOrXyz;
+>o : Symbol(o, Decl(stringLiteralTypesWithVariousOperators01.ts, 20, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let p = abcOrXyz + abcOrXyzOrNumber;
+>p : Symbol(p, Decl(stringLiteralTypesWithVariousOperators01.ts, 21, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
+let q = !abcOrXyzOrNumber;
+>q : Symbol(q, Decl(stringLiteralTypesWithVariousOperators01.ts, 22, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
+let r = ~abcOrXyzOrNumber;
+>r : Symbol(r, Decl(stringLiteralTypesWithVariousOperators01.ts, 23, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
+let s = abcOrXyzOrNumber < abcOrXyzOrNumber;
+>s : Symbol(s, Decl(stringLiteralTypesWithVariousOperators01.ts, 24, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
+let t = abcOrXyzOrNumber >= abcOrXyz;
+>t : Symbol(t, Decl(stringLiteralTypesWithVariousOperators01.ts, 25, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let u = abc === abcOrXyz;
+>u : Symbol(u, Decl(stringLiteralTypesWithVariousOperators01.ts, 26, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+
+let v = abcOrXyz === abcOrXyzOrNumber;
+>v : Symbol(v, Decl(stringLiteralTypesWithVariousOperators01.ts, 27, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3))
+
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types
new file mode 100644
index 00000000000..90cb538b800
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types
@@ -0,0 +1,152 @@
+=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts ===
+
+let abc: "ABC" = "ABC";
+>abc : "ABC"
+>"ABC" : "ABC"
+
+let xyz: "XYZ" = "XYZ";
+>xyz : "XYZ"
+>"XYZ" : "XYZ"
+
+let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+>abcOrXyz : "ABC" | "XYZ"
+>abc || xyz : "ABC" | "XYZ"
+>abc : "ABC"
+>xyz : "XYZ"
+
+let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+>abcOrXyz || 100 : "ABC" | "XYZ" | number
+>abcOrXyz : "ABC" | "XYZ"
+>100 : number
+
+let a = "" + abc;
+>a : string
+>"" + abc : string
+>"" : string
+>abc : "ABC"
+
+let b = abc + "";
+>b : string
+>abc + "" : string
+>abc : "ABC"
+>"" : string
+
+let c = 10 + abc;
+>c : string
+>10 + abc : string
+>10 : number
+>abc : "ABC"
+
+let d = abc + 10;
+>d : string
+>abc + 10 : string
+>abc : "ABC"
+>10 : number
+
+let e = xyz + abc;
+>e : string
+>xyz + abc : string
+>xyz : "XYZ"
+>abc : "ABC"
+
+let f = abc + xyz;
+>f : string
+>abc + xyz : string
+>abc : "ABC"
+>xyz : "XYZ"
+
+let g = true + abc;
+>g : string
+>true + abc : string
+>true : boolean
+>abc : "ABC"
+
+let h = abc + true;
+>h : string
+>abc + true : string
+>abc : "ABC"
+>true : boolean
+
+let i = abc + abcOrXyz + xyz;
+>i : string
+>abc + abcOrXyz + xyz : string
+>abc + abcOrXyz : string
+>abc : "ABC"
+>abcOrXyz : "ABC" | "XYZ"
+>xyz : "XYZ"
+
+let j = abcOrXyz + abcOrXyz;
+>j : string
+>abcOrXyz + abcOrXyz : string
+>abcOrXyz : "ABC" | "XYZ"
+>abcOrXyz : "ABC" | "XYZ"
+
+let k = +abcOrXyz;
+>k : number
+>+abcOrXyz : number
+>abcOrXyz : "ABC" | "XYZ"
+
+let l = -abcOrXyz;
+>l : number
+>-abcOrXyz : number
+>abcOrXyz : "ABC" | "XYZ"
+
+let m = abcOrXyzOrNumber + "";
+>m : string
+>abcOrXyzOrNumber + "" : string
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+>"" : string
+
+let n = "" + abcOrXyzOrNumber;
+>n : string
+>"" + abcOrXyzOrNumber : string
+>"" : string
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+
+let o = abcOrXyzOrNumber + abcOrXyz;
+>o : string
+>abcOrXyzOrNumber + abcOrXyz : string
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+>abcOrXyz : "ABC" | "XYZ"
+
+let p = abcOrXyz + abcOrXyzOrNumber;
+>p : string
+>abcOrXyz + abcOrXyzOrNumber : string
+>abcOrXyz : "ABC" | "XYZ"
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+
+let q = !abcOrXyzOrNumber;
+>q : boolean
+>!abcOrXyzOrNumber : boolean
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+
+let r = ~abcOrXyzOrNumber;
+>r : number
+>~abcOrXyzOrNumber : number
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+
+let s = abcOrXyzOrNumber < abcOrXyzOrNumber;
+>s : boolean
+>abcOrXyzOrNumber < abcOrXyzOrNumber : boolean
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+
+let t = abcOrXyzOrNumber >= abcOrXyz;
+>t : boolean
+>abcOrXyzOrNumber >= abcOrXyz : boolean
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+>abcOrXyz : "ABC" | "XYZ"
+
+let u = abc === abcOrXyz;
+>u : boolean
+>abc === abcOrXyz : boolean
+>abc : "ABC"
+>abcOrXyz : "ABC" | "XYZ"
+
+let v = abcOrXyz === abcOrXyzOrNumber;
+>v : boolean
+>abcOrXyz === abcOrXyzOrNumber : boolean
+>abcOrXyz : "ABC" | "XYZ"
+>abcOrXyzOrNumber : "ABC" | "XYZ" | number
+
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
new file mode 100644
index 00000000000..69dd6c2f6a9
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
@@ -0,0 +1,48 @@
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(7,9): error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'number'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(8,9): error TS2365: Operator '+' cannot be applied to types 'number' and '"ABC" | "XYZ" | number'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(9,9): error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and '"ABC" | "XYZ" | number'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(10,9): error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'boolean'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(11,9): error TS2365: Operator '+' cannot be applied to types 'boolean' and '"ABC" | "XYZ" | number'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(12,9): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(13,11): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(14,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(15,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+
+
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (9 errors) ====
+    
+    let abc: "ABC" = "ABC";
+    let xyz: "XYZ" = "XYZ";
+    let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+    let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+    
+    let a = abcOrXyzOrNumber + 100;
+            ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'number'.
+    let b = 100 + abcOrXyzOrNumber;
+            ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types 'number' and '"ABC" | "XYZ" | number'.
+    let c = abcOrXyzOrNumber + abcOrXyzOrNumber;
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and '"ABC" | "XYZ" | number'.
+    let d = abcOrXyzOrNumber + true;
+            ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'boolean'.
+    let e = false + abcOrXyzOrNumber;
+            ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '+' cannot be applied to types 'boolean' and '"ABC" | "XYZ" | number'.
+    let f = abcOrXyzOrNumber++;
+            ~~~~~~~~~~~~~~~~
+!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
+    let g = --abcOrXyzOrNumber;
+              ~~~~~~~~~~~~~~~~
+!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
+    let h = abcOrXyzOrNumber ^ 10;
+            ~~~~~~~~~~~~~~~~
+!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+    let i = abcOrXyzOrNumber | 10;
+            ~~~~~~~~~~~~~~~~
+!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+    let j = abc < xyz;
+    let k = abc === xyz;
+    let l = abc != xyz;
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js
new file mode 100644
index 00000000000..4914ecf3d17
--- /dev/null
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js
@@ -0,0 +1,56 @@
+//// [stringLiteralTypesWithVariousOperators02.ts]
+
+let abc: "ABC" = "ABC";
+let xyz: "XYZ" = "XYZ";
+let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+
+let a = abcOrXyzOrNumber + 100;
+let b = 100 + abcOrXyzOrNumber;
+let c = abcOrXyzOrNumber + abcOrXyzOrNumber;
+let d = abcOrXyzOrNumber + true;
+let e = false + abcOrXyzOrNumber;
+let f = abcOrXyzOrNumber++;
+let g = --abcOrXyzOrNumber;
+let h = abcOrXyzOrNumber ^ 10;
+let i = abcOrXyzOrNumber | 10;
+let j = abc < xyz;
+let k = abc === xyz;
+let l = abc != xyz;
+
+//// [stringLiteralTypesWithVariousOperators02.js]
+var abc = "ABC";
+var xyz = "XYZ";
+var abcOrXyz = abc || xyz;
+var abcOrXyzOrNumber = abcOrXyz || 100;
+var a = abcOrXyzOrNumber + 100;
+var b = 100 + abcOrXyzOrNumber;
+var c = abcOrXyzOrNumber + abcOrXyzOrNumber;
+var d = abcOrXyzOrNumber + true;
+var e = false + abcOrXyzOrNumber;
+var f = abcOrXyzOrNumber++;
+var g = --abcOrXyzOrNumber;
+var h = abcOrXyzOrNumber ^ 10;
+var i = abcOrXyzOrNumber | 10;
+var j = abc < xyz;
+var k = abc === xyz;
+var l = abc != xyz;
+
+
+//// [stringLiteralTypesWithVariousOperators02.d.ts]
+declare let abc: "ABC";
+declare let xyz: "XYZ";
+declare let abcOrXyz: "ABC" | "XYZ";
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
+declare let a: any;
+declare let b: any;
+declare let c: any;
+declare let d: any;
+declare let e: any;
+declare let f: number;
+declare let g: number;
+declare let h: number;
+declare let i: number;
+declare let j: boolean;
+declare let k: boolean;
+declare let l: boolean;
diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt
index d3c399477d6..da742fcd69c 100644
--- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt
+++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures.ts(70,15): error TS2430: Interface 'I2' incorrectly extends interface 'Base2'.
   Types of property 'a' are incompatible.
-    Type '(x: string) => string' is not assignable to type '{ (x: 'a'): number; (x: string): number; }'.
+    Type '(x: string) => string' is not assignable to type '{ (x: "a"): number; (x: string): number; }'.
       Type 'string' is not assignable to type 'number'.
 
 
@@ -78,7 +78,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
                   ~~
 !!! error TS2430: Interface 'I2' incorrectly extends interface 'Base2'.
 !!! error TS2430:   Types of property 'a' are incompatible.
-!!! error TS2430:     Type '(x: string) => string' is not assignable to type '{ (x: 'a'): number; (x: string): number; }'.
+!!! error TS2430:     Type '(x: string) => string' is not assignable to type '{ (x: "a"): number; (x: string): number; }'.
 !!! error TS2430:       Type 'string' is not assignable to type 'number'.
             // N's
             a: (x: string) => string; // error because base returns non-void;
diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt
index 03cc6de0ca4..8a885a2455f 100644
--- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt
+++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures.ts(70,15): error TS2430: Interface 'I2' incorrectly extends interface 'Base2'.
   Types of property 'a' are incompatible.
-    Type 'new (x: string) => string' is not assignable to type '{ new (x: 'a'): number; new (x: string): number; }'.
+    Type 'new (x: string) => string' is not assignable to type '{ new (x: "a"): number; new (x: string): number; }'.
       Type 'string' is not assignable to type 'number'.
 
 
@@ -78,7 +78,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
                   ~~
 !!! error TS2430: Interface 'I2' incorrectly extends interface 'Base2'.
 !!! error TS2430:   Types of property 'a' are incompatible.
-!!! error TS2430:     Type 'new (x: string) => string' is not assignable to type '{ new (x: 'a'): number; new (x: string): number; }'.
+!!! error TS2430:     Type 'new (x: string) => string' is not assignable to type '{ new (x: "a"): number; new (x: string): number; }'.
 !!! error TS2430:       Type 'string' is not assignable to type 'number'.
             // N's
             a: new (x: string) => string; // error because base returns non-void;
diff --git a/tests/baselines/reference/switchBreakStatements.js b/tests/baselines/reference/switchBreakStatements.js
index 534f025e2f5..d7fa279248c 100644
--- a/tests/baselines/reference/switchBreakStatements.js
+++ b/tests/baselines/reference/switchBreakStatements.js
@@ -1,4 +1,5 @@
 //// [switchBreakStatements.ts]
+
 switch ('') {
     case 'a':
         break;
diff --git a/tests/baselines/reference/switchBreakStatements.symbols b/tests/baselines/reference/switchBreakStatements.symbols
index 22626241881..dde7ca028cc 100644
--- a/tests/baselines/reference/switchBreakStatements.symbols
+++ b/tests/baselines/reference/switchBreakStatements.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/switchBreakStatements.ts ===
+
 switch ('') {
     case 'a':
         break;
@@ -48,7 +49,7 @@ switch ('') {
                         switch ('') {
                             case 'a':
                                 var fn = function () { }
->fn : Symbol(fn, Decl(switchBreakStatements.ts, 48, 35))
+>fn : Symbol(fn, Decl(switchBreakStatements.ts, 49, 35))
 
                                 break EIGHT;
                         }
diff --git a/tests/baselines/reference/switchBreakStatements.types b/tests/baselines/reference/switchBreakStatements.types
index c8847a5dc34..0364d878d5a 100644
--- a/tests/baselines/reference/switchBreakStatements.types
+++ b/tests/baselines/reference/switchBreakStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/switchBreakStatements.ts ===
+
 switch ('') {
 >'' : string
 
diff --git a/tests/baselines/reference/symbolProperty41.types b/tests/baselines/reference/symbolProperty41.types
index 61b71dfe246..f312481ac04 100644
--- a/tests/baselines/reference/symbolProperty41.types
+++ b/tests/baselines/reference/symbolProperty41.types
@@ -49,5 +49,5 @@ c[Symbol.iterator]("hello");
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->"hello" : string
+>"hello" : "hello"
 
diff --git a/tests/baselines/reference/symbolType18.types b/tests/baselines/reference/symbolType18.types
index db4fb30378f..68c43215136 100644
--- a/tests/baselines/reference/symbolType18.types
+++ b/tests/baselines/reference/symbolType18.types
@@ -21,5 +21,5 @@ if (typeof x === "object") {
 }
 else {
     x;
->x : symbol | Foo
+>x : symbol
 }
diff --git a/tests/baselines/reference/systemModule1.js b/tests/baselines/reference/systemModule1.js
index 573a7ae04c8..8d99e84ae9f 100644
--- a/tests/baselines/reference/systemModule1.js
+++ b/tests/baselines/reference/systemModule1.js
@@ -8,7 +8,7 @@ System.register([], function(exports_1) {
     return {
         setters:[],
         execute: function() {
-            x = 1;
+            exports_1("x", x = 1);
         }
     }
 });
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
index 94ab5028647..e6910840d39 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{}'.
+tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{}'.
+!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
index f410d408482..ac30556a235 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{}'.
+tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error T
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{}'.
+!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeAndConstraints.js b/tests/baselines/reference/thisTypeAndConstraints.js
new file mode 100644
index 00000000000..d62ebe6917c
--- /dev/null
+++ b/tests/baselines/reference/thisTypeAndConstraints.js
@@ -0,0 +1,50 @@
+//// [thisTypeAndConstraints.ts]
+class A {
+    self() {
+        return this;
+    }
+}
+
+function f<T extends A>(x: T) {
+    function g<U extends T>(x: U) {
+        x = x.self();
+    }
+    x = x.self();
+}
+
+class B<T extends A> {
+    foo(x: T) {
+        x = x.self();
+    }
+    bar<U extends T>(x: U) {
+        x = x.self();
+    }
+}
+
+
+//// [thisTypeAndConstraints.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.self = function () {
+        return this;
+    };
+    return A;
+})();
+function f(x) {
+    function g(x) {
+        x = x.self();
+    }
+    x = x.self();
+}
+var B = (function () {
+    function B() {
+    }
+    B.prototype.foo = function (x) {
+        x = x.self();
+    };
+    B.prototype.bar = function (x) {
+        x = x.self();
+    };
+    return B;
+})();
diff --git a/tests/baselines/reference/thisTypeAndConstraints.symbols b/tests/baselines/reference/thisTypeAndConstraints.symbols
new file mode 100644
index 00000000000..5f93df22c1a
--- /dev/null
+++ b/tests/baselines/reference/thisTypeAndConstraints.symbols
@@ -0,0 +1,70 @@
+=== tests/cases/conformance/types/thisType/thisTypeAndConstraints.ts ===
+class A {
+>A : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
+
+    self() {
+>self : Symbol(self, Decl(thisTypeAndConstraints.ts, 0, 9))
+
+        return this;
+>this : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
+    }
+}
+
+function f<T extends A>(x: T) {
+>f : Symbol(f, Decl(thisTypeAndConstraints.ts, 4, 1))
+>T : Symbol(T, Decl(thisTypeAndConstraints.ts, 6, 11))
+>A : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 6, 24))
+>T : Symbol(T, Decl(thisTypeAndConstraints.ts, 6, 11))
+
+    function g<U extends T>(x: U) {
+>g : Symbol(g, Decl(thisTypeAndConstraints.ts, 6, 31))
+>U : Symbol(U, Decl(thisTypeAndConstraints.ts, 7, 15))
+>T : Symbol(T, Decl(thisTypeAndConstraints.ts, 6, 11))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 7, 28))
+>U : Symbol(U, Decl(thisTypeAndConstraints.ts, 7, 15))
+
+        x = x.self();
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 7, 28))
+>x.self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 7, 28))
+>self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+    }
+    x = x.self();
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 6, 24))
+>x.self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 6, 24))
+>self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+}
+
+class B<T extends A> {
+>B : Symbol(B, Decl(thisTypeAndConstraints.ts, 11, 1))
+>T : Symbol(T, Decl(thisTypeAndConstraints.ts, 13, 8))
+>A : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
+
+    foo(x: T) {
+>foo : Symbol(foo, Decl(thisTypeAndConstraints.ts, 13, 22))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 14, 8))
+>T : Symbol(T, Decl(thisTypeAndConstraints.ts, 13, 8))
+
+        x = x.self();
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 14, 8))
+>x.self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 14, 8))
+>self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+    }
+    bar<U extends T>(x: U) {
+>bar : Symbol(bar, Decl(thisTypeAndConstraints.ts, 16, 5))
+>U : Symbol(U, Decl(thisTypeAndConstraints.ts, 17, 8))
+>T : Symbol(T, Decl(thisTypeAndConstraints.ts, 13, 8))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 17, 21))
+>U : Symbol(U, Decl(thisTypeAndConstraints.ts, 17, 8))
+
+        x = x.self();
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 17, 21))
+>x.self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+>x : Symbol(x, Decl(thisTypeAndConstraints.ts, 17, 21))
+>self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
+    }
+}
+
diff --git a/tests/baselines/reference/thisTypeAndConstraints.types b/tests/baselines/reference/thisTypeAndConstraints.types
new file mode 100644
index 00000000000..af7a06e83cf
--- /dev/null
+++ b/tests/baselines/reference/thisTypeAndConstraints.types
@@ -0,0 +1,78 @@
+=== tests/cases/conformance/types/thisType/thisTypeAndConstraints.ts ===
+class A {
+>A : A
+
+    self() {
+>self : () => this
+
+        return this;
+>this : this
+    }
+}
+
+function f<T extends A>(x: T) {
+>f : <T extends A>(x: T) => void
+>T : T
+>A : A
+>x : T
+>T : T
+
+    function g<U extends T>(x: U) {
+>g : <U extends T>(x: U) => void
+>U : U
+>T : T
+>x : U
+>U : U
+
+        x = x.self();
+>x = x.self() : U
+>x : U
+>x.self() : U
+>x.self : () => U
+>x : U
+>self : () => U
+    }
+    x = x.self();
+>x = x.self() : T
+>x : T
+>x.self() : T
+>x.self : () => T
+>x : T
+>self : () => T
+}
+
+class B<T extends A> {
+>B : B<T>
+>T : T
+>A : A
+
+    foo(x: T) {
+>foo : (x: T) => void
+>x : T
+>T : T
+
+        x = x.self();
+>x = x.self() : T
+>x : T
+>x.self() : T
+>x.self : () => T
+>x : T
+>self : () => T
+    }
+    bar<U extends T>(x: U) {
+>bar : <U extends T>(x: U) => void
+>U : U
+>T : T
+>x : U
+>U : U
+
+        x = x.self();
+>x = x.self() : U
+>x : U
+>x.self() : U
+>x.self : () => U
+>x : U
+>self : () => U
+    }
+}
+
diff --git a/tests/baselines/reference/thisTypeErrors2.errors.txt b/tests/baselines/reference/thisTypeErrors2.errors.txt
new file mode 100644
index 00000000000..783325f4ef3
--- /dev/null
+++ b/tests/baselines/reference/thisTypeErrors2.errors.txt
@@ -0,0 +1,23 @@
+tests/cases/conformance/types/thisType/thisTypeErrors2.ts(2,20): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+tests/cases/conformance/types/thisType/thisTypeErrors2.ts(9,38): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+
+
+==== tests/cases/conformance/types/thisType/thisTypeErrors2.ts (2 errors) ====
+    class Base {
+        constructor(a: this) {
+                       ~~~~
+!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+        }
+    }
+    class Generic<T> {
+    }
+    class Derived {
+        n: number;
+        constructor(public host: Generic<this>) {
+                                         ~~~~
+!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+            let self: this = this;
+            this.n = 12;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeErrors2.js b/tests/baselines/reference/thisTypeErrors2.js
new file mode 100644
index 00000000000..f48d0874e53
--- /dev/null
+++ b/tests/baselines/reference/thisTypeErrors2.js
@@ -0,0 +1,35 @@
+//// [thisTypeErrors2.ts]
+class Base {
+    constructor(a: this) {
+    }
+}
+class Generic<T> {
+}
+class Derived {
+    n: number;
+    constructor(public host: Generic<this>) {
+        let self: this = this;
+        this.n = 12;
+    }
+}
+
+
+//// [thisTypeErrors2.js]
+var Base = (function () {
+    function Base(a) {
+    }
+    return Base;
+})();
+var Generic = (function () {
+    function Generic() {
+    }
+    return Generic;
+})();
+var Derived = (function () {
+    function Derived(host) {
+        this.host = host;
+        var self = this;
+        this.n = 12;
+    }
+    return Derived;
+})();
diff --git a/tests/baselines/reference/thisTypeInClasses.js b/tests/baselines/reference/thisTypeInClasses.js
index 93344fa62cb..52ad452aa56 100644
--- a/tests/baselines/reference/thisTypeInClasses.js
+++ b/tests/baselines/reference/thisTypeInClasses.js
@@ -2,7 +2,6 @@
 class C1 {
     x: this;
     f(x: this): this { return undefined; }
-    constructor(x: this) { }
 }
 
 class C2 {
@@ -53,7 +52,7 @@ class C5 {
 
 //// [thisTypeInClasses.js]
 var C1 = (function () {
-    function C1(x) {
+    function C1() {
     }
     C1.prototype.f = function (x) { return undefined; };
     return C1;
diff --git a/tests/baselines/reference/thisTypeInClasses.symbols b/tests/baselines/reference/thisTypeInClasses.symbols
index 04ed47b09ff..0915d6e5e6b 100644
--- a/tests/baselines/reference/thisTypeInClasses.symbols
+++ b/tests/baselines/reference/thisTypeInClasses.symbols
@@ -9,131 +9,128 @@ class C1 {
 >f : Symbol(f, Decl(thisTypeInClasses.ts, 1, 12))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 2, 6))
 >undefined : Symbol(undefined)
-
-    constructor(x: this) { }
->x : Symbol(x, Decl(thisTypeInClasses.ts, 3, 16))
 }
 
 class C2 {
->C2 : Symbol(C2, Decl(thisTypeInClasses.ts, 4, 1))
+>C2 : Symbol(C2, Decl(thisTypeInClasses.ts, 3, 1))
 
     [x: string]: this;
->x : Symbol(x, Decl(thisTypeInClasses.ts, 7, 5))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 6, 5))
 }
 
 interface Foo<T> {
->Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 8, 1))
->T : Symbol(T, Decl(thisTypeInClasses.ts, 10, 14))
+>Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 7, 1))
+>T : Symbol(T, Decl(thisTypeInClasses.ts, 9, 14))
 
     x: T;
->x : Symbol(x, Decl(thisTypeInClasses.ts, 10, 18))
->T : Symbol(T, Decl(thisTypeInClasses.ts, 10, 14))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 9, 18))
+>T : Symbol(T, Decl(thisTypeInClasses.ts, 9, 14))
 
     y: this;
->y : Symbol(y, Decl(thisTypeInClasses.ts, 11, 9))
+>y : Symbol(y, Decl(thisTypeInClasses.ts, 10, 9))
 }
 
 class C3 {
->C3 : Symbol(C3, Decl(thisTypeInClasses.ts, 13, 1))
+>C3 : Symbol(C3, Decl(thisTypeInClasses.ts, 12, 1))
 
     a: this[];
->a : Symbol(a, Decl(thisTypeInClasses.ts, 15, 10))
+>a : Symbol(a, Decl(thisTypeInClasses.ts, 14, 10))
 
     b: [this, this];
->b : Symbol(b, Decl(thisTypeInClasses.ts, 16, 14))
+>b : Symbol(b, Decl(thisTypeInClasses.ts, 15, 14))
 
     c: this | Date;
->c : Symbol(c, Decl(thisTypeInClasses.ts, 17, 20))
+>c : Symbol(c, Decl(thisTypeInClasses.ts, 16, 20))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     d: this & Date;
->d : Symbol(d, Decl(thisTypeInClasses.ts, 18, 19))
+>d : Symbol(d, Decl(thisTypeInClasses.ts, 17, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     e: (((this)));
->e : Symbol(e, Decl(thisTypeInClasses.ts, 19, 19))
+>e : Symbol(e, Decl(thisTypeInClasses.ts, 18, 19))
 
     f: (x: this) => this;
->f : Symbol(f, Decl(thisTypeInClasses.ts, 20, 18))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 21, 8))
+>f : Symbol(f, Decl(thisTypeInClasses.ts, 19, 18))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 20, 8))
 
     g: new (x: this) => this;
->g : Symbol(g, Decl(thisTypeInClasses.ts, 21, 25))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 22, 12))
+>g : Symbol(g, Decl(thisTypeInClasses.ts, 20, 25))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 21, 12))
 
     h: Foo<this>;
->h : Symbol(h, Decl(thisTypeInClasses.ts, 22, 29))
->Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 8, 1))
+>h : Symbol(h, Decl(thisTypeInClasses.ts, 21, 29))
+>Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 7, 1))
 
     i: Foo<this | (() => this)>;
->i : Symbol(i, Decl(thisTypeInClasses.ts, 23, 17))
->Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 8, 1))
+>i : Symbol(i, Decl(thisTypeInClasses.ts, 22, 17))
+>Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 7, 1))
 
     j: (x: any) => x is this;
->j : Symbol(j, Decl(thisTypeInClasses.ts, 24, 32))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 25, 8))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 25, 8))
+>j : Symbol(j, Decl(thisTypeInClasses.ts, 23, 32))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 24, 8))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 24, 8))
 }
 
 declare class C4 {
->C4 : Symbol(C4, Decl(thisTypeInClasses.ts, 26, 1))
+>C4 : Symbol(C4, Decl(thisTypeInClasses.ts, 25, 1))
 
     x: this;
->x : Symbol(x, Decl(thisTypeInClasses.ts, 28, 18))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 27, 18))
 
     f(x: this): this;
->f : Symbol(f, Decl(thisTypeInClasses.ts, 29, 12))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 30, 6))
+>f : Symbol(f, Decl(thisTypeInClasses.ts, 28, 12))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 29, 6))
 }
 
 class C5 {
->C5 : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
+>C5 : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
 
     foo() {
->foo : Symbol(foo, Decl(thisTypeInClasses.ts, 33, 10))
+>foo : Symbol(foo, Decl(thisTypeInClasses.ts, 32, 10))
 
         let f1 = (x: this): this => this;
->f1 : Symbol(f1, Decl(thisTypeInClasses.ts, 35, 11))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 35, 18))
->this : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
->this : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
+>f1 : Symbol(f1, Decl(thisTypeInClasses.ts, 34, 11))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 34, 18))
+>this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
+>this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
 
         let f2 = (x: this) => this;
->f2 : Symbol(f2, Decl(thisTypeInClasses.ts, 36, 11))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 36, 18))
->this : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
+>f2 : Symbol(f2, Decl(thisTypeInClasses.ts, 35, 11))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 35, 18))
+>this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
 
         let f3 = (x: this) => (y: this) => this;
->f3 : Symbol(f3, Decl(thisTypeInClasses.ts, 37, 11))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 37, 18))
->y : Symbol(y, Decl(thisTypeInClasses.ts, 37, 31))
->this : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
+>f3 : Symbol(f3, Decl(thisTypeInClasses.ts, 36, 11))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 36, 18))
+>y : Symbol(y, Decl(thisTypeInClasses.ts, 36, 31))
+>this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
 
         let f4 = (x: this) => {
->f4 : Symbol(f4, Decl(thisTypeInClasses.ts, 38, 11))
->x : Symbol(x, Decl(thisTypeInClasses.ts, 38, 18))
+>f4 : Symbol(f4, Decl(thisTypeInClasses.ts, 37, 11))
+>x : Symbol(x, Decl(thisTypeInClasses.ts, 37, 18))
 
             let g = (y: this) => {
->g : Symbol(g, Decl(thisTypeInClasses.ts, 39, 15))
->y : Symbol(y, Decl(thisTypeInClasses.ts, 39, 21))
+>g : Symbol(g, Decl(thisTypeInClasses.ts, 38, 15))
+>y : Symbol(y, Decl(thisTypeInClasses.ts, 38, 21))
 
                 return () => this;
->this : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
+>this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
             }
             return g(this);
->g : Symbol(g, Decl(thisTypeInClasses.ts, 39, 15))
->this : Symbol(C5, Decl(thisTypeInClasses.ts, 31, 1))
+>g : Symbol(g, Decl(thisTypeInClasses.ts, 38, 15))
+>this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
         }
     }
     bar() {
->bar : Symbol(bar, Decl(thisTypeInClasses.ts, 44, 5))
+>bar : Symbol(bar, Decl(thisTypeInClasses.ts, 43, 5))
 
         let x1 = <this>undefined;
->x1 : Symbol(x1, Decl(thisTypeInClasses.ts, 46, 11))
+>x1 : Symbol(x1, Decl(thisTypeInClasses.ts, 45, 11))
 >undefined : Symbol(undefined)
 
         let x2 = undefined as this;
->x2 : Symbol(x2, Decl(thisTypeInClasses.ts, 47, 11))
+>x2 : Symbol(x2, Decl(thisTypeInClasses.ts, 46, 11))
 >undefined : Symbol(undefined)
     }
 }
diff --git a/tests/baselines/reference/thisTypeInClasses.types b/tests/baselines/reference/thisTypeInClasses.types
index ddfdfb277a9..512359decd9 100644
--- a/tests/baselines/reference/thisTypeInClasses.types
+++ b/tests/baselines/reference/thisTypeInClasses.types
@@ -9,9 +9,6 @@ class C1 {
 >f : (x: this) => this
 >x : this
 >undefined : undefined
-
-    constructor(x: this) { }
->x : this
 }
 
 class C2 {
diff --git a/tests/baselines/reference/throwInEnclosingStatements.js b/tests/baselines/reference/throwInEnclosingStatements.js
index 0b072434f33..4d9200776e7 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.js
+++ b/tests/baselines/reference/throwInEnclosingStatements.js
@@ -1,4 +1,5 @@
 //// [throwInEnclosingStatements.ts]
+
 function fn(x) {
     throw x;
 }
diff --git a/tests/baselines/reference/throwInEnclosingStatements.symbols b/tests/baselines/reference/throwInEnclosingStatements.symbols
index 007894047de..42053c60efa 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.symbols
+++ b/tests/baselines/reference/throwInEnclosingStatements.symbols
@@ -1,91 +1,92 @@
 === tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts ===
+
 function fn(x) {
 >fn : Symbol(fn, Decl(throwInEnclosingStatements.ts, 0, 0))
->x : Symbol(x, Decl(throwInEnclosingStatements.ts, 0, 12))
+>x : Symbol(x, Decl(throwInEnclosingStatements.ts, 1, 12))
 
     throw x;
->x : Symbol(x, Decl(throwInEnclosingStatements.ts, 0, 12))
+>x : Symbol(x, Decl(throwInEnclosingStatements.ts, 1, 12))
 }
 
 <T>(x: T) => { throw x; }
->T : Symbol(T, Decl(throwInEnclosingStatements.ts, 4, 1))
->x : Symbol(x, Decl(throwInEnclosingStatements.ts, 4, 4))
->T : Symbol(T, Decl(throwInEnclosingStatements.ts, 4, 1))
->x : Symbol(x, Decl(throwInEnclosingStatements.ts, 4, 4))
+>T : Symbol(T, Decl(throwInEnclosingStatements.ts, 5, 1))
+>x : Symbol(x, Decl(throwInEnclosingStatements.ts, 5, 4))
+>T : Symbol(T, Decl(throwInEnclosingStatements.ts, 5, 1))
+>x : Symbol(x, Decl(throwInEnclosingStatements.ts, 5, 4))
 
 var y: string;
->y : Symbol(y, Decl(throwInEnclosingStatements.ts, 6, 3))
+>y : Symbol(y, Decl(throwInEnclosingStatements.ts, 7, 3))
 
 switch (y) {
->y : Symbol(y, Decl(throwInEnclosingStatements.ts, 6, 3))
+>y : Symbol(y, Decl(throwInEnclosingStatements.ts, 7, 3))
 
     case 'a':
         throw y;
->y : Symbol(y, Decl(throwInEnclosingStatements.ts, 6, 3))
+>y : Symbol(y, Decl(throwInEnclosingStatements.ts, 7, 3))
 
     default:
         throw y;
->y : Symbol(y, Decl(throwInEnclosingStatements.ts, 6, 3))
+>y : Symbol(y, Decl(throwInEnclosingStatements.ts, 7, 3))
 }
 
 var z = 0;
->z : Symbol(z, Decl(throwInEnclosingStatements.ts, 14, 3))
+>z : Symbol(z, Decl(throwInEnclosingStatements.ts, 15, 3))
 
 while (z < 10) {
->z : Symbol(z, Decl(throwInEnclosingStatements.ts, 14, 3))
+>z : Symbol(z, Decl(throwInEnclosingStatements.ts, 15, 3))
 
     throw z;
->z : Symbol(z, Decl(throwInEnclosingStatements.ts, 14, 3))
+>z : Symbol(z, Decl(throwInEnclosingStatements.ts, 15, 3))
 }
 
 for (var i = 0; ;) { throw i; }
->i : Symbol(i, Decl(throwInEnclosingStatements.ts, 19, 8))
->i : Symbol(i, Decl(throwInEnclosingStatements.ts, 19, 8))
+>i : Symbol(i, Decl(throwInEnclosingStatements.ts, 20, 8))
+>i : Symbol(i, Decl(throwInEnclosingStatements.ts, 20, 8))
 
 for (var idx in {}) { throw idx; }
->idx : Symbol(idx, Decl(throwInEnclosingStatements.ts, 21, 8))
->idx : Symbol(idx, Decl(throwInEnclosingStatements.ts, 21, 8))
+>idx : Symbol(idx, Decl(throwInEnclosingStatements.ts, 22, 8))
+>idx : Symbol(idx, Decl(throwInEnclosingStatements.ts, 22, 8))
 
 do { throw null; }while(true)
 
 var j = 0;
->j : Symbol(j, Decl(throwInEnclosingStatements.ts, 25, 3))
+>j : Symbol(j, Decl(throwInEnclosingStatements.ts, 26, 3))
 
 while (j < 0) { throw j; }
->j : Symbol(j, Decl(throwInEnclosingStatements.ts, 25, 3))
->j : Symbol(j, Decl(throwInEnclosingStatements.ts, 25, 3))
+>j : Symbol(j, Decl(throwInEnclosingStatements.ts, 26, 3))
+>j : Symbol(j, Decl(throwInEnclosingStatements.ts, 26, 3))
 
 class C<T> {
->C : Symbol(C, Decl(throwInEnclosingStatements.ts, 26, 26))
->T : Symbol(T, Decl(throwInEnclosingStatements.ts, 28, 8))
+>C : Symbol(C, Decl(throwInEnclosingStatements.ts, 27, 26))
+>T : Symbol(T, Decl(throwInEnclosingStatements.ts, 29, 8))
 
     private value: T;
->value : Symbol(value, Decl(throwInEnclosingStatements.ts, 28, 12))
->T : Symbol(T, Decl(throwInEnclosingStatements.ts, 28, 8))
+>value : Symbol(value, Decl(throwInEnclosingStatements.ts, 29, 12))
+>T : Symbol(T, Decl(throwInEnclosingStatements.ts, 29, 8))
 
     biz() {
->biz : Symbol(biz, Decl(throwInEnclosingStatements.ts, 29, 21))
+>biz : Symbol(biz, Decl(throwInEnclosingStatements.ts, 30, 21))
 
         throw this.value;
->this.value : Symbol(value, Decl(throwInEnclosingStatements.ts, 28, 12))
->this : Symbol(C, Decl(throwInEnclosingStatements.ts, 26, 26))
->value : Symbol(value, Decl(throwInEnclosingStatements.ts, 28, 12))
+>this.value : Symbol(value, Decl(throwInEnclosingStatements.ts, 29, 12))
+>this : Symbol(C, Decl(throwInEnclosingStatements.ts, 27, 26))
+>value : Symbol(value, Decl(throwInEnclosingStatements.ts, 29, 12))
     }
 
     constructor() {
         throw this;
->this : Symbol(C, Decl(throwInEnclosingStatements.ts, 26, 26))
+>this : Symbol(C, Decl(throwInEnclosingStatements.ts, 27, 26))
     }
 }
 
 var aa = {
->aa : Symbol(aa, Decl(throwInEnclosingStatements.ts, 39, 3))
+>aa : Symbol(aa, Decl(throwInEnclosingStatements.ts, 40, 3))
 
     id:12,
->id : Symbol(id, Decl(throwInEnclosingStatements.ts, 39, 10))
+>id : Symbol(id, Decl(throwInEnclosingStatements.ts, 40, 10))
 
     biz() {
->biz : Symbol(biz, Decl(throwInEnclosingStatements.ts, 40, 10))
+>biz : Symbol(biz, Decl(throwInEnclosingStatements.ts, 41, 10))
 
         throw this;
     }
diff --git a/tests/baselines/reference/throwInEnclosingStatements.types b/tests/baselines/reference/throwInEnclosingStatements.types
index bcff8653d52..568fd800e35 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.types
+++ b/tests/baselines/reference/throwInEnclosingStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts ===
+
 function fn(x) {
 >fn : (x: any) => void
 >x : any
diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js
index 83663d08cc4..556ebc55e37 100644
--- a/tests/baselines/reference/throwStatements.js
+++ b/tests/baselines/reference/throwStatements.js
@@ -1,4 +1,5 @@
 //// [throwStatements.ts]
+
 // all legal
 
 interface I {
diff --git a/tests/baselines/reference/throwStatements.symbols b/tests/baselines/reference/throwStatements.symbols
index 508bdcb9f3f..adf9cb461cf 100644
--- a/tests/baselines/reference/throwStatements.symbols
+++ b/tests/baselines/reference/throwStatements.symbols
@@ -1,184 +1,185 @@
 === tests/cases/conformance/statements/throwStatements/throwStatements.ts ===
+
 // all legal
 
 interface I {
 >I : Symbol(I, Decl(throwStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(throwStatements.ts, 2, 13))
+>id : Symbol(id, Decl(throwStatements.ts, 3, 13))
 }
 
 class C implements I {
->C : Symbol(C, Decl(throwStatements.ts, 4, 1))
+>C : Symbol(C, Decl(throwStatements.ts, 5, 1))
 >I : Symbol(I, Decl(throwStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(throwStatements.ts, 6, 22))
+>id : Symbol(id, Decl(throwStatements.ts, 7, 22))
 }
 
 class D<T>{
->D : Symbol(D, Decl(throwStatements.ts, 8, 1))
->T : Symbol(T, Decl(throwStatements.ts, 10, 8))
+>D : Symbol(D, Decl(throwStatements.ts, 9, 1))
+>T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 
     source: T;
->source : Symbol(source, Decl(throwStatements.ts, 10, 11))
->T : Symbol(T, Decl(throwStatements.ts, 10, 8))
+>source : Symbol(source, Decl(throwStatements.ts, 11, 11))
+>T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(throwStatements.ts, 11, 14))
->D : Symbol(D, Decl(throwStatements.ts, 8, 1))
->T : Symbol(T, Decl(throwStatements.ts, 10, 8))
+>recurse : Symbol(recurse, Decl(throwStatements.ts, 12, 14))
+>D : Symbol(D, Decl(throwStatements.ts, 9, 1))
+>T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(throwStatements.ts, 12, 18))
->D : Symbol(D, Decl(throwStatements.ts, 8, 1))
->D : Symbol(D, Decl(throwStatements.ts, 8, 1))
->T : Symbol(T, Decl(throwStatements.ts, 10, 8))
+>wrapped : Symbol(wrapped, Decl(throwStatements.ts, 13, 18))
+>D : Symbol(D, Decl(throwStatements.ts, 9, 1))
+>D : Symbol(D, Decl(throwStatements.ts, 9, 1))
+>T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 }
 
 function F(x: string): number { return 42; }
->F : Symbol(F, Decl(throwStatements.ts, 14, 1))
->x : Symbol(x, Decl(throwStatements.ts, 16, 11))
+>F : Symbol(F, Decl(throwStatements.ts, 15, 1))
+>x : Symbol(x, Decl(throwStatements.ts, 17, 11))
 
 module M {
->M : Symbol(M, Decl(throwStatements.ts, 16, 44))
+>M : Symbol(M, Decl(throwStatements.ts, 17, 44))
 
     export class A {
->A : Symbol(A, Decl(throwStatements.ts, 18, 10))
+>A : Symbol(A, Decl(throwStatements.ts, 19, 10))
 
         name: string;
->name : Symbol(name, Decl(throwStatements.ts, 19, 20))
+>name : Symbol(name, Decl(throwStatements.ts, 20, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : Symbol(F2, Decl(throwStatements.ts, 21, 5))
->x : Symbol(x, Decl(throwStatements.ts, 23, 23))
+>F2 : Symbol(F2, Decl(throwStatements.ts, 22, 5))
+>x : Symbol(x, Decl(throwStatements.ts, 24, 23))
 >x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(throwStatements.ts, 23, 23))
+>x : Symbol(x, Decl(throwStatements.ts, 24, 23))
 >toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
 }
 
 var aNumber = 9.9;
->aNumber : Symbol(aNumber, Decl(throwStatements.ts, 26, 3))
+>aNumber : Symbol(aNumber, Decl(throwStatements.ts, 27, 3))
 
 throw aNumber;
->aNumber : Symbol(aNumber, Decl(throwStatements.ts, 26, 3))
+>aNumber : Symbol(aNumber, Decl(throwStatements.ts, 27, 3))
 
 var aString = 'this is a string';
->aString : Symbol(aString, Decl(throwStatements.ts, 28, 3))
+>aString : Symbol(aString, Decl(throwStatements.ts, 29, 3))
 
 throw aString;
->aString : Symbol(aString, Decl(throwStatements.ts, 28, 3))
+>aString : Symbol(aString, Decl(throwStatements.ts, 29, 3))
 
 var aDate = new Date(12);
->aDate : Symbol(aDate, Decl(throwStatements.ts, 30, 3))
+>aDate : Symbol(aDate, Decl(throwStatements.ts, 31, 3))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 throw aDate;
->aDate : Symbol(aDate, Decl(throwStatements.ts, 30, 3))
+>aDate : Symbol(aDate, Decl(throwStatements.ts, 31, 3))
 
 var anObject = new Object();
->anObject : Symbol(anObject, Decl(throwStatements.ts, 32, 3))
+>anObject : Symbol(anObject, Decl(throwStatements.ts, 33, 3))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 throw anObject;
->anObject : Symbol(anObject, Decl(throwStatements.ts, 32, 3))
+>anObject : Symbol(anObject, Decl(throwStatements.ts, 33, 3))
 
 var anAny = null;
->anAny : Symbol(anAny, Decl(throwStatements.ts, 35, 3))
+>anAny : Symbol(anAny, Decl(throwStatements.ts, 36, 3))
 
 throw anAny;
->anAny : Symbol(anAny, Decl(throwStatements.ts, 35, 3))
+>anAny : Symbol(anAny, Decl(throwStatements.ts, 36, 3))
 
 var anOtherAny = <any> new C();
->anOtherAny : Symbol(anOtherAny, Decl(throwStatements.ts, 37, 3))
->C : Symbol(C, Decl(throwStatements.ts, 4, 1))
+>anOtherAny : Symbol(anOtherAny, Decl(throwStatements.ts, 38, 3))
+>C : Symbol(C, Decl(throwStatements.ts, 5, 1))
 
 throw anOtherAny;
->anOtherAny : Symbol(anOtherAny, Decl(throwStatements.ts, 37, 3))
+>anOtherAny : Symbol(anOtherAny, Decl(throwStatements.ts, 38, 3))
 
 var anUndefined = undefined;
->anUndefined : Symbol(anUndefined, Decl(throwStatements.ts, 39, 3))
+>anUndefined : Symbol(anUndefined, Decl(throwStatements.ts, 40, 3))
 >undefined : Symbol(undefined)
 
 throw anUndefined;
->anUndefined : Symbol(anUndefined, Decl(throwStatements.ts, 39, 3))
+>anUndefined : Symbol(anUndefined, Decl(throwStatements.ts, 40, 3))
 
 var aClass = new C();
->aClass : Symbol(aClass, Decl(throwStatements.ts, 42, 3))
->C : Symbol(C, Decl(throwStatements.ts, 4, 1))
+>aClass : Symbol(aClass, Decl(throwStatements.ts, 43, 3))
+>C : Symbol(C, Decl(throwStatements.ts, 5, 1))
 
 throw aClass;
->aClass : Symbol(aClass, Decl(throwStatements.ts, 42, 3))
+>aClass : Symbol(aClass, Decl(throwStatements.ts, 43, 3))
 
 var aGenericClass = new D<string>();
->aGenericClass : Symbol(aGenericClass, Decl(throwStatements.ts, 44, 3))
->D : Symbol(D, Decl(throwStatements.ts, 8, 1))
+>aGenericClass : Symbol(aGenericClass, Decl(throwStatements.ts, 45, 3))
+>D : Symbol(D, Decl(throwStatements.ts, 9, 1))
 
 throw aGenericClass;
->aGenericClass : Symbol(aGenericClass, Decl(throwStatements.ts, 44, 3))
+>aGenericClass : Symbol(aGenericClass, Decl(throwStatements.ts, 45, 3))
 
 var anObjectLiteral = { id: 12 };
->anObjectLiteral : Symbol(anObjectLiteral, Decl(throwStatements.ts, 46, 3))
->id : Symbol(id, Decl(throwStatements.ts, 46, 23))
+>anObjectLiteral : Symbol(anObjectLiteral, Decl(throwStatements.ts, 47, 3))
+>id : Symbol(id, Decl(throwStatements.ts, 47, 23))
 
 throw anObjectLiteral;
->anObjectLiteral : Symbol(anObjectLiteral, Decl(throwStatements.ts, 46, 3))
+>anObjectLiteral : Symbol(anObjectLiteral, Decl(throwStatements.ts, 47, 3))
 
 var aFunction = F;
->aFunction : Symbol(aFunction, Decl(throwStatements.ts, 49, 3))
->F : Symbol(F, Decl(throwStatements.ts, 14, 1))
+>aFunction : Symbol(aFunction, Decl(throwStatements.ts, 50, 3))
+>F : Symbol(F, Decl(throwStatements.ts, 15, 1))
 
 throw aFunction;
->aFunction : Symbol(aFunction, Decl(throwStatements.ts, 49, 3))
+>aFunction : Symbol(aFunction, Decl(throwStatements.ts, 50, 3))
 
 throw aFunction('');
->aFunction : Symbol(aFunction, Decl(throwStatements.ts, 49, 3))
+>aFunction : Symbol(aFunction, Decl(throwStatements.ts, 50, 3))
 
 var aLambda = (x) => 2;
->aLambda : Symbol(aLambda, Decl(throwStatements.ts, 52, 3))
->x : Symbol(x, Decl(throwStatements.ts, 52, 15))
+>aLambda : Symbol(aLambda, Decl(throwStatements.ts, 53, 3))
+>x : Symbol(x, Decl(throwStatements.ts, 53, 15))
 
 throw aLambda;
->aLambda : Symbol(aLambda, Decl(throwStatements.ts, 52, 3))
+>aLambda : Symbol(aLambda, Decl(throwStatements.ts, 53, 3))
 
 throw aLambda(1);
->aLambda : Symbol(aLambda, Decl(throwStatements.ts, 52, 3))
+>aLambda : Symbol(aLambda, Decl(throwStatements.ts, 53, 3))
 
 var aModule = M;
->aModule : Symbol(aModule, Decl(throwStatements.ts, 56, 3))
->M : Symbol(M, Decl(throwStatements.ts, 16, 44))
+>aModule : Symbol(aModule, Decl(throwStatements.ts, 57, 3))
+>M : Symbol(M, Decl(throwStatements.ts, 17, 44))
 
 throw aModule;
->aModule : Symbol(aModule, Decl(throwStatements.ts, 56, 3))
+>aModule : Symbol(aModule, Decl(throwStatements.ts, 57, 3))
 
 throw typeof M;
->M : Symbol(M, Decl(throwStatements.ts, 16, 44))
+>M : Symbol(M, Decl(throwStatements.ts, 17, 44))
 
 var aClassInModule = new M.A();
->aClassInModule : Symbol(aClassInModule, Decl(throwStatements.ts, 59, 3))
->M.A : Symbol(M.A, Decl(throwStatements.ts, 18, 10))
->M : Symbol(M, Decl(throwStatements.ts, 16, 44))
->A : Symbol(M.A, Decl(throwStatements.ts, 18, 10))
+>aClassInModule : Symbol(aClassInModule, Decl(throwStatements.ts, 60, 3))
+>M.A : Symbol(M.A, Decl(throwStatements.ts, 19, 10))
+>M : Symbol(M, Decl(throwStatements.ts, 17, 44))
+>A : Symbol(M.A, Decl(throwStatements.ts, 19, 10))
 
 throw aClassInModule;
->aClassInModule : Symbol(aClassInModule, Decl(throwStatements.ts, 59, 3))
+>aClassInModule : Symbol(aClassInModule, Decl(throwStatements.ts, 60, 3))
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : Symbol(aFunctionInModule, Decl(throwStatements.ts, 61, 3))
->M.F2 : Symbol(M.F2, Decl(throwStatements.ts, 21, 5))
->M : Symbol(M, Decl(throwStatements.ts, 16, 44))
->F2 : Symbol(M.F2, Decl(throwStatements.ts, 21, 5))
+>aFunctionInModule : Symbol(aFunctionInModule, Decl(throwStatements.ts, 62, 3))
+>M.F2 : Symbol(M.F2, Decl(throwStatements.ts, 22, 5))
+>M : Symbol(M, Decl(throwStatements.ts, 17, 44))
+>F2 : Symbol(M.F2, Decl(throwStatements.ts, 22, 5))
 
 throw aFunctionInModule;
->aFunctionInModule : Symbol(aFunctionInModule, Decl(throwStatements.ts, 61, 3))
+>aFunctionInModule : Symbol(aFunctionInModule, Decl(throwStatements.ts, 62, 3))
 
 // no initializer or annotation, so this is an 'any'
 var x;
->x : Symbol(x, Decl(throwStatements.ts, 65, 3))
+>x : Symbol(x, Decl(throwStatements.ts, 66, 3))
 
 throw x;
->x : Symbol(x, Decl(throwStatements.ts, 65, 3))
+>x : Symbol(x, Decl(throwStatements.ts, 66, 3))
 
 // literals
 throw 0.0;
@@ -190,13 +191,13 @@ throw undefined;
 throw 'a string';
 throw function () { return 'a string' };
 throw <T>(x:T) => 42;
->T : Symbol(T, Decl(throwStatements.ts, 75, 7))
->x : Symbol(x, Decl(throwStatements.ts, 75, 10))
->T : Symbol(T, Decl(throwStatements.ts, 75, 7))
+>T : Symbol(T, Decl(throwStatements.ts, 76, 7))
+>x : Symbol(x, Decl(throwStatements.ts, 76, 10))
+>T : Symbol(T, Decl(throwStatements.ts, 76, 7))
 
 throw { x: 12, y: 13 };
->x : Symbol(x, Decl(throwStatements.ts, 76, 7))
->y : Symbol(y, Decl(throwStatements.ts, 76, 14))
+>x : Symbol(x, Decl(throwStatements.ts, 77, 7))
+>y : Symbol(y, Decl(throwStatements.ts, 77, 14))
 
 throw [];
 throw ['a', ['b']];
@@ -205,11 +206,11 @@ throw new Date();
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 throw new C();
->C : Symbol(C, Decl(throwStatements.ts, 4, 1))
+>C : Symbol(C, Decl(throwStatements.ts, 5, 1))
 
 throw new Object();
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 throw new D<number>();
->D : Symbol(D, Decl(throwStatements.ts, 8, 1))
+>D : Symbol(D, Decl(throwStatements.ts, 9, 1))
 
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 3d365a1b65a..5023513ee53 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/throwStatements/throwStatements.ts ===
+
 // all legal
 
 interface I {
diff --git a/tests/baselines/reference/throwWithoutNewLine2.errors.txt b/tests/baselines/reference/throwWithoutNewLine2.errors.txt
index 6930d240e7b..83f4e4cc246 100644
--- a/tests/baselines/reference/throwWithoutNewLine2.errors.txt
+++ b/tests/baselines/reference/throwWithoutNewLine2.errors.txt
@@ -1,11 +1,14 @@
 tests/cases/compiler/throwWithoutNewLine2.ts(1,6): error TS1142: Line break not permitted here.
 tests/cases/compiler/throwWithoutNewLine2.ts(2,1): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/throwWithoutNewLine2.ts(2,1): error TS7027: Unreachable code detected.
 
 
-==== tests/cases/compiler/throwWithoutNewLine2.ts (2 errors) ====
+==== tests/cases/compiler/throwWithoutNewLine2.ts (3 errors) ====
     throw
          
 !!! error TS1142: Line break not permitted here.
     a;
     ~
-!!! error TS2304: Cannot find name 'a'.
\ No newline at end of file
+!!! error TS2304: Cannot find name 'a'.
+    ~
+!!! error TS7027: Unreachable code detected.
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxErrorRecovery2.errors.txt b/tests/baselines/reference/tsxErrorRecovery2.errors.txt
new file mode 100644
index 00000000000..9a0b5790b2c
--- /dev/null
+++ b/tests/baselines/reference/tsxErrorRecovery2.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/jsx/file1.tsx(6,1): error TS2657: JSX expressions must have one parent element
+tests/cases/conformance/jsx/file2.tsx(2,1): error TS2657: JSX expressions must have one parent element
+
+
+==== tests/cases/conformance/jsx/file1.tsx (1 errors) ====
+    
+    declare namespace JSX { interface Element { } }
+    
+    <div></div>
+    <div></div>
+    
+    
+!!! error TS2657: JSX expressions must have one parent element
+==== tests/cases/conformance/jsx/file2.tsx (1 errors) ====
+    var x = <div></div><div></div>
+    
+    
+!!! error TS2657: JSX expressions must have one parent element
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxErrorRecovery2.js b/tests/baselines/reference/tsxErrorRecovery2.js
new file mode 100644
index 00000000000..be5b6c73424
--- /dev/null
+++ b/tests/baselines/reference/tsxErrorRecovery2.js
@@ -0,0 +1,19 @@
+//// [tests/cases/conformance/jsx/tsxErrorRecovery2.tsx] ////
+
+//// [file1.tsx]
+
+declare namespace JSX { interface Element { } }
+
+<div></div>
+<div></div>
+
+//// [file2.tsx]
+var x = <div></div><div></div>
+
+
+//// [file1.jsx]
+<div></div>
+    ,
+        <div></div>;
+//// [file2.jsx]
+var x = <div></div>, <div></div>;
diff --git a/tests/baselines/reference/tsxErrorRecovery3.errors.txt b/tests/baselines/reference/tsxErrorRecovery3.errors.txt
new file mode 100644
index 00000000000..f7e4bc170a9
--- /dev/null
+++ b/tests/baselines/reference/tsxErrorRecovery3.errors.txt
@@ -0,0 +1,30 @@
+tests/cases/conformance/jsx/file1.tsx(4,2): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/file1.tsx(5,2): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/file1.tsx(6,1): error TS2657: JSX expressions must have one parent element
+tests/cases/conformance/jsx/file2.tsx(1,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/file2.tsx(1,21): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/file2.tsx(2,1): error TS2657: JSX expressions must have one parent element
+
+
+==== tests/cases/conformance/jsx/file1.tsx (3 errors) ====
+    
+    declare namespace JSX { interface Element { } }
+    
+    <div></div>
+     ~~~
+!!! error TS2304: Cannot find name 'React'.
+    <div></div>
+     ~~~
+!!! error TS2304: Cannot find name 'React'.
+    
+    
+!!! error TS2657: JSX expressions must have one parent element
+==== tests/cases/conformance/jsx/file2.tsx (3 errors) ====
+    var x = <div></div><div></div>
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+                        ~~~
+!!! error TS2304: Cannot find name 'React'.
+    
+    
+!!! error TS2657: JSX expressions must have one parent element
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxErrorRecovery3.js b/tests/baselines/reference/tsxErrorRecovery3.js
new file mode 100644
index 00000000000..93b34a14c19
--- /dev/null
+++ b/tests/baselines/reference/tsxErrorRecovery3.js
@@ -0,0 +1,19 @@
+//// [tests/cases/conformance/jsx/tsxErrorRecovery3.tsx] ////
+
+//// [file1.tsx]
+
+declare namespace JSX { interface Element { } }
+
+<div></div>
+<div></div>
+
+//// [file2.tsx]
+var x = <div></div><div></div>
+
+
+//// [file1.js]
+React.createElement("div", null)
+    ,
+        React.createElement("div", null);
+//// [file2.js]
+var x = React.createElement("div", null), React.createElement("div", null);
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index f8fe6096090..9968fa8d708 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -20,6 +20,6 @@ declare var Foo, React;
 //// [app.js]
 var mod_1 = require('mod');
 // Should see mod_1['default'] in emit here
-React.createElement(Foo, {"handler": mod_1["default"]});
+React.createElement(Foo, {handler: mod_1["default"]});
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, React.__spread({}, mod_1["default"]));
diff --git a/tests/baselines/reference/tsxReactEmit7.errors.txt b/tests/baselines/reference/tsxReactEmit7.errors.txt
new file mode 100644
index 00000000000..d2ab2f046e9
--- /dev/null
+++ b/tests/baselines/reference/tsxReactEmit7.errors.txt
@@ -0,0 +1,50 @@
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(9,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(10,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(11,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(12,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(15,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(16,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(17,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(18,10): error TS2304: Cannot find name 'React'.
+tests/cases/conformance/jsx/tsxReactEmit7.tsx(19,10): error TS2304: Cannot find name 'React'.
+
+
+==== tests/cases/conformance/jsx/tsxReactEmit7.tsx (9 errors) ====
+    
+    declare module JSX {
+    	interface Element { }
+    	interface IntrinsicElements {
+    		[s: string]: any;
+    	}
+    }
+    
+    var m = <div x-y="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var n = <div xx-y="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var o = <div x-yy="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var p = <div xx-yy="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    
+    // Investigation
+    var a = <div x="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var b = <div xx="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var c = <div xxx="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var d = <div xxxx="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    var e = <div xxxxx="val"></div>;
+             ~~~
+!!! error TS2304: Cannot find name 'React'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxReactEmit7.js b/tests/baselines/reference/tsxReactEmit7.js
new file mode 100644
index 00000000000..6340b321b9c
--- /dev/null
+++ b/tests/baselines/reference/tsxReactEmit7.js
@@ -0,0 +1,33 @@
+//// [tsxReactEmit7.tsx]
+
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var m = <div x-y="val"></div>;
+var n = <div xx-y="val"></div>;
+var o = <div x-yy="val"></div>;
+var p = <div xx-yy="val"></div>;
+
+// Investigation
+var a = <div x="val"></div>;
+var b = <div xx="val"></div>;
+var c = <div xxx="val"></div>;
+var d = <div xxxx="val"></div>;
+var e = <div xxxxx="val"></div>;
+
+
+//// [tsxReactEmit7.js]
+var m = React.createElement("div", {"x-y": "val"});
+var n = React.createElement("div", {"xx-y": "val"});
+var o = React.createElement("div", {"x-yy": "val"});
+var p = React.createElement("div", {"xx-yy": "val"});
+// Investigation
+var a = React.createElement("div", {x: "val"});
+var b = React.createElement("div", {xx: "val"});
+var c = React.createElement("div", {xxx: "val"});
+var d = React.createElement("div", {xxxx: "val"});
+var e = React.createElement("div", {xxxxx: "val"});
diff --git a/tests/baselines/reference/typeAliasDeclareKeyword01.d.symbols b/tests/baselines/reference/typeAliasDeclareKeyword01.d.symbols
new file mode 100644
index 00000000000..86c1ae8f40c
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclareKeyword01.d.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/typeAliasDeclareKeyword01.d.ts ===
+type Foo = number;
+>Foo : Symbol(Foo, Decl(typeAliasDeclareKeyword01.d.ts, 0, 0))
+
+declare type Bar = string;
+>Bar : Symbol(Bar, Decl(typeAliasDeclareKeyword01.d.ts, 0, 18))
+
diff --git a/tests/baselines/reference/typeAliasDeclareKeyword01.d.types b/tests/baselines/reference/typeAliasDeclareKeyword01.d.types
new file mode 100644
index 00000000000..588fdd9012c
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclareKeyword01.d.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/typeAliasDeclareKeyword01.d.ts ===
+type Foo = number;
+>Foo : number
+
+declare type Bar = string;
+>Bar : string
+
diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt
new file mode 100644
index 00000000000..49f17e7891d
--- /dev/null
+++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt
@@ -0,0 +1,212 @@
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(37,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(38,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(39,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(40,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(41,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(44,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(45,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(46,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(47,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,52): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(61,5): error TS2322: Type 'string' is not assignable to type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(63,5): error TS2322: Type 'string' is not assignable to type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'.
+  Type '"World"' is not assignable to type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'.
+  Type '"World"' is not assignable to type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,43): error TS2345: Argument of type '"Hello"' is not assignable to parameter of type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,52): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
+  Type 'string' is not assignable to type '"World"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(100,25): error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'.
+  Type '"World"' is not assignable to type '"Hello"'.
+tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(104,25): error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'.
+  Type '"World"' is not assignable to type '"Hello"'.
+
+
+==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (25 errors) ====
+    
+    declare function randBool(): boolean;
+    declare function takeReturnString(str: string): string;
+    declare function takeReturnHello(str: "Hello"): "Hello";
+                     ~~~~~~~~~~~~~~~
+!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
+    declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World";
+    
+    function fun1<T>(x: T, y: T) {
+        return randBool() ? x : y;
+    }
+    
+    function fun2<T, U>(x: T, y: U) {
+        return randBool() ? x : y;
+    }
+    
+    function fun3<T>(...args: T[]): T {
+        return args[+randBool()];
+    }
+    
+    namespace n1 {
+        // The following should all come back as strings.
+        // They should be assignable to/from something of a type 'string'.
+        // They should not be assignable to either "Hello" or "World".
+        export let a = fun1("Hello", "World");
+        export let b = fun1("Hello", "Hello");
+        export let c = fun2("Hello", "World");
+        export let d = fun2("Hello", "Hello");
+        export let e = fun3("Hello", "Hello", "World", "Foo");
+    
+        // Should be valid
+        a = takeReturnString(a);
+        b = takeReturnString(b);
+        c = takeReturnString(c);
+        d = takeReturnString(d);
+        e = takeReturnString(e);
+        
+        // Passing these as arguments should cause an error.
+        a = takeReturnHello(a);
+                            ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+        b = takeReturnHello(b);
+                            ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+        c = takeReturnHello(c);
+                            ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+        d = takeReturnHello(d);
+                            ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+        e = takeReturnHello(e);
+                            ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
+    
+        // Passing these as arguments should cause an error.
+        a = takeReturnHelloWorld(a);
+                                 ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
+        b = takeReturnHelloWorld(b);
+                                 ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
+        c = takeReturnHelloWorld(c);
+                                 ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
+        d = takeReturnHelloWorld(d);
+                                 ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
+        e = takeReturnHelloWorld(e);
+                                 ~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
+!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
+    }
+    
+    namespace n2 {
+        // The following (regardless of errors) should come back typed
+        // as "Hello" (or "Hello" | "Hello").
+        export let a = fun1<"Hello">("Hello", "Hello");
+        export let b = fun1<"Hello">("Hello", "World");
+                                              ~~~~~~~
+!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+        export let c = fun2<"Hello", "Hello">("Hello", "Hello");
+        export let d = fun2<"Hello", "Hello">("Hello", "World");
+                                                       ~~~~~~~
+!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+        export let e = fun3<"Hello">("Hello", "World");
+                                              ~~~~~~~
+!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+    
+        // Assignment from the returned value should cause an error.
+        a = takeReturnString(a);
+        ~
+!!! error TS2322: Type 'string' is not assignable to type '"Hello"'.
+        b = takeReturnString(b);
+        c = takeReturnString(c);
+        ~
+!!! error TS2322: Type 'string' is not assignable to type '"Hello"'.
+        d = takeReturnString(d);
+        e = takeReturnString(e);
+    
+        // Should be valid
+        a = takeReturnHello(a);
+        b = takeReturnHello(b);
+        c = takeReturnHello(c);
+        d = takeReturnHello(d);
+        e = takeReturnHello(e);
+    
+        // Assignment from the returned value should cause an error.
+        a = takeReturnHelloWorld(a);
+        ~
+!!! error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'.
+!!! error TS2322:   Type '"World"' is not assignable to type '"Hello"'.
+        b = takeReturnHelloWorld(b);
+        c = takeReturnHelloWorld(c);
+        ~
+!!! error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'.
+!!! error TS2322:   Type '"World"' is not assignable to type '"Hello"'.
+        d = takeReturnHelloWorld(d);
+        e = takeReturnHelloWorld(e);
+    }
+    
+    
+    namespace n3 {
+        // The following (regardless of errors) should come back typed
+        // as "Hello" | "World" (or "World" | "Hello").
+        export let a = fun2<"Hello", "World">("Hello", "World");
+        export let b = fun2<"Hello", "World">("World", "Hello");
+                                              ~~~~~~~
+!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+        export let c = fun2<"World", "Hello">("Hello", "Hello");
+                                              ~~~~~~~
+!!! error TS2345: Argument of type '"Hello"' is not assignable to parameter of type '"World"'.
+        export let d = fun2<"World", "Hello">("World", "World");
+                                                       ~~~~~~~
+!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
+        export let e = fun3<"Hello" | "World">("Hello", "World");
+    
+        // Assignment from the returned value should cause an error.
+        a = takeReturnString(a);
+        ~
+!!! error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
+!!! error TS2322:   Type 'string' is not assignable to type '"World"'.
+        b = takeReturnString(b);
+        c = takeReturnString(c);
+        d = takeReturnString(d);
+        e = takeReturnString(e);
+        ~
+!!! error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
+!!! error TS2322:   Type 'string' is not assignable to type '"World"'.
+    
+        // Passing these as arguments should cause an error.
+        a = takeReturnHello(a);
+                            ~
+!!! error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'.
+!!! error TS2345:   Type '"World"' is not assignable to type '"Hello"'.
+        b = takeReturnHello(b);
+        c = takeReturnHello(c);
+        d = takeReturnHello(d);
+        e = takeReturnHello(e);
+                            ~
+!!! error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'.
+!!! error TS2345:   Type '"World"' is not assignable to type '"Hello"'.
+    
+        // Both should be valid.
+        a = takeReturnHelloWorld(a);
+        b = takeReturnHelloWorld(b);
+        c = takeReturnHelloWorld(c);
+        d = takeReturnHelloWorld(d);
+        e = takeReturnHelloWorld(e);
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
new file mode 100644
index 00000000000..c07dd225396
--- /dev/null
+++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
@@ -0,0 +1,244 @@
+//// [typeArgumentsWithStringLiteralTypes01.ts]
+
+declare function randBool(): boolean;
+declare function takeReturnString(str: string): string;
+declare function takeReturnHello(str: "Hello"): "Hello";
+declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World";
+
+function fun1<T>(x: T, y: T) {
+    return randBool() ? x : y;
+}
+
+function fun2<T, U>(x: T, y: U) {
+    return randBool() ? x : y;
+}
+
+function fun3<T>(...args: T[]): T {
+    return args[+randBool()];
+}
+
+namespace n1 {
+    // The following should all come back as strings.
+    // They should be assignable to/from something of a type 'string'.
+    // They should not be assignable to either "Hello" or "World".
+    export let a = fun1("Hello", "World");
+    export let b = fun1("Hello", "Hello");
+    export let c = fun2("Hello", "World");
+    export let d = fun2("Hello", "Hello");
+    export let e = fun3("Hello", "Hello", "World", "Foo");
+
+    // Should be valid
+    a = takeReturnString(a);
+    b = takeReturnString(b);
+    c = takeReturnString(c);
+    d = takeReturnString(d);
+    e = takeReturnString(e);
+    
+    // Passing these as arguments should cause an error.
+    a = takeReturnHello(a);
+    b = takeReturnHello(b);
+    c = takeReturnHello(c);
+    d = takeReturnHello(d);
+    e = takeReturnHello(e);
+
+    // Passing these as arguments should cause an error.
+    a = takeReturnHelloWorld(a);
+    b = takeReturnHelloWorld(b);
+    c = takeReturnHelloWorld(c);
+    d = takeReturnHelloWorld(d);
+    e = takeReturnHelloWorld(e);
+}
+
+namespace n2 {
+    // The following (regardless of errors) should come back typed
+    // as "Hello" (or "Hello" | "Hello").
+    export let a = fun1<"Hello">("Hello", "Hello");
+    export let b = fun1<"Hello">("Hello", "World");
+    export let c = fun2<"Hello", "Hello">("Hello", "Hello");
+    export let d = fun2<"Hello", "Hello">("Hello", "World");
+    export let e = fun3<"Hello">("Hello", "World");
+
+    // Assignment from the returned value should cause an error.
+    a = takeReturnString(a);
+    b = takeReturnString(b);
+    c = takeReturnString(c);
+    d = takeReturnString(d);
+    e = takeReturnString(e);
+
+    // Should be valid
+    a = takeReturnHello(a);
+    b = takeReturnHello(b);
+    c = takeReturnHello(c);
+    d = takeReturnHello(d);
+    e = takeReturnHello(e);
+
+    // Assignment from the returned value should cause an error.
+    a = takeReturnHelloWorld(a);
+    b = takeReturnHelloWorld(b);
+    c = takeReturnHelloWorld(c);
+    d = takeReturnHelloWorld(d);
+    e = takeReturnHelloWorld(e);
+}
+
+
+namespace n3 {
+    // The following (regardless of errors) should come back typed
+    // as "Hello" | "World" (or "World" | "Hello").
+    export let a = fun2<"Hello", "World">("Hello", "World");
+    export let b = fun2<"Hello", "World">("World", "Hello");
+    export let c = fun2<"World", "Hello">("Hello", "Hello");
+    export let d = fun2<"World", "Hello">("World", "World");
+    export let e = fun3<"Hello" | "World">("Hello", "World");
+
+    // Assignment from the returned value should cause an error.
+    a = takeReturnString(a);
+    b = takeReturnString(b);
+    c = takeReturnString(c);
+    d = takeReturnString(d);
+    e = takeReturnString(e);
+
+    // Passing these as arguments should cause an error.
+    a = takeReturnHello(a);
+    b = takeReturnHello(b);
+    c = takeReturnHello(c);
+    d = takeReturnHello(d);
+    e = takeReturnHello(e);
+
+    // Both should be valid.
+    a = takeReturnHelloWorld(a);
+    b = takeReturnHelloWorld(b);
+    c = takeReturnHelloWorld(c);
+    d = takeReturnHelloWorld(d);
+    e = takeReturnHelloWorld(e);
+}
+
+//// [typeArgumentsWithStringLiteralTypes01.js]
+function fun1(x, y) {
+    return randBool() ? x : y;
+}
+function fun2(x, y) {
+    return randBool() ? x : y;
+}
+function fun3() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i - 0] = arguments[_i];
+    }
+    return args[+randBool()];
+}
+var n1;
+(function (n1) {
+    // The following should all come back as strings.
+    // They should be assignable to/from something of a type 'string'.
+    // They should not be assignable to either "Hello" or "World".
+    n1.a = fun1("Hello", "World");
+    n1.b = fun1("Hello", "Hello");
+    n1.c = fun2("Hello", "World");
+    n1.d = fun2("Hello", "Hello");
+    n1.e = fun3("Hello", "Hello", "World", "Foo");
+    // Should be valid
+    n1.a = takeReturnString(n1.a);
+    n1.b = takeReturnString(n1.b);
+    n1.c = takeReturnString(n1.c);
+    n1.d = takeReturnString(n1.d);
+    n1.e = takeReturnString(n1.e);
+    // Passing these as arguments should cause an error.
+    n1.a = takeReturnHello(n1.a);
+    n1.b = takeReturnHello(n1.b);
+    n1.c = takeReturnHello(n1.c);
+    n1.d = takeReturnHello(n1.d);
+    n1.e = takeReturnHello(n1.e);
+    // Passing these as arguments should cause an error.
+    n1.a = takeReturnHelloWorld(n1.a);
+    n1.b = takeReturnHelloWorld(n1.b);
+    n1.c = takeReturnHelloWorld(n1.c);
+    n1.d = takeReturnHelloWorld(n1.d);
+    n1.e = takeReturnHelloWorld(n1.e);
+})(n1 || (n1 = {}));
+var n2;
+(function (n2) {
+    // The following (regardless of errors) should come back typed
+    // as "Hello" (or "Hello" | "Hello").
+    n2.a = fun1("Hello", "Hello");
+    n2.b = fun1("Hello", "World");
+    n2.c = fun2("Hello", "Hello");
+    n2.d = fun2("Hello", "World");
+    n2.e = fun3("Hello", "World");
+    // Assignment from the returned value should cause an error.
+    n2.a = takeReturnString(n2.a);
+    n2.b = takeReturnString(n2.b);
+    n2.c = takeReturnString(n2.c);
+    n2.d = takeReturnString(n2.d);
+    n2.e = takeReturnString(n2.e);
+    // Should be valid
+    n2.a = takeReturnHello(n2.a);
+    n2.b = takeReturnHello(n2.b);
+    n2.c = takeReturnHello(n2.c);
+    n2.d = takeReturnHello(n2.d);
+    n2.e = takeReturnHello(n2.e);
+    // Assignment from the returned value should cause an error.
+    n2.a = takeReturnHelloWorld(n2.a);
+    n2.b = takeReturnHelloWorld(n2.b);
+    n2.c = takeReturnHelloWorld(n2.c);
+    n2.d = takeReturnHelloWorld(n2.d);
+    n2.e = takeReturnHelloWorld(n2.e);
+})(n2 || (n2 = {}));
+var n3;
+(function (n3) {
+    // The following (regardless of errors) should come back typed
+    // as "Hello" | "World" (or "World" | "Hello").
+    n3.a = fun2("Hello", "World");
+    n3.b = fun2("World", "Hello");
+    n3.c = fun2("Hello", "Hello");
+    n3.d = fun2("World", "World");
+    n3.e = fun3("Hello", "World");
+    // Assignment from the returned value should cause an error.
+    n3.a = takeReturnString(n3.a);
+    n3.b = takeReturnString(n3.b);
+    n3.c = takeReturnString(n3.c);
+    n3.d = takeReturnString(n3.d);
+    n3.e = takeReturnString(n3.e);
+    // Passing these as arguments should cause an error.
+    n3.a = takeReturnHello(n3.a);
+    n3.b = takeReturnHello(n3.b);
+    n3.c = takeReturnHello(n3.c);
+    n3.d = takeReturnHello(n3.d);
+    n3.e = takeReturnHello(n3.e);
+    // Both should be valid.
+    n3.a = takeReturnHelloWorld(n3.a);
+    n3.b = takeReturnHelloWorld(n3.b);
+    n3.c = takeReturnHelloWorld(n3.c);
+    n3.d = takeReturnHelloWorld(n3.d);
+    n3.e = takeReturnHelloWorld(n3.e);
+})(n3 || (n3 = {}));
+
+
+//// [typeArgumentsWithStringLiteralTypes01.d.ts]
+declare function randBool(): boolean;
+declare function takeReturnString(str: string): string;
+declare function takeReturnHello(str: "Hello"): "Hello";
+declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World";
+declare function fun1<T>(x: T, y: T): T;
+declare function fun2<T, U>(x: T, y: U): T | U;
+declare function fun3<T>(...args: T[]): T;
+declare namespace n1 {
+    let a: string;
+    let b: string;
+    let c: string;
+    let d: string;
+    let e: string;
+}
+declare namespace n2 {
+    let a: "Hello";
+    let b: any;
+    let c: "Hello";
+    let d: any;
+    let e: any;
+}
+declare namespace n3 {
+    let a: "Hello" | "World";
+    let b: any;
+    let c: any;
+    let d: any;
+    let e: "Hello" | "World";
+}
diff --git a/tests/baselines/reference/typeCheckTypeArgument.errors.txt b/tests/baselines/reference/typeCheckTypeArgument.errors.txt
index bf3e8bfdb9b..1452a2d4deb 100644
--- a/tests/baselines/reference/typeCheckTypeArgument.errors.txt
+++ b/tests/baselines/reference/typeCheckTypeArgument.errors.txt
@@ -1,29 +1,12 @@
-error TS2318: Cannot find global type 'Array'.
-error TS2318: Cannot find global type 'Boolean'.
-error TS2318: Cannot find global type 'Function'.
-error TS2318: Cannot find global type 'IArguments'.
-error TS2318: Cannot find global type 'Number'.
-error TS2318: Cannot find global type 'Object'.
-error TS2318: Cannot find global type 'RegExp'.
-error TS2318: Cannot find global type 'String'.
-tests/cases/compiler/typeCheckTypeArgument.ts(3,19): error TS2304: Cannot find name 'UNKNOWN'.
-tests/cases/compiler/typeCheckTypeArgument.ts(5,26): error TS2304: Cannot find name 'UNKNOWN'.
-tests/cases/compiler/typeCheckTypeArgument.ts(7,21): error TS2304: Cannot find name 'UNKNOWN'.
-tests/cases/compiler/typeCheckTypeArgument.ts(9,24): error TS2304: Cannot find name 'UNKNOWN'.
-tests/cases/compiler/typeCheckTypeArgument.ts(12,22): error TS2304: Cannot find name 'UNKNOWN'.
-tests/cases/compiler/typeCheckTypeArgument.ts(15,13): error TS2304: Cannot find name 'UNKNOWN'.
+tests/cases/compiler/typeCheckTypeArgument.ts(2,19): error TS2304: Cannot find name 'UNKNOWN'.
+tests/cases/compiler/typeCheckTypeArgument.ts(4,26): error TS2304: Cannot find name 'UNKNOWN'.
+tests/cases/compiler/typeCheckTypeArgument.ts(6,21): error TS2304: Cannot find name 'UNKNOWN'.
+tests/cases/compiler/typeCheckTypeArgument.ts(8,24): error TS2304: Cannot find name 'UNKNOWN'.
+tests/cases/compiler/typeCheckTypeArgument.ts(11,22): error TS2304: Cannot find name 'UNKNOWN'.
+tests/cases/compiler/typeCheckTypeArgument.ts(14,13): error TS2304: Cannot find name 'UNKNOWN'.
 
 
-!!! error TS2318: Cannot find global type 'Array'.
-!!! error TS2318: Cannot find global type 'Boolean'.
-!!! error TS2318: Cannot find global type 'Function'.
-!!! error TS2318: Cannot find global type 'IArguments'.
-!!! error TS2318: Cannot find global type 'Number'.
-!!! error TS2318: Cannot find global type 'Object'.
-!!! error TS2318: Cannot find global type 'RegExp'.
-!!! error TS2318: Cannot find global type 'String'.
 ==== tests/cases/compiler/typeCheckTypeArgument.ts (6 errors) ====
-    /// <reference no-default-lib="true"/>
     
     var f: <T extends UNKNOWN>() => void;
                       ~~~~~~~
diff --git a/tests/baselines/reference/typeCheckTypeArgument.js b/tests/baselines/reference/typeCheckTypeArgument.js
index bec33393f92..633eb75ed91 100644
--- a/tests/baselines/reference/typeCheckTypeArgument.js
+++ b/tests/baselines/reference/typeCheckTypeArgument.js
@@ -1,5 +1,4 @@
 //// [typeCheckTypeArgument.ts]
-/// <reference no-default-lib="true"/>
 
 var f: <T extends UNKNOWN>() => void;
 
@@ -16,7 +15,6 @@ class Foo2 {
 (<T extends UNKNOWN>(a) => { });
 
 //// [typeCheckTypeArgument.js]
-/// <reference no-default-lib="true"/>
 var f;
 var Foo = (function () {
     function Foo() {
diff --git a/tests/baselines/reference/typeGuardEnums.js b/tests/baselines/reference/typeGuardEnums.js
new file mode 100644
index 00000000000..1eb4b7552c4
--- /dev/null
+++ b/tests/baselines/reference/typeGuardEnums.js
@@ -0,0 +1,41 @@
+//// [typeGuardEnums.ts]
+enum E {}
+enum V {}
+
+let x: number|string|E|V;
+
+if (typeof x === "number") {
+    x; // number|E|V
+}
+else {
+    x; // string
+}
+
+if (typeof x !== "number") {
+    x; // string
+}
+else {
+    x; // number|E|V
+}
+
+
+//// [typeGuardEnums.js]
+var E;
+(function (E) {
+})(E || (E = {}));
+var V;
+(function (V) {
+})(V || (V = {}));
+var x;
+if (typeof x === "number") {
+    x; // number|E|V
+}
+else {
+    x; // string
+}
+if (typeof x !== "number") {
+    x; // string
+}
+else {
+    x; // number|E|V
+}
diff --git a/tests/baselines/reference/typeGuardEnums.symbols b/tests/baselines/reference/typeGuardEnums.symbols
new file mode 100644
index 00000000000..8f1a396c481
--- /dev/null
+++ b/tests/baselines/reference/typeGuardEnums.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts ===
+enum E {}
+>E : Symbol(E, Decl(typeGuardEnums.ts, 0, 0))
+
+enum V {}
+>V : Symbol(V, Decl(typeGuardEnums.ts, 0, 9))
+
+let x: number|string|E|V;
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+>E : Symbol(E, Decl(typeGuardEnums.ts, 0, 0))
+>V : Symbol(V, Decl(typeGuardEnums.ts, 0, 9))
+
+if (typeof x === "number") {
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+
+    x; // number|E|V
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+}
+else {
+    x; // string
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+}
+
+if (typeof x !== "number") {
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+
+    x; // string
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+}
+else {
+    x; // number|E|V
+>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3))
+}
+
diff --git a/tests/baselines/reference/typeGuardEnums.types b/tests/baselines/reference/typeGuardEnums.types
new file mode 100644
index 00000000000..1d39a81d78a
--- /dev/null
+++ b/tests/baselines/reference/typeGuardEnums.types
@@ -0,0 +1,40 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts ===
+enum E {}
+>E : E
+
+enum V {}
+>V : V
+
+let x: number|string|E|V;
+>x : number | string | E | V
+>E : E
+>V : V
+
+if (typeof x === "number") {
+>typeof x === "number" : boolean
+>typeof x : string
+>x : number | string | E | V
+>"number" : string
+
+    x; // number|E|V
+>x : number | E | V
+}
+else {
+    x; // string
+>x : string
+}
+
+if (typeof x !== "number") {
+>typeof x !== "number" : boolean
+>typeof x : string
+>x : number | string | E | V
+>"number" : string
+
+    x; // string
+>x : string
+}
+else {
+    x; // number|E|V
+>x : number | E | V
+}
+
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
index b178b02c6b4..92d9d21f0cc 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
@@ -9,6 +9,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(38,51)
   Property 'propA' is missing in type 'B'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(42,56): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(46,56): error TS2322: Type 'T[]' is not assignable to type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(50,1): error TS7027: Unreachable code detected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(60,7): error TS2339: Property 'propB' does not exist on type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(65,7): error TS2339: Property 'propB' does not exist on type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(70,7): error TS2339: Property 'propB' does not exist on type 'A'.
@@ -25,6 +26,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(96,9):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(97,16): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,20): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2322: Type 'boolean' is not assignable to type 'D'.
+  Property 'm1' is missing in type 'Boolean'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(107,20): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(110,20): error TS1228: A type predicate is only allowed in return type position for functions and methods.
@@ -37,7 +40,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(133,34
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39): error TS1230: A type predicate cannot reference element 'p1' in a binding pattern.
 
 
-==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (31 errors) ====
+==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (33 errors) ====
     
     class A {
         propA: number;
@@ -109,6 +112,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
     }
     
     let a: A;
+    ~~~
+!!! error TS7027: Unreachable code detected.
     let b: B;
     
     declare function isB(p1): p1 is B;
@@ -192,6 +197,9 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
 !!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
             return true;
                    ~~~~
+!!! error TS2322: Type 'boolean' is not assignable to type 'D'.
+!!! error TS2322:   Property 'm1' is missing in type 'Boolean'.
+                   ~~~~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }
         get m1(p1: A): p1 is C {
diff --git a/tests/baselines/reference/typeGuardInClass.js b/tests/baselines/reference/typeGuardInClass.js
new file mode 100644
index 00000000000..0ce25a7c11c
--- /dev/null
+++ b/tests/baselines/reference/typeGuardInClass.js
@@ -0,0 +1,37 @@
+//// [typeGuardInClass.ts]
+let x: string | number;
+
+if (typeof x === "string") {
+    let n = class {
+        constructor() {
+            let y: string = x;
+        }
+    }
+}
+else {
+    let m = class {
+        constructor() {
+            let y: number = x;
+        }
+    }
+}
+
+
+//// [typeGuardInClass.js]
+var x;
+if (typeof x === "string") {
+    var n = (function () {
+        function class_1() {
+            var y = x;
+        }
+        return class_1;
+    })();
+}
+else {
+    var m = (function () {
+        function class_2() {
+            var y = x;
+        }
+        return class_2;
+    })();
+}
diff --git a/tests/baselines/reference/typeGuardInClass.symbols b/tests/baselines/reference/typeGuardInClass.symbols
new file mode 100644
index 00000000000..cc0e745e4de
--- /dev/null
+++ b/tests/baselines/reference/typeGuardInClass.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts ===
+let x: string | number;
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+
+if (typeof x === "string") {
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+
+    let n = class {
+>n : Symbol(n, Decl(typeGuardInClass.ts, 3, 7))
+
+        constructor() {
+            let y: string = x;
+>y : Symbol(y, Decl(typeGuardInClass.ts, 5, 15))
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+        }
+    }
+}
+else {
+    let m = class {
+>m : Symbol(m, Decl(typeGuardInClass.ts, 10, 7))
+
+        constructor() {
+            let y: number = x;
+>y : Symbol(y, Decl(typeGuardInClass.ts, 12, 15))
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/typeGuardInClass.types b/tests/baselines/reference/typeGuardInClass.types
new file mode 100644
index 00000000000..93fe9f28c5e
--- /dev/null
+++ b/tests/baselines/reference/typeGuardInClass.types
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts ===
+let x: string | number;
+>x : string | number
+
+if (typeof x === "string") {
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string | number
+>"string" : string
+
+    let n = class {
+>n : typeof (Anonymous class)
+>class {        constructor() {            let y: string = x;        }    } : typeof (Anonymous class)
+
+        constructor() {
+            let y: string = x;
+>y : string
+>x : string
+        }
+    }
+}
+else {
+    let m = class {
+>m : typeof (Anonymous class)
+>class {        constructor() {            let y: number = x;        }    } : typeof (Anonymous class)
+
+        constructor() {
+            let y: number = x;
+>y : number
+>x : number
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/typeGuardNesting.js b/tests/baselines/reference/typeGuardNesting.js
new file mode 100644
index 00000000000..364653d0273
--- /dev/null
+++ b/tests/baselines/reference/typeGuardNesting.js
@@ -0,0 +1,31 @@
+//// [typeGuardNesting.ts]
+let strOrBool: string|boolean;
+if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') {
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+}
+
+if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') {
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+}
+
+
+//// [typeGuardNesting.js]
+var strOrBool;
+if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') {
+    var label = (typeof strOrBool === 'string') ? strOrBool : "string";
+    var bool = (typeof strOrBool === 'boolean') ? strOrBool : false;
+    var label2 = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+    var bool2 = (typeof strOrBool !== 'string') ? strOrBool : false;
+}
+if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') {
+    var label = (typeof strOrBool === 'string') ? strOrBool : "string";
+    var bool = (typeof strOrBool === 'boolean') ? strOrBool : false;
+    var label2 = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+    var bool2 = (typeof strOrBool !== 'string') ? strOrBool : false;
+}
diff --git a/tests/baselines/reference/typeGuardNesting.symbols b/tests/baselines/reference/typeGuardNesting.symbols
new file mode 100644
index 00000000000..427db81f3ed
--- /dev/null
+++ b/tests/baselines/reference/typeGuardNesting.symbols
@@ -0,0 +1,56 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts ===
+let strOrBool: string|boolean;
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') {
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+>label : Symbol(label, Decl(typeGuardNesting.ts, 2, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+>bool : Symbol(bool, Decl(typeGuardNesting.ts, 3, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+>label2 : Symbol(label2, Decl(typeGuardNesting.ts, 4, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+>bool2 : Symbol(bool2, Decl(typeGuardNesting.ts, 5, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+}
+
+if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') {
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+>label : Symbol(label, Decl(typeGuardNesting.ts, 9, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+>bool : Symbol(bool, Decl(typeGuardNesting.ts, 10, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+>label2 : Symbol(label2, Decl(typeGuardNesting.ts, 11, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+>bool2 : Symbol(bool2, Decl(typeGuardNesting.ts, 12, 4))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3))
+}
+
diff --git a/tests/baselines/reference/typeGuardNesting.types b/tests/baselines/reference/typeGuardNesting.types
new file mode 100644
index 00000000000..255e96da89e
--- /dev/null
+++ b/tests/baselines/reference/typeGuardNesting.types
@@ -0,0 +1,124 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts ===
+let strOrBool: string|boolean;
+>strOrBool : string | boolean
+
+if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') {
+>(typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string' : boolean
+>(typeof strOrBool === 'boolean' && !strOrBool) : boolean
+>typeof strOrBool === 'boolean' && !strOrBool : boolean
+>typeof strOrBool === 'boolean' : boolean
+>typeof strOrBool : string
+>strOrBool : string | boolean
+>'boolean' : string
+>!strOrBool : boolean
+>strOrBool : boolean
+>typeof strOrBool === 'string' : boolean
+>typeof strOrBool : string
+>strOrBool : string | boolean
+>'string' : string
+
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+>label : string
+>(typeof strOrBool === 'string') ? strOrBool : "string" : string
+>(typeof strOrBool === 'string') : boolean
+>typeof strOrBool === 'string' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'string' : string
+>strOrBool : string
+>"string" : string
+
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+>bool : boolean
+>(typeof strOrBool === 'boolean') ? strOrBool : false : boolean
+>(typeof strOrBool === 'boolean') : boolean
+>typeof strOrBool === 'boolean' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'boolean' : string
+>strOrBool : boolean
+>false : boolean
+
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+>label2 : string
+>(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string
+>(typeof strOrBool !== 'boolean') : boolean
+>typeof strOrBool !== 'boolean' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'boolean' : string
+>strOrBool : string
+>"string" : string
+
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+>bool2 : boolean
+>(typeof strOrBool !== 'string') ? strOrBool : false : boolean
+>(typeof strOrBool !== 'string') : boolean
+>typeof strOrBool !== 'string' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'string' : string
+>strOrBool : boolean
+>false : boolean
+}
+
+if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') {
+>(typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean' : boolean
+>(typeof strOrBool !== 'string' && !strOrBool) : boolean
+>typeof strOrBool !== 'string' && !strOrBool : boolean
+>typeof strOrBool !== 'string' : boolean
+>typeof strOrBool : string
+>strOrBool : string | boolean
+>'string' : string
+>!strOrBool : boolean
+>strOrBool : boolean
+>typeof strOrBool !== 'boolean' : boolean
+>typeof strOrBool : string
+>strOrBool : string | boolean
+>'boolean' : string
+
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+>label : string
+>(typeof strOrBool === 'string') ? strOrBool : "string" : string
+>(typeof strOrBool === 'string') : boolean
+>typeof strOrBool === 'string' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'string' : string
+>strOrBool : string
+>"string" : string
+
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+>bool : boolean
+>(typeof strOrBool === 'boolean') ? strOrBool : false : boolean
+>(typeof strOrBool === 'boolean') : boolean
+>typeof strOrBool === 'boolean' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'boolean' : string
+>strOrBool : boolean
+>false : boolean
+
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+>label2 : string
+>(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string
+>(typeof strOrBool !== 'boolean') : boolean
+>typeof strOrBool !== 'boolean' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'boolean' : string
+>strOrBool : string
+>"string" : string
+
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+>bool2 : boolean
+>(typeof strOrBool !== 'string') ? strOrBool : false : boolean
+>(typeof strOrBool !== 'string') : boolean
+>typeof strOrBool !== 'string' : boolean
+>typeof strOrBool : string
+>strOrBool : boolean | string
+>'string' : string
+>strOrBool : boolean
+>false : boolean
+}
+
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.js b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
index cab04365c19..1431b4b9c60 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -14,21 +14,58 @@ class C2 {
 class D1 extends C1 {
     p3: number;
 }
+class C3 {
+    p4: number;
+}
 var str: string;
 var num: number;
 var strOrNum: string | number;
 
-var c1Orc2: C1 | C2;
-str = c1Orc2 instanceof C1 && c1Orc2.p1; // C1
-num = c1Orc2 instanceof C2 && c1Orc2.p2; // C2
-str = c1Orc2 instanceof D1 && c1Orc2.p1; // D1
-num = c1Orc2 instanceof D1 && c1Orc2.p3; // D1
+var ctor1: C1 | C2;
+str = ctor1 instanceof C1 && ctor1.p1; // C1
+num = ctor1 instanceof C2 && ctor1.p2; // C2
+str = ctor1 instanceof D1 && ctor1.p1; // D1
+num = ctor1 instanceof D1 && ctor1.p3; // D1
 
-var c2Ord1: C2 | D1;
-num = c2Ord1 instanceof C2 && c2Ord1.p2; // C2
-num = c2Ord1 instanceof D1 && c2Ord1.p3; // D1
-str = c2Ord1 instanceof D1 && c2Ord1.p1; // D1
-var r2: D1 | C2 = c2Ord1 instanceof C1 && c2Ord1; // C2 | D1
+var ctor2: C2 | D1;
+num = ctor2 instanceof C2 && ctor2.p2; // C2
+num = ctor2 instanceof D1 && ctor2.p3; // D1
+str = ctor2 instanceof D1 && ctor2.p1; // D1
+var r2: D1 | C2 = ctor2 instanceof C1 && ctor2; // C2 | D1
+
+var ctor3: C1 | C2;
+if (ctor3 instanceof C1) {
+    ctor3.p1; // C1
+}
+else {
+    ctor3.p2; // C2
+}
+
+var ctor4: C1 | C2 | C3;
+if (ctor4 instanceof C1) {
+    ctor4.p1; // C1
+}
+else if (ctor4 instanceof C2) {
+    ctor4.p2; // C2
+}
+else {
+    ctor4.p4; // C3
+}
+
+var ctor5: C1 | D1 | C2;
+if (ctor5 instanceof C1) {
+    ctor5.p1; // C1
+}
+else {
+    ctor5.p2; // C2
+}
+
+var ctor6: C1 | C2 | C3;
+if (ctor6 instanceof C1 || ctor6 instanceof C2) {
+}
+else {
+    ctor6.p4; // C3
+}
 
 //// [typeGuardOfFormInstanceOf.js]
 // A type guard of the form x instanceof C, where C is of a subtype of the global type 'Function' 
@@ -58,16 +95,51 @@ var D1 = (function (_super) {
     }
     return D1;
 })(C1);
+var C3 = (function () {
+    function C3() {
+    }
+    return C3;
+})();
 var str;
 var num;
 var strOrNum;
-var c1Orc2;
-str = c1Orc2 instanceof C1 && c1Orc2.p1; // C1
-num = c1Orc2 instanceof C2 && c1Orc2.p2; // C2
-str = c1Orc2 instanceof D1 && c1Orc2.p1; // D1
-num = c1Orc2 instanceof D1 && c1Orc2.p3; // D1
-var c2Ord1;
-num = c2Ord1 instanceof C2 && c2Ord1.p2; // C2
-num = c2Ord1 instanceof D1 && c2Ord1.p3; // D1
-str = c2Ord1 instanceof D1 && c2Ord1.p1; // D1
-var r2 = c2Ord1 instanceof C1 && c2Ord1; // C2 | D1
+var ctor1;
+str = ctor1 instanceof C1 && ctor1.p1; // C1
+num = ctor1 instanceof C2 && ctor1.p2; // C2
+str = ctor1 instanceof D1 && ctor1.p1; // D1
+num = ctor1 instanceof D1 && ctor1.p3; // D1
+var ctor2;
+num = ctor2 instanceof C2 && ctor2.p2; // C2
+num = ctor2 instanceof D1 && ctor2.p3; // D1
+str = ctor2 instanceof D1 && ctor2.p1; // D1
+var r2 = ctor2 instanceof C1 && ctor2; // C2 | D1
+var ctor3;
+if (ctor3 instanceof C1) {
+    ctor3.p1; // C1
+}
+else {
+    ctor3.p2; // C2
+}
+var ctor4;
+if (ctor4 instanceof C1) {
+    ctor4.p1; // C1
+}
+else if (ctor4 instanceof C2) {
+    ctor4.p2; // C2
+}
+else {
+    ctor4.p4; // C3
+}
+var ctor5;
+if (ctor5 instanceof C1) {
+    ctor5.p1; // C1
+}
+else {
+    ctor5.p2; // C2
+}
+var ctor6;
+if (ctor6 instanceof C1 || ctor6 instanceof C2) {
+}
+else {
+    ctor6.p4; // C3
+}
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols b/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols
index 7a48d87e963..0dd2844f6ad 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols
@@ -24,86 +24,184 @@ class D1 extends C1 {
     p3: number;
 >p3 : Symbol(p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
 }
+class C3 {
+>C3 : Symbol(C3, Decl(typeGuardOfFormInstanceOf.ts, 14, 1))
+
+    p4: number;
+>p4 : Symbol(p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
+}
 var str: string;
->str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 15, 3))
+>str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 18, 3))
 
 var num: number;
->num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 16, 3))
+>num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
 
 var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormInstanceOf.ts, 17, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormInstanceOf.ts, 20, 3))
 
-var c1Orc2: C1 | C2;
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+var ctor1: C1 | C2;
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
 
-str = c1Orc2 instanceof C1 && c1Orc2.p1; // C1
->str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 15, 3))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+str = ctor1 instanceof C1 && ctor1.p1; // C1
+>str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 18, 3))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
->c1Orc2.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor1.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
 
-num = c1Orc2 instanceof C2 && c1Orc2.p2; // C2
->num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 16, 3))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+num = ctor1 instanceof C2 && ctor1.p2; // C2
+>num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
->c1Orc2.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor1.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
 
-str = c1Orc2 instanceof D1 && c1Orc2.p1; // D1
->str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 15, 3))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+str = ctor1 instanceof D1 && ctor1.p1; // D1
+>str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 18, 3))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
->c1Orc2.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor1.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
 
-num = c1Orc2 instanceof D1 && c1Orc2.p3; // D1
->num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 16, 3))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+num = ctor1 instanceof D1 && ctor1.p3; // D1
+>num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
->c1Orc2.p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
->c1Orc2 : Symbol(c1Orc2, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor1.p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
+>ctor1 : Symbol(ctor1, Decl(typeGuardOfFormInstanceOf.ts, 22, 3))
 >p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
 
-var c2Ord1: C2 | D1;
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+var ctor2: C2 | D1;
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
 
-num = c2Ord1 instanceof C2 && c2Ord1.p2; // C2
->num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 16, 3))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+num = ctor2 instanceof C2 && ctor2.p2; // C2
+>num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
->c2Ord1.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+>ctor2.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
 
-num = c2Ord1 instanceof D1 && c2Ord1.p3; // D1
->num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 16, 3))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+num = ctor2 instanceof D1 && ctor2.p3; // D1
+>num : Symbol(num, Decl(typeGuardOfFormInstanceOf.ts, 19, 3))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
->c2Ord1.p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+>ctor2.p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
 
-str = c2Ord1 instanceof D1 && c2Ord1.p1; // D1
->str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 15, 3))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+str = ctor2 instanceof D1 && ctor2.p1; // D1
+>str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 18, 3))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
->c2Ord1.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+>ctor2.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
 
-var r2: D1 | C2 = c2Ord1 instanceof C1 && c2Ord1; // C2 | D1
->r2 : Symbol(r2, Decl(typeGuardOfFormInstanceOf.ts, 29, 3))
+var r2: D1 | C2 = ctor2 instanceof C1 && ctor2; // C2 | D1
+>r2 : Symbol(r2, Decl(typeGuardOfFormInstanceOf.ts, 32, 3))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
->c2Ord1 : Symbol(c2Ord1, Decl(typeGuardOfFormInstanceOf.ts, 25, 3))
+>ctor2 : Symbol(ctor2, Decl(typeGuardOfFormInstanceOf.ts, 28, 3))
 
+var ctor3: C1 | C2;
+>ctor3 : Symbol(ctor3, Decl(typeGuardOfFormInstanceOf.ts, 34, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+>C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
+
+if (ctor3 instanceof C1) {
+>ctor3 : Symbol(ctor3, Decl(typeGuardOfFormInstanceOf.ts, 34, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+
+    ctor3.p1; // C1
+>ctor3.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>ctor3 : Symbol(ctor3, Decl(typeGuardOfFormInstanceOf.ts, 34, 3))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+}
+else {
+    ctor3.p2; // C2
+>ctor3.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+>ctor3 : Symbol(ctor3, Decl(typeGuardOfFormInstanceOf.ts, 34, 3))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+}
+
+var ctor4: C1 | C2 | C3;
+>ctor4 : Symbol(ctor4, Decl(typeGuardOfFormInstanceOf.ts, 42, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+>C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
+>C3 : Symbol(C3, Decl(typeGuardOfFormInstanceOf.ts, 14, 1))
+
+if (ctor4 instanceof C1) {
+>ctor4 : Symbol(ctor4, Decl(typeGuardOfFormInstanceOf.ts, 42, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+
+    ctor4.p1; // C1
+>ctor4.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>ctor4 : Symbol(ctor4, Decl(typeGuardOfFormInstanceOf.ts, 42, 3))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+}
+else if (ctor4 instanceof C2) {
+>ctor4 : Symbol(ctor4, Decl(typeGuardOfFormInstanceOf.ts, 42, 3))
+>C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
+
+    ctor4.p2; // C2
+>ctor4.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+>ctor4 : Symbol(ctor4, Decl(typeGuardOfFormInstanceOf.ts, 42, 3))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+}
+else {
+    ctor4.p4; // C3
+>ctor4.p4 : Symbol(C3.p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
+>ctor4 : Symbol(ctor4, Decl(typeGuardOfFormInstanceOf.ts, 42, 3))
+>p4 : Symbol(C3.p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
+}
+
+var ctor5: C1 | D1 | C2;
+>ctor5 : Symbol(ctor5, Decl(typeGuardOfFormInstanceOf.ts, 53, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+>D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
+>C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
+
+if (ctor5 instanceof C1) {
+>ctor5 : Symbol(ctor5, Decl(typeGuardOfFormInstanceOf.ts, 53, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+
+    ctor5.p1; // C1
+>ctor5.p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>ctor5 : Symbol(ctor5, Decl(typeGuardOfFormInstanceOf.ts, 53, 3))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+}
+else {
+    ctor5.p2; // C2
+>ctor5.p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+>ctor5 : Symbol(ctor5, Decl(typeGuardOfFormInstanceOf.ts, 53, 3))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+}
+
+var ctor6: C1 | C2 | C3;
+>ctor6 : Symbol(ctor6, Decl(typeGuardOfFormInstanceOf.ts, 61, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+>C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
+>C3 : Symbol(C3, Decl(typeGuardOfFormInstanceOf.ts, 14, 1))
+
+if (ctor6 instanceof C1 || ctor6 instanceof C2) {
+>ctor6 : Symbol(ctor6, Decl(typeGuardOfFormInstanceOf.ts, 61, 3))
+>C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
+>ctor6 : Symbol(ctor6, Decl(typeGuardOfFormInstanceOf.ts, 61, 3))
+>C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
+}
+else {
+    ctor6.p4; // C3
+>ctor6.p4 : Symbol(C3.p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
+>ctor6 : Symbol(ctor6, Decl(typeGuardOfFormInstanceOf.ts, 61, 3))
+>p4 : Symbol(C3.p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
+}
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.types b/tests/baselines/reference/typeGuardOfFormInstanceOf.types
index c824e907733..6b83b57dcb5 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.types
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.types
@@ -24,6 +24,12 @@ class D1 extends C1 {
     p3: number;
 >p3 : number
 }
+class C3 {
+>C3 : C3
+
+    p4: number;
+>p4 : number
+}
 var str: string;
 >str : string
 
@@ -33,100 +39,199 @@ var num: number;
 var strOrNum: string | number;
 >strOrNum : string | number
 
-var c1Orc2: C1 | C2;
->c1Orc2 : C1 | C2
+var ctor1: C1 | C2;
+>ctor1 : C1 | C2
 >C1 : C1
 >C2 : C2
 
-str = c1Orc2 instanceof C1 && c1Orc2.p1; // C1
->str = c1Orc2 instanceof C1 && c1Orc2.p1 : string
+str = ctor1 instanceof C1 && ctor1.p1; // C1
+>str = ctor1 instanceof C1 && ctor1.p1 : string
 >str : string
->c1Orc2 instanceof C1 && c1Orc2.p1 : string
->c1Orc2 instanceof C1 : boolean
->c1Orc2 : C1 | C2
+>ctor1 instanceof C1 && ctor1.p1 : string
+>ctor1 instanceof C1 : boolean
+>ctor1 : C1 | C2
 >C1 : typeof C1
->c1Orc2.p1 : string
->c1Orc2 : C1
+>ctor1.p1 : string
+>ctor1 : C1
 >p1 : string
 
-num = c1Orc2 instanceof C2 && c1Orc2.p2; // C2
->num = c1Orc2 instanceof C2 && c1Orc2.p2 : number
+num = ctor1 instanceof C2 && ctor1.p2; // C2
+>num = ctor1 instanceof C2 && ctor1.p2 : number
 >num : number
->c1Orc2 instanceof C2 && c1Orc2.p2 : number
->c1Orc2 instanceof C2 : boolean
->c1Orc2 : C1 | C2
+>ctor1 instanceof C2 && ctor1.p2 : number
+>ctor1 instanceof C2 : boolean
+>ctor1 : C1 | C2
 >C2 : typeof C2
->c1Orc2.p2 : number
->c1Orc2 : C2
+>ctor1.p2 : number
+>ctor1 : C2
 >p2 : number
 
-str = c1Orc2 instanceof D1 && c1Orc2.p1; // D1
->str = c1Orc2 instanceof D1 && c1Orc2.p1 : string
+str = ctor1 instanceof D1 && ctor1.p1; // D1
+>str = ctor1 instanceof D1 && ctor1.p1 : string
 >str : string
->c1Orc2 instanceof D1 && c1Orc2.p1 : string
->c1Orc2 instanceof D1 : boolean
->c1Orc2 : C1 | C2
+>ctor1 instanceof D1 && ctor1.p1 : string
+>ctor1 instanceof D1 : boolean
+>ctor1 : C1 | C2
 >D1 : typeof D1
->c1Orc2.p1 : string
->c1Orc2 : D1
+>ctor1.p1 : string
+>ctor1 : D1
 >p1 : string
 
-num = c1Orc2 instanceof D1 && c1Orc2.p3; // D1
->num = c1Orc2 instanceof D1 && c1Orc2.p3 : number
+num = ctor1 instanceof D1 && ctor1.p3; // D1
+>num = ctor1 instanceof D1 && ctor1.p3 : number
 >num : number
->c1Orc2 instanceof D1 && c1Orc2.p3 : number
->c1Orc2 instanceof D1 : boolean
->c1Orc2 : C1 | C2
+>ctor1 instanceof D1 && ctor1.p3 : number
+>ctor1 instanceof D1 : boolean
+>ctor1 : C1 | C2
 >D1 : typeof D1
->c1Orc2.p3 : number
->c1Orc2 : D1
+>ctor1.p3 : number
+>ctor1 : D1
 >p3 : number
 
-var c2Ord1: C2 | D1;
->c2Ord1 : C2 | D1
+var ctor2: C2 | D1;
+>ctor2 : C2 | D1
 >C2 : C2
 >D1 : D1
 
-num = c2Ord1 instanceof C2 && c2Ord1.p2; // C2
->num = c2Ord1 instanceof C2 && c2Ord1.p2 : number
+num = ctor2 instanceof C2 && ctor2.p2; // C2
+>num = ctor2 instanceof C2 && ctor2.p2 : number
 >num : number
->c2Ord1 instanceof C2 && c2Ord1.p2 : number
->c2Ord1 instanceof C2 : boolean
->c2Ord1 : C2 | D1
+>ctor2 instanceof C2 && ctor2.p2 : number
+>ctor2 instanceof C2 : boolean
+>ctor2 : C2 | D1
 >C2 : typeof C2
->c2Ord1.p2 : number
->c2Ord1 : C2
+>ctor2.p2 : number
+>ctor2 : C2
 >p2 : number
 
-num = c2Ord1 instanceof D1 && c2Ord1.p3; // D1
->num = c2Ord1 instanceof D1 && c2Ord1.p3 : number
+num = ctor2 instanceof D1 && ctor2.p3; // D1
+>num = ctor2 instanceof D1 && ctor2.p3 : number
 >num : number
->c2Ord1 instanceof D1 && c2Ord1.p3 : number
->c2Ord1 instanceof D1 : boolean
->c2Ord1 : C2 | D1
+>ctor2 instanceof D1 && ctor2.p3 : number
+>ctor2 instanceof D1 : boolean
+>ctor2 : C2 | D1
 >D1 : typeof D1
->c2Ord1.p3 : number
->c2Ord1 : D1
+>ctor2.p3 : number
+>ctor2 : D1
 >p3 : number
 
-str = c2Ord1 instanceof D1 && c2Ord1.p1; // D1
->str = c2Ord1 instanceof D1 && c2Ord1.p1 : string
+str = ctor2 instanceof D1 && ctor2.p1; // D1
+>str = ctor2 instanceof D1 && ctor2.p1 : string
 >str : string
->c2Ord1 instanceof D1 && c2Ord1.p1 : string
->c2Ord1 instanceof D1 : boolean
->c2Ord1 : C2 | D1
+>ctor2 instanceof D1 && ctor2.p1 : string
+>ctor2 instanceof D1 : boolean
+>ctor2 : C2 | D1
 >D1 : typeof D1
->c2Ord1.p1 : string
->c2Ord1 : D1
+>ctor2.p1 : string
+>ctor2 : D1
 >p1 : string
 
-var r2: D1 | C2 = c2Ord1 instanceof C1 && c2Ord1; // C2 | D1
+var r2: D1 | C2 = ctor2 instanceof C1 && ctor2; // C2 | D1
 >r2 : D1 | C2
 >D1 : D1
 >C2 : C2
->c2Ord1 instanceof C1 && c2Ord1 : D1
->c2Ord1 instanceof C1 : boolean
->c2Ord1 : C2 | D1
+>ctor2 instanceof C1 && ctor2 : D1
+>ctor2 instanceof C1 : boolean
+>ctor2 : C2 | D1
 >C1 : typeof C1
->c2Ord1 : D1
+>ctor2 : D1
 
+var ctor3: C1 | C2;
+>ctor3 : C1 | C2
+>C1 : C1
+>C2 : C2
+
+if (ctor3 instanceof C1) {
+>ctor3 instanceof C1 : boolean
+>ctor3 : C1 | C2
+>C1 : typeof C1
+
+    ctor3.p1; // C1
+>ctor3.p1 : string
+>ctor3 : C1
+>p1 : string
+}
+else {
+    ctor3.p2; // C2
+>ctor3.p2 : number
+>ctor3 : C2
+>p2 : number
+}
+
+var ctor4: C1 | C2 | C3;
+>ctor4 : C1 | C2 | C3
+>C1 : C1
+>C2 : C2
+>C3 : C3
+
+if (ctor4 instanceof C1) {
+>ctor4 instanceof C1 : boolean
+>ctor4 : C1 | C2 | C3
+>C1 : typeof C1
+
+    ctor4.p1; // C1
+>ctor4.p1 : string
+>ctor4 : C1
+>p1 : string
+}
+else if (ctor4 instanceof C2) {
+>ctor4 instanceof C2 : boolean
+>ctor4 : C2 | C3
+>C2 : typeof C2
+
+    ctor4.p2; // C2
+>ctor4.p2 : number
+>ctor4 : C2
+>p2 : number
+}
+else {
+    ctor4.p4; // C3
+>ctor4.p4 : number
+>ctor4 : C3
+>p4 : number
+}
+
+var ctor5: C1 | D1 | C2;
+>ctor5 : C1 | D1 | C2
+>C1 : C1
+>D1 : D1
+>C2 : C2
+
+if (ctor5 instanceof C1) {
+>ctor5 instanceof C1 : boolean
+>ctor5 : C1 | D1 | C2
+>C1 : typeof C1
+
+    ctor5.p1; // C1
+>ctor5.p1 : string
+>ctor5 : C1
+>p1 : string
+}
+else {
+    ctor5.p2; // C2
+>ctor5.p2 : number
+>ctor5 : C2
+>p2 : number
+}
+
+var ctor6: C1 | C2 | C3;
+>ctor6 : C1 | C2 | C3
+>C1 : C1
+>C2 : C2
+>C3 : C3
+
+if (ctor6 instanceof C1 || ctor6 instanceof C2) {
+>ctor6 instanceof C1 || ctor6 instanceof C2 : boolean
+>ctor6 instanceof C1 : boolean
+>ctor6 : C1 | C2 | C3
+>C1 : typeof C1
+>ctor6 instanceof C2 : boolean
+>ctor6 : C2 | C3
+>C2 : typeof C2
+}
+else {
+    ctor6.p4; // C3
+>ctor6.p4 : number
+>ctor6 : C3
+>p4 : number
+}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
index 3bb1a2091f6..d1cb4994196 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
@@ -23,19 +23,19 @@ if (typeof strOrC === "Object") {
     c = strOrC; // C
 }
 else {
-    var r2: string | C = strOrC; // string | C
+    var r2: string = strOrC; // string
 }
 if (typeof numOrC === "Object") {
     c = numOrC; // C
 }
 else {
-    var r3: number | C = numOrC; // number | C
+    var r3: number  = numOrC; // number
 }
 if (typeof boolOrC === "Object") {
     c = boolOrC; // C
 }
 else {
-    var r4: boolean | C = boolOrC; // boolean | C
+    var r4: boolean = boolOrC; // boolean
 }
 
 // Narrowing occurs only if target type is a subtype of variable type
@@ -50,19 +50,19 @@ else {
 //  - when true, narrows the type of x by typeof x === s when false, or
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrC !== "Object") {
-    var r2: string | C = strOrC; // string | C
+    var r2: string = strOrC; // string
 }
 else {
     c = strOrC; // C
 }
 if (typeof numOrC !== "Object") {
-    var r3: number | C = numOrC; // number | C
+    var r3: number = numOrC; // number
 }
 else {
     c = numOrC; // C
 }
 if (typeof boolOrC !== "Object") {
-    var r4: boolean | C = boolOrC; // boolean | C
+    var r4: boolean = boolOrC; // boolean
 }
 else {
     c = boolOrC; // C
@@ -104,19 +104,19 @@ if (typeof strOrC === "Object") {
     c = strOrC; // C
 }
 else {
-    var r2 = strOrC; // string | C
+    var r2 = strOrC; // string
 }
 if (typeof numOrC === "Object") {
     c = numOrC; // C
 }
 else {
-    var r3 = numOrC; // number | C
+    var r3 = numOrC; // number
 }
 if (typeof boolOrC === "Object") {
     c = boolOrC; // C
 }
 else {
-    var r4 = boolOrC; // boolean | C
+    var r4 = boolOrC; // boolean
 }
 // Narrowing occurs only if target type is a subtype of variable type
 if (typeof strOrNumOrBool === "Object") {
@@ -129,19 +129,19 @@ else {
 //  - when true, narrows the type of x by typeof x === s when false, or
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrC !== "Object") {
-    var r2 = strOrC; // string | C
+    var r2 = strOrC; // string
 }
 else {
     c = strOrC; // C
 }
 if (typeof numOrC !== "Object") {
-    var r3 = numOrC; // number | C
+    var r3 = numOrC; // number
 }
 else {
     c = numOrC; // C
 }
 if (typeof boolOrC !== "Object") {
-    var r4 = boolOrC; // boolean | C
+    var r4 = boolOrC; // boolean
 }
 else {
     c = boolOrC; // C
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
index e3ecffdc2e9..eb120d468dc 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
@@ -56,9 +56,8 @@ if (typeof strOrC === "Object") {
 >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
 }
 else {
-    var r2: string | C = strOrC; // string | C
+    var r2: string = strOrC; // string
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 51, 7))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
 }
 if (typeof numOrC === "Object") {
@@ -69,9 +68,8 @@ if (typeof numOrC === "Object") {
 >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
 }
 else {
-    var r3: number | C = numOrC; // number | C
+    var r3: number  = numOrC; // number
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 57, 7))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
 }
 if (typeof boolOrC === "Object") {
@@ -82,9 +80,8 @@ if (typeof boolOrC === "Object") {
 >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
 }
 else {
-    var r4: boolean | C = boolOrC; // boolean | C
+    var r4: boolean = boolOrC; // boolean
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 63, 7))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
 }
 
@@ -108,9 +105,8 @@ else {
 if (typeof strOrC !== "Object") {
 >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
 
-    var r2: string | C = strOrC; // string | C
+    var r2: string = strOrC; // string
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 51, 7))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
 }
 else {
@@ -121,9 +117,8 @@ else {
 if (typeof numOrC !== "Object") {
 >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
 
-    var r3: number | C = numOrC; // number | C
+    var r3: number = numOrC; // number
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 57, 7))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
 }
 else {
@@ -134,9 +129,8 @@ else {
 if (typeof boolOrC !== "Object") {
 >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
 
-    var r4: boolean | C = boolOrC; // boolean | C
+    var r4: boolean = boolOrC; // boolean
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 63, 7))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
 }
 else {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
index e0fd443ef63..5cec3567194 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
@@ -60,10 +60,9 @@ if (typeof strOrC === "Object") {
 >strOrC : C
 }
 else {
-    var r2: string | C = strOrC; // string | C
->r2 : string | C
->C : C
->strOrC : string | C
+    var r2: string = strOrC; // string
+>r2 : string
+>strOrC : string
 }
 if (typeof numOrC === "Object") {
 >typeof numOrC === "Object" : boolean
@@ -77,10 +76,9 @@ if (typeof numOrC === "Object") {
 >numOrC : C
 }
 else {
-    var r3: number | C = numOrC; // number | C
->r3 : number | C
->C : C
->numOrC : number | C
+    var r3: number  = numOrC; // number
+>r3 : number
+>numOrC : number
 }
 if (typeof boolOrC === "Object") {
 >typeof boolOrC === "Object" : boolean
@@ -94,10 +92,9 @@ if (typeof boolOrC === "Object") {
 >boolOrC : C
 }
 else {
-    var r4: boolean | C = boolOrC; // boolean | C
->r4 : boolean | C
->C : C
->boolOrC : boolean | C
+    var r4: boolean = boolOrC; // boolean
+>r4 : boolean
+>boolOrC : boolean
 }
 
 // Narrowing occurs only if target type is a subtype of variable type
@@ -126,10 +123,9 @@ if (typeof strOrC !== "Object") {
 >strOrC : string | C
 >"Object" : string
 
-    var r2: string | C = strOrC; // string | C
->r2 : string | C
->C : C
->strOrC : string | C
+    var r2: string = strOrC; // string
+>r2 : string
+>strOrC : string
 }
 else {
     c = strOrC; // C
@@ -143,10 +139,9 @@ if (typeof numOrC !== "Object") {
 >numOrC : number | C
 >"Object" : string
 
-    var r3: number | C = numOrC; // number | C
->r3 : number | C
->C : C
->numOrC : number | C
+    var r3: number = numOrC; // number
+>r3 : number
+>numOrC : number
 }
 else {
     c = numOrC; // C
@@ -160,10 +155,9 @@ if (typeof boolOrC !== "Object") {
 >boolOrC : boolean | C
 >"Object" : string
 
-    var r4: boolean | C = boolOrC; // boolean | C
->r4 : boolean | C
->C : C
->boolOrC : boolean | C
+    var r4: boolean = boolOrC; // boolean
+>r4 : boolean
+>boolOrC : boolean
 }
 else {
     c = boolOrC; // C
diff --git a/tests/baselines/reference/typeGuardRedundancy.js b/tests/baselines/reference/typeGuardRedundancy.js
new file mode 100644
index 00000000000..1dfa964cbc9
--- /dev/null
+++ b/tests/baselines/reference/typeGuardRedundancy.js
@@ -0,0 +1,17 @@
+//// [typeGuardRedundancy.ts]
+var x: string|number;
+
+var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
+
+var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
+
+var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
+
+var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
+
+//// [typeGuardRedundancy.js]
+var x;
+var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
+var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
+var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
+var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
diff --git a/tests/baselines/reference/typeGuardRedundancy.symbols b/tests/baselines/reference/typeGuardRedundancy.symbols
new file mode 100644
index 00000000000..356061407ad
--- /dev/null
+++ b/tests/baselines/reference/typeGuardRedundancy.symbols
@@ -0,0 +1,48 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts ===
+var x: string|number;
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+
+var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
+>r1 : Symbol(r1, Decl(typeGuardRedundancy.ts, 2, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+
+var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
+>r2 : Symbol(r2, Decl(typeGuardRedundancy.ts, 4, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+
+var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
+>r3 : Symbol(r3, Decl(typeGuardRedundancy.ts, 6, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+
+var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
+>r4 : Symbol(r4, Decl(typeGuardRedundancy.ts, 8, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
+>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3))
+>substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/typeGuardRedundancy.types b/tests/baselines/reference/typeGuardRedundancy.types
new file mode 100644
index 00000000000..1507ceb850e
--- /dev/null
+++ b/tests/baselines/reference/typeGuardRedundancy.types
@@ -0,0 +1,84 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts ===
+var x: string|number;
+>x : string | number
+
+var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
+>r1 : (from: number, length?: number) => string
+>typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
+>typeof x === "string" && typeof x === "string" : boolean
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string | number
+>"string" : string
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string
+>"string" : string
+>x.substr : (from: number, length?: number) => string
+>x : string
+>substr : (from: number, length?: number) => string
+>x.toFixed : (fractionDigits?: number) => string
+>x : number
+>toFixed : (fractionDigits?: number) => string
+
+var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
+>r2 : (fractionDigits?: number) => string
+>!(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr : (fractionDigits?: number) => string
+>!(typeof x === "string" && typeof x === "string") : boolean
+>(typeof x === "string" && typeof x === "string") : boolean
+>typeof x === "string" && typeof x === "string" : boolean
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string | number
+>"string" : string
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string
+>"string" : string
+>x.toFixed : (fractionDigits?: number) => string
+>x : number
+>toFixed : (fractionDigits?: number) => string
+>x.substr : (from: number, length?: number) => string
+>x : string
+>substr : (from: number, length?: number) => string
+
+var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
+>r3 : (from: number, length?: number) => string
+>typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
+>typeof x === "string" || typeof x === "string" : boolean
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string | number
+>"string" : string
+>typeof x === "string" : boolean
+>typeof x : string
+>x : number
+>"string" : string
+>x.substr : (from: number, length?: number) => string
+>x : string
+>substr : (from: number, length?: number) => string
+>x.toFixed : (fractionDigits?: number) => string
+>x : number
+>toFixed : (fractionDigits?: number) => string
+
+var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
+>r4 : (fractionDigits?: number) => string
+>!(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr : (fractionDigits?: number) => string
+>!(typeof x === "string" || typeof x === "string") : boolean
+>(typeof x === "string" || typeof x === "string") : boolean
+>typeof x === "string" || typeof x === "string" : boolean
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string | number
+>"string" : string
+>typeof x === "string" : boolean
+>typeof x : string
+>x : number
+>"string" : string
+>x.toFixed : (fractionDigits?: number) => string
+>x : number
+>toFixed : (fractionDigits?: number) => string
+>x.substr : (from: number, length?: number) => string
+>x : string
+>substr : (from: number, length?: number) => string
+
diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.js b/tests/baselines/reference/typeGuardTautologicalConsistiency.js
new file mode 100644
index 00000000000..1b7fa2021c5
--- /dev/null
+++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.js
@@ -0,0 +1,24 @@
+//// [typeGuardTautologicalConsistiency.ts]
+let stringOrNumber: string | number;
+
+if (typeof stringOrNumber === "number") {
+    if (typeof stringOrNumber !== "number") {
+        stringOrNumber;
+    }
+}
+
+if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") {
+    stringOrNumber;
+}
+
+
+//// [typeGuardTautologicalConsistiency.js]
+var stringOrNumber;
+if (typeof stringOrNumber === "number") {
+    if (typeof stringOrNumber !== "number") {
+        stringOrNumber;
+    }
+}
+if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") {
+    stringOrNumber;
+}
diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.symbols b/tests/baselines/reference/typeGuardTautologicalConsistiency.symbols
new file mode 100644
index 00000000000..9ee82a5413f
--- /dev/null
+++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts ===
+let stringOrNumber: string | number;
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+
+if (typeof stringOrNumber === "number") {
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+
+    if (typeof stringOrNumber !== "number") {
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+
+        stringOrNumber;
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+    }
+}
+
+if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") {
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+
+    stringOrNumber;
+>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3))
+}
+
diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.types b/tests/baselines/reference/typeGuardTautologicalConsistiency.types
new file mode 100644
index 00000000000..d758dcde22b
--- /dev/null
+++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.types
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts ===
+let stringOrNumber: string | number;
+>stringOrNumber : string | number
+
+if (typeof stringOrNumber === "number") {
+>typeof stringOrNumber === "number" : boolean
+>typeof stringOrNumber : string
+>stringOrNumber : string | number
+>"number" : string
+
+    if (typeof stringOrNumber !== "number") {
+>typeof stringOrNumber !== "number" : boolean
+>typeof stringOrNumber : string
+>stringOrNumber : number
+>"number" : string
+
+        stringOrNumber;
+>stringOrNumber : string | number
+    }
+}
+
+if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") {
+>typeof stringOrNumber === "number" && typeof stringOrNumber !== "number" : boolean
+>typeof stringOrNumber === "number" : boolean
+>typeof stringOrNumber : string
+>stringOrNumber : string | number
+>"number" : string
+>typeof stringOrNumber !== "number" : boolean
+>typeof stringOrNumber : string
+>stringOrNumber : number
+>"number" : string
+
+    stringOrNumber;
+>stringOrNumber : string | number
+}
+
diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.js b/tests/baselines/reference/typeGuardTypeOfUndefined.js
new file mode 100644
index 00000000000..a24ff2ec0dc
--- /dev/null
+++ b/tests/baselines/reference/typeGuardTypeOfUndefined.js
@@ -0,0 +1,357 @@
+//// [typeGuardTypeOfUndefined.ts]
+// undefined type guard adds no new type information
+function test1(a: any) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test2(a: any) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test3(a: any) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test4(a: any) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test5(a: boolean | void) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test6(a: boolean | void) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test7(a: boolean | void) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test8(a: boolean | void) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test9(a: boolean | number) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test10(a: boolean | number) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test11(a: boolean | number) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test12(a: boolean | number) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test13(a: boolean | number | void) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test14(a: boolean | number | void) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test15(a: boolean | number | void) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test16(a: boolean | number | void) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+
+//// [typeGuardTypeOfUndefined.js]
+// undefined type guard adds no new type information
+function test1(a) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test2(a) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test3(a) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test4(a) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test5(a) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test6(a) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test7(a) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test8(a) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test9(a) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test10(a) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test11(a) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test12(a) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test13(a) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test14(a) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+function test15(a) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
+function test16(a) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+        a;
+    }
+    else {
+        a;
+    }
+}
diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.symbols b/tests/baselines/reference/typeGuardTypeOfUndefined.symbols
new file mode 100644
index 00000000000..d6d36223fe4
--- /dev/null
+++ b/tests/baselines/reference/typeGuardTypeOfUndefined.symbols
@@ -0,0 +1,330 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts ===
+// undefined type guard adds no new type information
+function test1(a: any) {
+>test1 : Symbol(test1, Decl(typeGuardTypeOfUndefined.ts, 0, 0))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15))
+
+    if (typeof a !== "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15))
+    }
+}
+
+function test2(a: any) {
+>test2 : Symbol(test2, Decl(typeGuardTypeOfUndefined.ts, 13, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15))
+
+    if (typeof a === "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15))
+    }
+}
+
+function test3(a: any) {
+>test3 : Symbol(test3, Decl(typeGuardTypeOfUndefined.ts, 27, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15))
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15))
+    }
+}
+
+function test4(a: any) {
+>test4 : Symbol(test4, Decl(typeGuardTypeOfUndefined.ts, 36, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15))
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15))
+    }
+}
+
+function test5(a: boolean | void) {
+>test5 : Symbol(test5, Decl(typeGuardTypeOfUndefined.ts, 45, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15))
+
+    if (typeof a !== "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15))
+    }
+}
+
+function test6(a: boolean | void) {
+>test6 : Symbol(test6, Decl(typeGuardTypeOfUndefined.ts, 59, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15))
+
+    if (typeof a === "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15))
+    }
+}
+
+function test7(a: boolean | void) {
+>test7 : Symbol(test7, Decl(typeGuardTypeOfUndefined.ts, 73, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15))
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15))
+    }
+}
+
+function test8(a: boolean | void) {
+>test8 : Symbol(test8, Decl(typeGuardTypeOfUndefined.ts, 82, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15))
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15))
+    }
+}
+
+function test9(a: boolean | number) {
+>test9 : Symbol(test9, Decl(typeGuardTypeOfUndefined.ts, 91, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15))
+
+    if (typeof a !== "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15))
+    }
+}
+
+function test10(a: boolean | number) {
+>test10 : Symbol(test10, Decl(typeGuardTypeOfUndefined.ts, 105, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16))
+
+    if (typeof a === "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16))
+    }
+}
+
+function test11(a: boolean | number) {
+>test11 : Symbol(test11, Decl(typeGuardTypeOfUndefined.ts, 119, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16))
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16))
+    }
+}
+
+function test12(a: boolean | number) {
+>test12 : Symbol(test12, Decl(typeGuardTypeOfUndefined.ts, 128, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16))
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16))
+    }
+}
+
+function test13(a: boolean | number | void) {
+>test13 : Symbol(test13, Decl(typeGuardTypeOfUndefined.ts, 137, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16))
+
+    if (typeof a !== "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16))
+    }
+}
+
+function test14(a: boolean | number | void) {
+>test14 : Symbol(test14, Decl(typeGuardTypeOfUndefined.ts, 151, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16))
+
+    if (typeof a === "undefined") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16))
+
+        if (typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16))
+
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16))
+        }
+        else {
+            a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16))
+        }
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16))
+    }
+}
+
+function test15(a: boolean | number | void) {
+>test15 : Symbol(test15, Decl(typeGuardTypeOfUndefined.ts, 165, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16))
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16))
+    }
+}
+
+function test16(a: boolean | number | void) {
+>test16 : Symbol(test16, Decl(typeGuardTypeOfUndefined.ts, 174, 1))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16))
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16))
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16))
+
+		a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16))
+    }
+    else {
+        a;
+>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16))
+    }
+}
+
diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.types b/tests/baselines/reference/typeGuardTypeOfUndefined.types
new file mode 100644
index 00000000000..6cf57e1a1dd
--- /dev/null
+++ b/tests/baselines/reference/typeGuardTypeOfUndefined.types
@@ -0,0 +1,434 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts ===
+// undefined type guard adds no new type information
+function test1(a: any) {
+>test1 : (a: any) => void
+>a : any
+
+    if (typeof a !== "undefined") {
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : any
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : any
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : any
+        }
+    }
+    else {
+        a;
+>a : any
+    }
+}
+
+function test2(a: any) {
+>test2 : (a: any) => void
+>a : any
+
+    if (typeof a === "undefined") {
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : any
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : any
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : any
+        }
+    }
+    else {
+        a;
+>a : any
+    }
+}
+
+function test3(a: any) {
+>test3 : (a: any) => void
+>a : any
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>typeof a === "undefined" || typeof a === "boolean" : boolean
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : any
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : any
+>"boolean" : string
+
+		a;
+>a : any
+    }
+    else {
+        a;
+>a : any
+    }
+}
+
+function test4(a: any) {
+>test4 : (a: any) => void
+>a : any
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>typeof a !== "undefined" && typeof a === "boolean" : boolean
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : any
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : any
+>"boolean" : string
+
+		a;
+>a : boolean
+    }
+    else {
+        a;
+>a : any
+    }
+}
+
+function test5(a: boolean | void) {
+>test5 : (a: boolean | void) => void
+>a : boolean | void
+
+    if (typeof a !== "undefined") {
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : boolean | void
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | void
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : void
+        }
+    }
+    else {
+        a;
+>a : boolean | void
+    }
+}
+
+function test6(a: boolean | void) {
+>test6 : (a: boolean | void) => void
+>a : boolean | void
+
+    if (typeof a === "undefined") {
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : boolean | void
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | void
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : void
+        }
+    }
+    else {
+        a;
+>a : boolean | void
+    }
+}
+
+function test7(a: boolean | void) {
+>test7 : (a: boolean | void) => void
+>a : boolean | void
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>typeof a === "undefined" || typeof a === "boolean" : boolean
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : boolean | void
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | void
+>"boolean" : string
+
+		a;
+>a : boolean | void
+    }
+    else {
+        a;
+>a : void
+    }
+}
+
+function test8(a: boolean | void) {
+>test8 : (a: boolean | void) => void
+>a : boolean | void
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>typeof a !== "undefined" && typeof a === "boolean" : boolean
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : boolean | void
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | void
+>"boolean" : string
+
+		a;
+>a : boolean
+    }
+    else {
+        a;
+>a : boolean | void
+    }
+}
+
+function test9(a: boolean | number) {
+>test9 : (a: boolean | number) => void
+>a : boolean | number
+
+    if (typeof a !== "undefined") {
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : boolean | number
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : number
+        }
+    }
+    else {
+        a;
+>a : boolean | number
+    }
+}
+
+function test10(a: boolean | number) {
+>test10 : (a: boolean | number) => void
+>a : boolean | number
+
+    if (typeof a === "undefined") {
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : boolean | number
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : number
+        }
+    }
+    else {
+        a;
+>a : boolean | number
+    }
+}
+
+function test11(a: boolean | number) {
+>test11 : (a: boolean | number) => void
+>a : boolean | number
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>typeof a === "undefined" || typeof a === "boolean" : boolean
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : boolean | number
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number
+>"boolean" : string
+
+		a;
+>a : boolean | number
+    }
+    else {
+        a;
+>a : number
+    }
+}
+
+function test12(a: boolean | number) {
+>test12 : (a: boolean | number) => void
+>a : boolean | number
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>typeof a !== "undefined" && typeof a === "boolean" : boolean
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : boolean | number
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number
+>"boolean" : string
+
+		a;
+>a : boolean
+    }
+    else {
+        a;
+>a : boolean | number
+    }
+}
+
+function test13(a: boolean | number | void) {
+>test13 : (a: boolean | number | void) => void
+>a : boolean | number | void
+
+    if (typeof a !== "undefined") {
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : number | void
+        }
+    }
+    else {
+        a;
+>a : boolean | number | void
+    }
+}
+
+function test14(a: boolean | number | void) {
+>test14 : (a: boolean | number | void) => void
+>a : boolean | number | void
+
+    if (typeof a === "undefined") {
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"undefined" : string
+
+        if (typeof a === "boolean") {
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"boolean" : string
+
+            a;
+>a : boolean
+        }
+        else {
+            a;
+>a : number | void
+        }
+    }
+    else {
+        a;
+>a : boolean | number | void
+    }
+}
+
+function test15(a: boolean | number | void) {
+>test15 : (a: boolean | number | void) => void
+>a : boolean | number | void
+
+    if (typeof a === "undefined" || typeof a === "boolean") {
+>typeof a === "undefined" || typeof a === "boolean" : boolean
+>typeof a === "undefined" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"boolean" : string
+
+		a;
+>a : boolean | number | void
+    }
+    else {
+        a;
+>a : number | void
+    }
+}
+
+function test16(a: boolean | number | void) {
+>test16 : (a: boolean | number | void) => void
+>a : boolean | number | void
+
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+>typeof a !== "undefined" && typeof a === "boolean" : boolean
+>typeof a !== "undefined" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"undefined" : string
+>typeof a === "boolean" : boolean
+>typeof a : string
+>a : boolean | number | void
+>"boolean" : string
+
+		a;
+>a : boolean
+    }
+    else {
+        a;
+>a : boolean | number | void
+    }
+}
+
diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js
index 7cf19dac0ad..91443a9ae78 100644
--- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js
+++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js
@@ -41,12 +41,12 @@ function foo4(x: number | string | boolean) {
                 : x.toString(); // number
         })(x); // x here is narrowed to number | boolean
 }
-// Type guards affect nested function expressions, but not nested function declarations
+// Type guards affect nested function expressions and nested function declarations
 function foo5(x: number | string | boolean) {
     if (typeof x === "string") {
         var y = x; // string;
         function foo() {
-            var z = x; // number | string | boolean, type guard has no effect
+            var z = x; // string
         }
     }
 }
@@ -121,12 +121,12 @@ function foo4(x) {
                 : x.toString(); // number
         })(x); // x here is narrowed to number | boolean
 }
-// Type guards affect nested function expressions, but not nested function declarations
+// Type guards affect nested function expressions and nested function declarations
 function foo5(x) {
     if (typeof x === "string") {
         var y = x; // string;
         function foo() {
-            var z = x; // number | string | boolean, type guard has no effect
+            var z = x; // string
         }
     }
 }
diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols
index 2f3232b0225..34810f303db 100644
--- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols
+++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols
@@ -130,7 +130,7 @@ function foo4(x: number | string | boolean) {
         })(x); // x here is narrowed to number | boolean
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 32, 14))
 }
-// Type guards affect nested function expressions, but not nested function declarations
+// Type guards affect nested function expressions and nested function declarations
 function foo5(x: number | string | boolean) {
 >foo5 : Symbol(foo5, Decl(typeGuardsInFunctionAndModuleBlock.ts, 41, 1))
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 43, 14))
@@ -145,7 +145,7 @@ function foo5(x: number | string | boolean) {
         function foo() {
 >foo : Symbol(foo, Decl(typeGuardsInFunctionAndModuleBlock.ts, 45, 18))
 
-            var z = x; // number | string | boolean, type guard has no effect
+            var z = x; // string
 >z : Symbol(z, Decl(typeGuardsInFunctionAndModuleBlock.ts, 47, 15))
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 43, 14))
         }
diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
index 0a084d6eb54..f7d56ed17d1 100644
--- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
+++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
@@ -181,7 +181,7 @@ function foo4(x: number | string | boolean) {
         })(x); // x here is narrowed to number | boolean
 >x : number | boolean
 }
-// Type guards affect nested function expressions, but not nested function declarations
+// Type guards affect nested function expressions and nested function declarations
 function foo5(x: number | string | boolean) {
 >foo5 : (x: number | string | boolean) => void
 >x : number | string | boolean
@@ -199,9 +199,9 @@ function foo5(x: number | string | boolean) {
         function foo() {
 >foo : () => void
 
-            var z = x; // number | string | boolean, type guard has no effect
->z : number | string | boolean
->x : number | string | boolean
+            var z = x; // string
+>z : string
+>x : string
         }
     }
 }
diff --git a/tests/baselines/reference/typeParameterConstraints1.errors.txt b/tests/baselines/reference/typeParameterConstraints1.errors.txt
index f30fd4f6700..e837e19317d 100644
--- a/tests/baselines/reference/typeParameterConstraints1.errors.txt
+++ b/tests/baselines/reference/typeParameterConstraints1.errors.txt
@@ -1,12 +1,11 @@
 tests/cases/compiler/typeParameterConstraints1.ts(6,25): error TS2304: Cannot find name 'hm'.
-tests/cases/compiler/typeParameterConstraints1.ts(8,25): error TS1110: Type expected.
 tests/cases/compiler/typeParameterConstraints1.ts(9,25): error TS1110: Type expected.
 tests/cases/compiler/typeParameterConstraints1.ts(10,26): error TS1110: Type expected.
 tests/cases/compiler/typeParameterConstraints1.ts(11,26): error TS1110: Type expected.
 tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot find name 'undefined'.
 
 
-==== tests/cases/compiler/typeParameterConstraints1.ts (6 errors) ====
+==== tests/cases/compiler/typeParameterConstraints1.ts (5 errors) ====
     function foo1<T extends any>(test: T) { }
     function foo2<T extends number>(test: T) { }
     function foo3<T extends string>(test: T) { }
@@ -17,8 +16,6 @@ tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot f
 !!! error TS2304: Cannot find name 'hm'.
     function foo7<T extends Object>(test: T) { } // valid
     function foo8<T extends "">(test: T) { }
-                            ~~
-!!! error TS1110: Type expected.
     function foo9<T extends 1 > (test: T) { }
                             ~
 !!! error TS1110: Type expected.
diff --git a/tests/baselines/reference/typeParameterEquality.js b/tests/baselines/reference/typeParameterEquality.js
new file mode 100644
index 00000000000..b77e534b354
--- /dev/null
+++ b/tests/baselines/reference/typeParameterEquality.js
@@ -0,0 +1,11 @@
+//// [typeParameterEquality.ts]
+class C {
+    get x(): <T>(a: T) => T { return null; }
+    set x(p: <U>(a: U) => U) {}
+}
+
+//// [typeParameterEquality.js]
+class C {
+    get x() { return null; }
+    set x(p) { }
+}
diff --git a/tests/baselines/reference/typeParameterEquality.symbols b/tests/baselines/reference/typeParameterEquality.symbols
new file mode 100644
index 00000000000..562d6277d93
--- /dev/null
+++ b/tests/baselines/reference/typeParameterEquality.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/typeParameterEquality.ts ===
+class C {
+>C : Symbol(C, Decl(typeParameterEquality.ts, 0, 0))
+
+    get x(): <T>(a: T) => T { return null; }
+>x : Symbol(x, Decl(typeParameterEquality.ts, 0, 9), Decl(typeParameterEquality.ts, 1, 44))
+>T : Symbol(T, Decl(typeParameterEquality.ts, 1, 14))
+>a : Symbol(a, Decl(typeParameterEquality.ts, 1, 17))
+>T : Symbol(T, Decl(typeParameterEquality.ts, 1, 14))
+>T : Symbol(T, Decl(typeParameterEquality.ts, 1, 14))
+
+    set x(p: <U>(a: U) => U) {}
+>x : Symbol(x, Decl(typeParameterEquality.ts, 0, 9), Decl(typeParameterEquality.ts, 1, 44))
+>p : Symbol(p, Decl(typeParameterEquality.ts, 2, 10))
+>U : Symbol(U, Decl(typeParameterEquality.ts, 2, 14))
+>a : Symbol(a, Decl(typeParameterEquality.ts, 2, 17))
+>U : Symbol(U, Decl(typeParameterEquality.ts, 2, 14))
+>U : Symbol(U, Decl(typeParameterEquality.ts, 2, 14))
+}
diff --git a/tests/baselines/reference/typeParameterEquality.types b/tests/baselines/reference/typeParameterEquality.types
new file mode 100644
index 00000000000..2e51c3a51e6
--- /dev/null
+++ b/tests/baselines/reference/typeParameterEquality.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/typeParameterEquality.ts ===
+class C {
+>C : C
+
+    get x(): <T>(a: T) => T { return null; }
+>x : <T>(a: T) => T
+>T : T
+>a : T
+>T : T
+>T : T
+>null : null
+
+    set x(p: <U>(a: U) => U) {}
+>x : <T>(a: T) => T
+>p : <U>(a: U) => U
+>U : U
+>a : U
+>U : U
+>U : U
+}
diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt b/tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt
new file mode 100644
index 00000000000..872a0a10923
--- /dev/null
+++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/compiler/typeParametersAndParametersInComputedNames.ts(6,10): error TS2304: Cannot find name 'T'.
+tests/cases/compiler/typeParametersAndParametersInComputedNames.ts(6,13): error TS2304: Cannot find name 'a'.
+
+
+==== tests/cases/compiler/typeParametersAndParametersInComputedNames.ts (2 errors) ====
+    function foo<T>(a: T) : string {
+        return "";
+    }
+    
+    class A {
+        [foo<T>(a)]<T>(a: T) {  
+             ~
+!!! error TS2304: Cannot find name 'T'.
+                ~
+!!! error TS2304: Cannot find name 'a'.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.js b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js
new file mode 100644
index 00000000000..1cb53663fbd
--- /dev/null
+++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js
@@ -0,0 +1,21 @@
+//// [typeParametersAndParametersInComputedNames.ts]
+function foo<T>(a: T) : string {
+    return "";
+}
+
+class A {
+    [foo<T>(a)]<T>(a: T) {  
+    }
+}
+
+//// [typeParametersAndParametersInComputedNames.js]
+function foo(a) {
+    return "";
+}
+var A = (function () {
+    function A() {
+    }
+    A.prototype[foo(a)] = function (a) {
+    };
+    return A;
+})();
diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt
index 6112b61ceb6..0139c96b3f9 100644
--- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts(46,32): error TS2365: Operator '+' cannot be applied to types 'undefined' and 'undefined'.
 tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts(47,32): error TS2365: Operator '+' cannot be applied to types 'null' and 'null'.
 tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts(48,32): error TS2365: Operator '+' cannot be applied to types 'undefined' and 'undefined'.
+tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts(68,1): error TS7028: Unused label.
+tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts(69,1): error TS7028: Unused label.
+tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts(70,1): error TS7028: Unused label.
 
 
-==== tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts (3 errors) ====
+==== tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts (6 errors) ====
     // typeof  operator on any type
     
     var ANY: any;
@@ -78,8 +81,14 @@ tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperator
     var x: any[];
     var r: () => any;
     z: typeof ANY;
+    ~
+!!! error TS7028: Unused label.
     x: typeof ANY2;
+    ~
+!!! error TS7028: Unused label.
     r: typeof foo;
+    ~
+!!! error TS7028: Unused label.
     z: typeof objA.a;
     z: typeof A.foo;
     z: typeof M.n;
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js
index c0538b78b14..b9db33b11a4 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.js
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js
@@ -1,4 +1,5 @@
 //// [typeofOperatorWithBooleanType.ts]
+
 // typeof  operator on boolean type
 var BOOLEAN: boolean;
 
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
index 39276e61625..0167a14ae03 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
@@ -1,130 +1,131 @@
 === tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts ===
+
 // typeof  operator on boolean type
 var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 2, 3))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 2, 21))
 
 class A {
->A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 3, 40))
+>A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 4, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
 
     static foo() { return false; }
->foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 7, 22))
 }
 module M {
->M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 8, 1))
+>M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 9, 1))
 
     export var n: boolean;
->n : Symbol(n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
+>n : Symbol(n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
 }
 
 var objA = new A();
->objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 13, 3))
->A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 3, 40))
+>objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 14, 3))
+>A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 4, 40))
 
 // boolean type var
 var ResultIsString1 = typeof BOOLEAN;
->ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithBooleanType.ts, 17, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 2, 3))
 
 // boolean type literal
 var ResultIsString2 = typeof true;
->ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithBooleanType.ts, 19, 3))
+>ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithBooleanType.ts, 20, 3))
 
 var ResultIsString3 = typeof { x: true, y: false };
->ResultIsString3 : Symbol(ResultIsString3, Decl(typeofOperatorWithBooleanType.ts, 20, 3))
->x : Symbol(x, Decl(typeofOperatorWithBooleanType.ts, 20, 30))
->y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 20, 39))
+>ResultIsString3 : Symbol(ResultIsString3, Decl(typeofOperatorWithBooleanType.ts, 21, 3))
+>x : Symbol(x, Decl(typeofOperatorWithBooleanType.ts, 21, 30))
+>y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 21, 39))
 
 // boolean type expressions
 var ResultIsString4 = typeof objA.a;
->ResultIsString4 : Symbol(ResultIsString4, Decl(typeofOperatorWithBooleanType.ts, 23, 3))
->objA.a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
->objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 13, 3))
->a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
+>ResultIsString4 : Symbol(ResultIsString4, Decl(typeofOperatorWithBooleanType.ts, 24, 3))
+>objA.a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
+>objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 14, 3))
+>a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
 
 var ResultIsString5 = typeof M.n;
->ResultIsString5 : Symbol(ResultIsString5, Decl(typeofOperatorWithBooleanType.ts, 24, 3))
->M.n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
->M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
+>ResultIsString5 : Symbol(ResultIsString5, Decl(typeofOperatorWithBooleanType.ts, 25, 3))
+>M.n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
+>M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 9, 1))
+>n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
 
 var ResultIsString6 = typeof foo();
->ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithBooleanType.ts, 25, 3))
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithBooleanType.ts, 26, 3))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 2, 21))
 
 var ResultIsString7 = typeof A.foo();
->ResultIsString7 : Symbol(ResultIsString7, Decl(typeofOperatorWithBooleanType.ts, 26, 3))
->A.foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 6, 22))
->A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 6, 22))
+>ResultIsString7 : Symbol(ResultIsString7, Decl(typeofOperatorWithBooleanType.ts, 27, 3))
+>A.foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 7, 22))
+>A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 4, 40))
+>foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 7, 22))
 
 // multiple typeof  operator
 var ResultIsString8 = typeof typeof BOOLEAN;
->ResultIsString8 : Symbol(ResultIsString8, Decl(typeofOperatorWithBooleanType.ts, 29, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>ResultIsString8 : Symbol(ResultIsString8, Decl(typeofOperatorWithBooleanType.ts, 30, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 2, 3))
 
 // miss assignment operators
 typeof true;
 typeof BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 2, 3))
 
 typeof foo();
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 2, 21))
 
 typeof true, false;
 typeof objA.a;
->objA.a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
->objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 13, 3))
->a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
+>objA.a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
+>objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 14, 3))
+>a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
 
 typeof M.n;
->M.n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
->M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
+>M.n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
+>M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 9, 1))
+>n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
 
 // use typeof in type query
 var z: boolean;
->z : Symbol(z, Decl(typeofOperatorWithBooleanType.ts, 40, 3))
+>z : Symbol(z, Decl(typeofOperatorWithBooleanType.ts, 41, 3))
 
 var x: boolean[];
->x : Symbol(x, Decl(typeofOperatorWithBooleanType.ts, 41, 3))
+>x : Symbol(x, Decl(typeofOperatorWithBooleanType.ts, 42, 3))
 
 var r: () => boolean;
->r : Symbol(r, Decl(typeofOperatorWithBooleanType.ts, 42, 3))
+>r : Symbol(r, Decl(typeofOperatorWithBooleanType.ts, 43, 3))
 
 z: typeof BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 2, 3))
 
 r: typeof foo;
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 2, 21))
 
 var y = { a: true, b: false};
->y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 45, 3))
->a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 45, 9))
->b : Symbol(b, Decl(typeofOperatorWithBooleanType.ts, 45, 18))
+>y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 46, 3))
+>a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 46, 9))
+>b : Symbol(b, Decl(typeofOperatorWithBooleanType.ts, 46, 18))
 
 z: typeof y.a;
->y.a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 45, 9))
->y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 45, 3))
->a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 45, 9))
+>y.a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 46, 9))
+>y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 46, 3))
+>a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 46, 9))
 
 z: typeof objA.a;
->objA.a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
->objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 13, 3))
->a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 5, 9))
+>objA.a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
+>objA : Symbol(objA, Decl(typeofOperatorWithBooleanType.ts, 14, 3))
+>a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
 
 z: typeof A.foo;
->A.foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 6, 22))
->A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 6, 22))
+>A.foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 7, 22))
+>A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 4, 40))
+>foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 7, 22))
 
 z: typeof M.n;
->M.n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
->M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
+>M.n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
+>M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 9, 1))
+>n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 11, 14))
 
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types
index 06cd7466a18..043307cfb00 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.types
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts ===
+
 // typeof  operator on boolean type
 var BOOLEAN: boolean;
 >BOOLEAN : boolean
diff --git a/tests/baselines/reference/typeofOperatorWithEnumType.js b/tests/baselines/reference/typeofOperatorWithEnumType.js
index 2e2963b0955..2ce32668186 100644
--- a/tests/baselines/reference/typeofOperatorWithEnumType.js
+++ b/tests/baselines/reference/typeofOperatorWithEnumType.js
@@ -1,4 +1,5 @@
 //// [typeofOperatorWithEnumType.ts]
+
 // typeof  operator on enum type
 
 enum ENUM { };
diff --git a/tests/baselines/reference/typeofOperatorWithEnumType.symbols b/tests/baselines/reference/typeofOperatorWithEnumType.symbols
index 3ae150ece03..a8e3d6d351f 100644
--- a/tests/baselines/reference/typeofOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithEnumType.symbols
@@ -1,69 +1,70 @@
 === tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType.ts ===
+
 // typeof  operator on enum type
 
 enum ENUM { };
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
 
 enum ENUM1 { A, B, "" };
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
->A : Symbol(ENUM1.A, Decl(typeofOperatorWithEnumType.ts, 3, 12))
->B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 3, 15))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
+>A : Symbol(ENUM1.A, Decl(typeofOperatorWithEnumType.ts, 4, 12))
+>B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 4, 15))
 
 // enum type var
 var ResultIsString1 = typeof ENUM;
->ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithEnumType.ts, 6, 3))
+>ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithEnumType.ts, 7, 3))
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
 
 var ResultIsString2 = typeof ENUM1;
->ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithEnumType.ts, 7, 3))
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
+>ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithEnumType.ts, 8, 3))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
 
 // enum type expressions
 var ResultIsString3 = typeof ENUM1["A"];
->ResultIsString3 : Symbol(ResultIsString3, Decl(typeofOperatorWithEnumType.ts, 10, 3))
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
->"A" : Symbol(ENUM1.A, Decl(typeofOperatorWithEnumType.ts, 3, 12))
+>ResultIsString3 : Symbol(ResultIsString3, Decl(typeofOperatorWithEnumType.ts, 11, 3))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
+>"A" : Symbol(ENUM1.A, Decl(typeofOperatorWithEnumType.ts, 4, 12))
 
 var ResultIsString4 = typeof (ENUM[0] + ENUM1["B"]);
->ResultIsString4 : Symbol(ResultIsString4, Decl(typeofOperatorWithEnumType.ts, 11, 3))
+>ResultIsString4 : Symbol(ResultIsString4, Decl(typeofOperatorWithEnumType.ts, 12, 3))
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
->"B" : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 3, 15))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
+>"B" : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 4, 15))
 
 // multiple typeof  operators
 var ResultIsString5 = typeof typeof ENUM;
->ResultIsString5 : Symbol(ResultIsString5, Decl(typeofOperatorWithEnumType.ts, 14, 3))
+>ResultIsString5 : Symbol(ResultIsString5, Decl(typeofOperatorWithEnumType.ts, 15, 3))
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
 
 var ResultIsString6 = typeof typeof typeof (ENUM[0] + ENUM1.B);
->ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithEnumType.ts, 15, 3))
+>ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithEnumType.ts, 16, 3))
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
->ENUM1.B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 3, 15))
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
->B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 3, 15))
+>ENUM1.B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 4, 15))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
+>B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 4, 15))
 
 // miss assignment operators
 typeof ENUM;
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
 
 typeof ENUM1;
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
 
 typeof ENUM1["B"];
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
->"B" : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 3, 15))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
+>"B" : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 4, 15))
 
 typeof ENUM, ENUM1;
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
 
 // use typeof in type query
 enum z { };
->z : Symbol(z, Decl(typeofOperatorWithEnumType.ts, 21, 19))
+>z : Symbol(z, Decl(typeofOperatorWithEnumType.ts, 22, 19))
 
 z: typeof ENUM;
 >ENUM : Symbol(ENUM, Decl(typeofOperatorWithEnumType.ts, 0, 0))
 
 z: typeof ENUM1;
->ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
+>ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 3, 14))
 
diff --git a/tests/baselines/reference/typeofOperatorWithEnumType.types b/tests/baselines/reference/typeofOperatorWithEnumType.types
index 82bf699a22f..f9224811393 100644
--- a/tests/baselines/reference/typeofOperatorWithEnumType.types
+++ b/tests/baselines/reference/typeofOperatorWithEnumType.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType.ts ===
+
 // typeof  operator on enum type
 
 enum ENUM { };
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.errors.txt b/tests/baselines/reference/typeofOperatorWithStringType.errors.txt
new file mode 100644
index 00000000000..37b2cafab37
--- /dev/null
+++ b/tests/baselines/reference/typeofOperatorWithStringType.errors.txt
@@ -0,0 +1,69 @@
+tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts(50,1): error TS7028: Unused label.
+tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts(51,1): error TS7028: Unused label.
+tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts(52,1): error TS7028: Unused label.
+
+
+==== tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts (3 errors) ====
+    // typeof  operator on string type
+    var STRING: string;
+    var STRING1: string[] = ["", "abc"];
+    
+    function foo(): string { return "abc"; }
+    
+    class A {
+        public a: string;
+        static foo() { return ""; }
+    }
+    module M {
+        export var n: string;
+    }
+    
+    var objA = new A();
+    
+    // string type var
+    var ResultIsString1 = typeof STRING;
+    var ResultIsString2 = typeof STRING1;
+    
+    // string type literal
+    var ResultIsString3 = typeof "";
+    var ResultIsString4 = typeof { x: "", y: "" };
+    var ResultIsString5 = typeof { x: "", y: (s: string) => { return s; } };
+    
+    // string type expressions
+    var ResultIsString6 = typeof objA.a;
+    var ResultIsString7 = typeof M.n;
+    var ResultIsString8 = typeof STRING1[0];
+    var ResultIsString9 = typeof foo();
+    var ResultIsString10 = typeof A.foo();
+    var ResultIsString11 = typeof (STRING + STRING);
+    var ResultIsString12 = typeof STRING.charAt(0);
+    
+    // multiple typeof  operators
+    var ResultIsString13 = typeof typeof STRING;
+    var ResultIsString14 = typeof typeof typeof (STRING + STRING);
+    
+    // miss assignment operators
+    typeof "";
+    typeof STRING;
+    typeof STRING1;
+    typeof foo();
+    typeof objA.a, M.n;
+    
+    // use typeof in type query
+    var z: string;
+    var x: string[];
+    var r: () => string;
+    z: typeof STRING;
+    ~
+!!! error TS7028: Unused label.
+    x: typeof STRING1;
+    ~
+!!! error TS7028: Unused label.
+    r: typeof foo;
+    ~
+!!! error TS7028: Unused label.
+    var y = { a: "", b: "" };
+    z: typeof y.a;
+    z: typeof objA.a;
+    z: typeof A.foo;
+    z: typeof M.n;
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.symbols b/tests/baselines/reference/typeofOperatorWithStringType.symbols
deleted file mode 100644
index 090e0958e60..00000000000
--- a/tests/baselines/reference/typeofOperatorWithStringType.symbols
+++ /dev/null
@@ -1,167 +0,0 @@
-=== tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts ===
-// typeof  operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-var STRING1: string[] = ["", "abc"];
->STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
-
-function foo(): string { return "abc"; }
->foo : Symbol(foo, Decl(typeofOperatorWithStringType.ts, 2, 36))
-
-class A {
->A : Symbol(A, Decl(typeofOperatorWithStringType.ts, 4, 40))
-
-    public a: string;
->a : Symbol(a, Decl(typeofOperatorWithStringType.ts, 6, 9))
-
-    static foo() { return ""; }
->foo : Symbol(A.foo, Decl(typeofOperatorWithStringType.ts, 7, 21))
-}
-module M {
->M : Symbol(M, Decl(typeofOperatorWithStringType.ts, 9, 1))
-
-    export var n: string;
->n : Symbol(n, Decl(typeofOperatorWithStringType.ts, 11, 14))
-}
-
-var objA = new A();
->objA : Symbol(objA, Decl(typeofOperatorWithStringType.ts, 14, 3))
->A : Symbol(A, Decl(typeofOperatorWithStringType.ts, 4, 40))
-
-// string type var
-var ResultIsString1 = typeof STRING;
->ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-var ResultIsString2 = typeof STRING1;
->ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithStringType.ts, 18, 3))
->STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
-
-// string type literal
-var ResultIsString3 = typeof "";
->ResultIsString3 : Symbol(ResultIsString3, Decl(typeofOperatorWithStringType.ts, 21, 3))
-
-var ResultIsString4 = typeof { x: "", y: "" };
->ResultIsString4 : Symbol(ResultIsString4, Decl(typeofOperatorWithStringType.ts, 22, 3))
->x : Symbol(x, Decl(typeofOperatorWithStringType.ts, 22, 30))
->y : Symbol(y, Decl(typeofOperatorWithStringType.ts, 22, 37))
-
-var ResultIsString5 = typeof { x: "", y: (s: string) => { return s; } };
->ResultIsString5 : Symbol(ResultIsString5, Decl(typeofOperatorWithStringType.ts, 23, 3))
->x : Symbol(x, Decl(typeofOperatorWithStringType.ts, 23, 30))
->y : Symbol(y, Decl(typeofOperatorWithStringType.ts, 23, 37))
->s : Symbol(s, Decl(typeofOperatorWithStringType.ts, 23, 42))
->s : Symbol(s, Decl(typeofOperatorWithStringType.ts, 23, 42))
-
-// string type expressions
-var ResultIsString6 = typeof objA.a;
->ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithStringType.ts, 26, 3))
->objA.a : Symbol(A.a, Decl(typeofOperatorWithStringType.ts, 6, 9))
->objA : Symbol(objA, Decl(typeofOperatorWithStringType.ts, 14, 3))
->a : Symbol(A.a, Decl(typeofOperatorWithStringType.ts, 6, 9))
-
-var ResultIsString7 = typeof M.n;
->ResultIsString7 : Symbol(ResultIsString7, Decl(typeofOperatorWithStringType.ts, 27, 3))
->M.n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
->M : Symbol(M, Decl(typeofOperatorWithStringType.ts, 9, 1))
->n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
-
-var ResultIsString8 = typeof STRING1[0];
->ResultIsString8 : Symbol(ResultIsString8, Decl(typeofOperatorWithStringType.ts, 28, 3))
->STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
-
-var ResultIsString9 = typeof foo();
->ResultIsString9 : Symbol(ResultIsString9, Decl(typeofOperatorWithStringType.ts, 29, 3))
->foo : Symbol(foo, Decl(typeofOperatorWithStringType.ts, 2, 36))
-
-var ResultIsString10 = typeof A.foo();
->ResultIsString10 : Symbol(ResultIsString10, Decl(typeofOperatorWithStringType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(typeofOperatorWithStringType.ts, 7, 21))
->A : Symbol(A, Decl(typeofOperatorWithStringType.ts, 4, 40))
->foo : Symbol(A.foo, Decl(typeofOperatorWithStringType.ts, 7, 21))
-
-var ResultIsString11 = typeof (STRING + STRING);
->ResultIsString11 : Symbol(ResultIsString11, Decl(typeofOperatorWithStringType.ts, 31, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-var ResultIsString12 = typeof STRING.charAt(0);
->ResultIsString12 : Symbol(ResultIsString12, Decl(typeofOperatorWithStringType.ts, 32, 3))
->STRING.charAt : Symbol(String.charAt, Decl(lib.d.ts, --, --))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
->charAt : Symbol(String.charAt, Decl(lib.d.ts, --, --))
-
-// multiple typeof  operators
-var ResultIsString13 = typeof typeof STRING;
->ResultIsString13 : Symbol(ResultIsString13, Decl(typeofOperatorWithStringType.ts, 35, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-var ResultIsString14 = typeof typeof typeof (STRING + STRING);
->ResultIsString14 : Symbol(ResultIsString14, Decl(typeofOperatorWithStringType.ts, 36, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-// miss assignment operators
-typeof "";
-typeof STRING;
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-typeof STRING1;
->STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
-
-typeof foo();
->foo : Symbol(foo, Decl(typeofOperatorWithStringType.ts, 2, 36))
-
-typeof objA.a, M.n;
->objA.a : Symbol(A.a, Decl(typeofOperatorWithStringType.ts, 6, 9))
->objA : Symbol(objA, Decl(typeofOperatorWithStringType.ts, 14, 3))
->a : Symbol(A.a, Decl(typeofOperatorWithStringType.ts, 6, 9))
->M.n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
->M : Symbol(M, Decl(typeofOperatorWithStringType.ts, 9, 1))
->n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
-
-// use typeof in type query
-var z: string;
->z : Symbol(z, Decl(typeofOperatorWithStringType.ts, 46, 3))
-
-var x: string[];
->x : Symbol(x, Decl(typeofOperatorWithStringType.ts, 47, 3))
-
-var r: () => string;
->r : Symbol(r, Decl(typeofOperatorWithStringType.ts, 48, 3))
-
-z: typeof STRING;
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
-
-x: typeof STRING1;
->STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
-
-r: typeof foo;
->foo : Symbol(foo, Decl(typeofOperatorWithStringType.ts, 2, 36))
-
-var y = { a: "", b: "" };
->y : Symbol(y, Decl(typeofOperatorWithStringType.ts, 52, 3))
->a : Symbol(a, Decl(typeofOperatorWithStringType.ts, 52, 9))
->b : Symbol(b, Decl(typeofOperatorWithStringType.ts, 52, 16))
-
-z: typeof y.a;
->y.a : Symbol(a, Decl(typeofOperatorWithStringType.ts, 52, 9))
->y : Symbol(y, Decl(typeofOperatorWithStringType.ts, 52, 3))
->a : Symbol(a, Decl(typeofOperatorWithStringType.ts, 52, 9))
-
-z: typeof objA.a;
->objA.a : Symbol(A.a, Decl(typeofOperatorWithStringType.ts, 6, 9))
->objA : Symbol(objA, Decl(typeofOperatorWithStringType.ts, 14, 3))
->a : Symbol(A.a, Decl(typeofOperatorWithStringType.ts, 6, 9))
-
-z: typeof A.foo;
->A.foo : Symbol(A.foo, Decl(typeofOperatorWithStringType.ts, 7, 21))
->A : Symbol(A, Decl(typeofOperatorWithStringType.ts, 4, 40))
->foo : Symbol(A.foo, Decl(typeofOperatorWithStringType.ts, 7, 21))
-
-z: typeof M.n;
->M.n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
->M : Symbol(M, Decl(typeofOperatorWithStringType.ts, 9, 1))
->n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
-
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
deleted file mode 100644
index 3ae657a9951..00000000000
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ /dev/null
@@ -1,233 +0,0 @@
-=== tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts ===
-// typeof  operator on string type
-var STRING: string;
->STRING : string
-
-var STRING1: string[] = ["", "abc"];
->STRING1 : string[]
->["", "abc"] : string[]
->"" : string
->"abc" : string
-
-function foo(): string { return "abc"; }
->foo : () => string
->"abc" : string
-
-class A {
->A : A
-
-    public a: string;
->a : string
-
-    static foo() { return ""; }
->foo : () => string
->"" : string
-}
-module M {
->M : typeof M
-
-    export var n: string;
->n : string
-}
-
-var objA = new A();
->objA : A
->new A() : A
->A : typeof A
-
-// string type var
-var ResultIsString1 = typeof STRING;
->ResultIsString1 : string
->typeof STRING : string
->STRING : string
-
-var ResultIsString2 = typeof STRING1;
->ResultIsString2 : string
->typeof STRING1 : string
->STRING1 : string[]
-
-// string type literal
-var ResultIsString3 = typeof "";
->ResultIsString3 : string
->typeof "" : string
->"" : string
-
-var ResultIsString4 = typeof { x: "", y: "" };
->ResultIsString4 : string
->typeof { x: "", y: "" } : string
->{ x: "", y: "" } : { x: string; y: string; }
->x : string
->"" : string
->y : string
->"" : string
-
-var ResultIsString5 = typeof { x: "", y: (s: string) => { return s; } };
->ResultIsString5 : string
->typeof { x: "", y: (s: string) => { return s; } } : string
->{ x: "", y: (s: string) => { return s; } } : { x: string; y: (s: string) => string; }
->x : string
->"" : string
->y : (s: string) => string
->(s: string) => { return s; } : (s: string) => string
->s : string
->s : string
-
-// string type expressions
-var ResultIsString6 = typeof objA.a;
->ResultIsString6 : string
->typeof objA.a : string
->objA.a : string
->objA : A
->a : string
-
-var ResultIsString7 = typeof M.n;
->ResultIsString7 : string
->typeof M.n : string
->M.n : string
->M : typeof M
->n : string
-
-var ResultIsString8 = typeof STRING1[0];
->ResultIsString8 : string
->typeof STRING1[0] : string
->STRING1[0] : string
->STRING1 : string[]
->0 : number
-
-var ResultIsString9 = typeof foo();
->ResultIsString9 : string
->typeof foo() : string
->foo() : string
->foo : () => string
-
-var ResultIsString10 = typeof A.foo();
->ResultIsString10 : string
->typeof A.foo() : string
->A.foo() : string
->A.foo : () => string
->A : typeof A
->foo : () => string
-
-var ResultIsString11 = typeof (STRING + STRING);
->ResultIsString11 : string
->typeof (STRING + STRING) : string
->(STRING + STRING) : string
->STRING + STRING : string
->STRING : string
->STRING : string
-
-var ResultIsString12 = typeof STRING.charAt(0);
->ResultIsString12 : string
->typeof STRING.charAt(0) : string
->STRING.charAt(0) : string
->STRING.charAt : (pos: number) => string
->STRING : string
->charAt : (pos: number) => string
->0 : number
-
-// multiple typeof  operators
-var ResultIsString13 = typeof typeof STRING;
->ResultIsString13 : string
->typeof typeof STRING : string
->typeof STRING : string
->STRING : string
-
-var ResultIsString14 = typeof typeof typeof (STRING + STRING);
->ResultIsString14 : string
->typeof typeof typeof (STRING + STRING) : string
->typeof typeof (STRING + STRING) : string
->typeof (STRING + STRING) : string
->(STRING + STRING) : string
->STRING + STRING : string
->STRING : string
->STRING : string
-
-// miss assignment operators
-typeof "";
->typeof "" : string
->"" : string
-
-typeof STRING;
->typeof STRING : string
->STRING : string
-
-typeof STRING1;
->typeof STRING1 : string
->STRING1 : string[]
-
-typeof foo();
->typeof foo() : string
->foo() : string
->foo : () => string
-
-typeof objA.a, M.n;
->typeof objA.a, M.n : string
->typeof objA.a : string
->objA.a : string
->objA : A
->a : string
->M.n : string
->M : typeof M
->n : string
-
-// use typeof in type query
-var z: string;
->z : string
-
-var x: string[];
->x : string[]
-
-var r: () => string;
->r : () => string
-
-z: typeof STRING;
->z : any
->typeof STRING : string
->STRING : string
-
-x: typeof STRING1;
->x : any
->typeof STRING1 : string
->STRING1 : string[]
-
-r: typeof foo;
->r : any
->typeof foo : string
->foo : () => string
-
-var y = { a: "", b: "" };
->y : { a: string; b: string; }
->{ a: "", b: "" } : { a: string; b: string; }
->a : string
->"" : string
->b : string
->"" : string
-
-z: typeof y.a;
->z : any
->typeof y.a : string
->y.a : string
->y : { a: string; b: string; }
->a : string
-
-z: typeof objA.a;
->z : any
->typeof objA.a : string
->objA.a : string
->objA : A
->a : string
-
-z: typeof A.foo;
->z : any
->typeof A.foo : string
->A.foo : () => string
->A : typeof A
->foo : () => string
-
-z: typeof M.n;
->z : any
->typeof M.n : string
->M.n : string
->M : typeof M
->n : string
-
diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.types b/tests/baselines/reference/typesWithSpecializedCallSignatures.types
index fa3ac7a4ba4..b587ee7840e 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.types
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.types
@@ -19,22 +19,22 @@ class C {
 >C : C
 
     foo(x: 'hi'): Derived1;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->x : 'hi'
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>x : "hi"
 >Derived1 : Derived1
 
     foo(x: 'bye'): Derived2;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->x : 'bye'
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>x : "bye"
 >Derived2 : Derived2
 
     foo(x: string): Base;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : string
 >Base : Base
 
     foo(x) {
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : any
 
         return x;
@@ -50,17 +50,17 @@ interface I {
 >I : I
 
     foo(x: 'hi'): Derived1;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->x : 'hi'
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>x : "hi"
 >Derived1 : Derived1
 
     foo(x: 'bye'): Derived2;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->x : 'bye'
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>x : "bye"
 >Derived2 : Derived2
 
     foo(x: string): Base;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : string
 >Base : Base
 }
@@ -69,20 +69,20 @@ var i: I;
 >I : I
 
 var a: {
->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 
     foo(x: 'hi'): Derived1;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->x : 'hi'
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>x : "hi"
 >Derived1 : Derived1
 
     foo(x: 'bye'): Derived2;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->x : 'bye'
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>x : "bye"
 >Derived2 : Derived2
 
     foo(x: string): Base;
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : string
 >Base : Base
 
@@ -94,9 +94,9 @@ c = i;
 >i : I
 
 c = a;
->c = a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>c = a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 >c : C
->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 
 i = c;
 >i = c : C
@@ -104,44 +104,44 @@ i = c;
 >c : C
 
 i = a;
->i = a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>i = a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 >i : I
->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 
 a = c;
 >a = c : C
->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 >c : C
 
 a = i;
 >a = i : I
->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; }
+>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
 >i : I
 
 var r1: Derived1 = c.foo('hi');
 >r1 : Derived1
 >Derived1 : Derived1
 >c.foo('hi') : Derived1
->c.foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >c : C
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->'hi' : string
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>'hi' : "hi"
 
 var r2: Derived2 = c.foo('bye');
 >r2 : Derived2
 >Derived2 : Derived2
 >c.foo('bye') : Derived2
->c.foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >c : C
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
->'bye' : string
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
+>'bye' : "bye"
 
 var r3: Base = c.foo('hm');
 >r3 : Base
 >Base : Base
 >c.foo('hm') : Base
->c.foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >c : C
->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; }
+>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >'hm' : string
 
diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
index 66e274d917a..3036c0cea71 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
@@ -19,10 +19,10 @@ class C {
 >C : C
 
     constructor(x: 'hi');
->x : 'hi'
+>x : "hi"
 
     constructor(x: 'bye');
->x : 'bye'
+>x : "bye"
 
     constructor(x: string);
 >x : string
@@ -44,11 +44,11 @@ interface I {
 >I : I
 
     new(x: 'hi'): Derived1;
->x : 'hi'
+>x : "hi"
 >Derived1 : Derived1
 
     new(x: 'bye'): Derived2;
->x : 'bye'
+>x : "bye"
 >Derived2 : Derived2
 
     new(x: string): Base;
@@ -60,14 +60,14 @@ var i: I;
 >I : I
 
 var a: {
->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 
     new(x: 'hi'): Derived1;
->x : 'hi'
+>x : "hi"
 >Derived1 : Derived1
 
     new(x: 'bye'): Derived2;
->x : 'bye'
+>x : "bye"
 >Derived2 : Derived2
 
     new(x: string): Base;
@@ -82,37 +82,37 @@ c = i;
 >i : I
 
 c = a;
->c = a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>c = a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 >c : C
->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 
 i = a;
->i = a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>i = a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 >i : I
->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 
 a = i;
 >a = i : I
->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 >i : I
 
 var r1 = new C('hi');
 >r1 : C
 >new C('hi') : C
 >C : typeof C
->'hi' : string
+>'hi' : "hi"
 
 var r2: Derived2 = new i('bye');
 >r2 : Derived2
 >Derived2 : Derived2
 >new i('bye') : Derived2
 >i : I
->'bye' : string
+>'bye' : "bye"
 
 var r3: Base = new a('hm');
 >r3 : Base
 >Base : Base
 >new a('hm') : Base
->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; }
+>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 >'hm' : string
 
diff --git a/tests/baselines/reference/undeclaredVarEmit.errors.txt b/tests/baselines/reference/undeclaredVarEmit.errors.txt
index af6298b61d2..a95323aa362 100644
--- a/tests/baselines/reference/undeclaredVarEmit.errors.txt
+++ b/tests/baselines/reference/undeclaredVarEmit.errors.txt
@@ -1,7 +1,10 @@
+tests/cases/compiler/undeclaredVarEmit.ts(1,1): error TS7028: Unused label.
 tests/cases/compiler/undeclaredVarEmit.ts(1,4): error TS2304: Cannot find name 'number'.
 
 
-==== tests/cases/compiler/undeclaredVarEmit.ts (1 errors) ====
+==== tests/cases/compiler/undeclaredVarEmit.ts (2 errors) ====
     f: number;
+    ~
+!!! error TS7028: Unused label.
        ~~~~~~
 !!! error TS2304: Cannot find name 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures.errors.txt b/tests/baselines/reference/unionTypeCallSignatures.errors.txt
index ebe38a589ee..bf1de6ff8e8 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.errors.txt
+++ b/tests/baselines/reference/unionTypeCallSignatures.errors.txt
@@ -28,9 +28,10 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(67,12): error TS2
 tests/cases/conformance/types/union/unionTypeCallSignatures.ts(68,12): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/conformance/types/union/unionTypeCallSignatures.ts(69,12): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/conformance/types/union/unionTypeCallSignatures.ts(70,12): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2346: Supplied parameters do not match any signature of call target.
 
 
-==== tests/cases/conformance/types/union/unionTypeCallSignatures.ts (30 errors) ====
+==== tests/cases/conformance/types/union/unionTypeCallSignatures.ts (31 errors) ====
     var numOrDate: number | Date;
     var strOrBoolean: string | boolean;
     var strOrNum: string | number;
@@ -162,4 +163,9 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(70,12): error TS2
                ~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2346: Supplied parameters do not match any signature of call target.
     
+    var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+    strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    strOrNum = unionWithRestParameter4("hello", "world");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures.js b/tests/baselines/reference/unionTypeCallSignatures.js
index fc3dfc8ebbc..103d92fbef3 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.js
+++ b/tests/baselines/reference/unionTypeCallSignatures.js
@@ -70,6 +70,9 @@ strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter3('hello', "hello"); // error no call signature
 strOrNum = unionWithRestParameter3(); // error no call signature
 
+var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
+strOrNum = unionWithRestParameter4("hello", "world");
 
 
 //// [unionTypeCallSignatures.js]
@@ -132,3 +135,6 @@ strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter3('hello', "hello"); // error no call signature
 strOrNum = unionWithRestParameter3(); // error no call signature
+var unionWithRestParameter4;
+strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
+strOrNum = unionWithRestParameter4("hello", "world");
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
new file mode 100644
index 00000000000..585906a6b5a
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
@@ -0,0 +1,41 @@
+tests/cases/conformance/types/union/unionTypeCallSignatures4.ts(10,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/union/unionTypeCallSignatures4.ts(20,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/union/unionTypeCallSignatures4.ts(23,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/union/unionTypeCallSignatures4.ts(25,1): error TS2346: Supplied parameters do not match any signature of call target.
+
+
+==== tests/cases/conformance/types/union/unionTypeCallSignatures4.ts (4 errors) ====
+    type F1 = (a: string, b?: string) => void;
+    type F2 = (a: string, b?: string, c?: string) => void;
+    type F3 = (a: string, ...rest: string[]) => void;
+    type F4 = (a: string, b?: string, ...rest: string[]) => void;
+    type F5 = (a: string, b: string) => void;
+    
+    var f12: F1 | F2;
+    f12("a");
+    f12("a", "b");
+    f12("a", "b", "c");  // error
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    
+    var f34: F3 | F4;
+    f34("a");
+    f34("a", "b");
+    f34("a", "b", "c");
+    
+    var f1234: F1 | F2 | F3 | F4;
+    f1234("a");
+    f1234("a", "b");
+    f1234("a", "b", "c");  // error
+    ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    
+    var f12345: F1 | F2 | F3 | F4 | F5;
+    f12345("a");  // error
+    ~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    f12345("a", "b");
+    f12345("a", "b", "c");  // error
+    ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.js b/tests/baselines/reference/unionTypeCallSignatures4.js
new file mode 100644
index 00000000000..be9a45b33c9
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures4.js
@@ -0,0 +1,45 @@
+//// [unionTypeCallSignatures4.ts]
+type F1 = (a: string, b?: string) => void;
+type F2 = (a: string, b?: string, c?: string) => void;
+type F3 = (a: string, ...rest: string[]) => void;
+type F4 = (a: string, b?: string, ...rest: string[]) => void;
+type F5 = (a: string, b: string) => void;
+
+var f12: F1 | F2;
+f12("a");
+f12("a", "b");
+f12("a", "b", "c");  // error
+
+var f34: F3 | F4;
+f34("a");
+f34("a", "b");
+f34("a", "b", "c");
+
+var f1234: F1 | F2 | F3 | F4;
+f1234("a");
+f1234("a", "b");
+f1234("a", "b", "c");  // error
+
+var f12345: F1 | F2 | F3 | F4 | F5;
+f12345("a");  // error
+f12345("a", "b");
+f12345("a", "b", "c");  // error
+
+
+//// [unionTypeCallSignatures4.js]
+var f12;
+f12("a");
+f12("a", "b");
+f12("a", "b", "c"); // error
+var f34;
+f34("a");
+f34("a", "b");
+f34("a", "b", "c");
+var f1234;
+f1234("a");
+f1234("a", "b");
+f1234("a", "b", "c"); // error
+var f12345;
+f12345("a"); // error
+f12345("a", "b");
+f12345("a", "b", "c"); // error
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.errors.txt b/tests/baselines/reference/validMultipleVariableDeclarations.errors.txt
new file mode 100644
index 00000000000..8f751e9efee
--- /dev/null
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.errors.txt
@@ -0,0 +1,45 @@
+tests/cases/conformance/statements/VariableStatements/validMultipleVariableDeclarations.ts(9,1): error TS7027: Unreachable code detected.
+
+
+==== tests/cases/conformance/statements/VariableStatements/validMultipleVariableDeclarations.ts (1 errors) ====
+    // all expected to be valid
+    
+    var x: number;
+    var x = 2;
+    if (true) {
+        var x = 3;
+        for (var x = 0; ;) { }
+    }
+    var x = <number>undefined;
+    ~~~
+!!! error TS7027: Unreachable code detected.
+    
+    // new declaration space, making redeclaring x as a string valid
+    function declSpace() {
+        var x = 'this is a string';
+    }
+    
+    interface Point { x: number; y: number; }
+    
+    var p: Point;
+    var p = { x: 1, y: 2 };
+    var p: Point = { x: 0, y: undefined };
+    var p = { x: 1, y: <number>undefined };
+    var p: { x: number; y: number; } = { x: 1, y: 2 };
+    var p = <{ x: number; y: number; }>{ x: 0, y: undefined };
+    var p: typeof p;
+    
+    var fn = function (s: string) { return 42; }
+    var fn = (s: string) => 3;
+    var fn: (s: string) => number;
+    var fn: { (s: string): number };
+    var fn = <(s: string) => number> null;
+    var fn: typeof fn;
+    
+    var a: string[]; 
+    var a = ['a', 'b']
+    var a = <string[]>[];
+    var a: string[] = [];
+    var a = new Array<string>();
+    var a: typeof a;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.symbols b/tests/baselines/reference/validMultipleVariableDeclarations.symbols
deleted file mode 100644
index 1c3a1feb75c..00000000000
--- a/tests/baselines/reference/validMultipleVariableDeclarations.symbols
+++ /dev/null
@@ -1,118 +0,0 @@
-=== tests/cases/conformance/statements/VariableStatements/validMultipleVariableDeclarations.ts ===
-// all expected to be valid
-
-var x: number;
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 2, 3), Decl(validMultipleVariableDeclarations.ts, 3, 3), Decl(validMultipleVariableDeclarations.ts, 5, 7), Decl(validMultipleVariableDeclarations.ts, 6, 12), Decl(validMultipleVariableDeclarations.ts, 8, 3))
-
-var x = 2;
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 2, 3), Decl(validMultipleVariableDeclarations.ts, 3, 3), Decl(validMultipleVariableDeclarations.ts, 5, 7), Decl(validMultipleVariableDeclarations.ts, 6, 12), Decl(validMultipleVariableDeclarations.ts, 8, 3))
-
-if (true) {
-    var x = 3;
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 2, 3), Decl(validMultipleVariableDeclarations.ts, 3, 3), Decl(validMultipleVariableDeclarations.ts, 5, 7), Decl(validMultipleVariableDeclarations.ts, 6, 12), Decl(validMultipleVariableDeclarations.ts, 8, 3))
-
-    for (var x = 0; ;) { }
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 2, 3), Decl(validMultipleVariableDeclarations.ts, 3, 3), Decl(validMultipleVariableDeclarations.ts, 5, 7), Decl(validMultipleVariableDeclarations.ts, 6, 12), Decl(validMultipleVariableDeclarations.ts, 8, 3))
-}
-var x = <number>undefined;
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 2, 3), Decl(validMultipleVariableDeclarations.ts, 3, 3), Decl(validMultipleVariableDeclarations.ts, 5, 7), Decl(validMultipleVariableDeclarations.ts, 6, 12), Decl(validMultipleVariableDeclarations.ts, 8, 3))
->undefined : Symbol(undefined)
-
-// new declaration space, making redeclaring x as a string valid
-function declSpace() {
->declSpace : Symbol(declSpace, Decl(validMultipleVariableDeclarations.ts, 8, 26))
-
-    var x = 'this is a string';
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 12, 7))
-}
-
-interface Point { x: number; y: number; }
->Point : Symbol(Point, Decl(validMultipleVariableDeclarations.ts, 13, 1))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 15, 17))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 15, 28))
-
-var p: Point;
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->Point : Symbol(Point, Decl(validMultipleVariableDeclarations.ts, 13, 1))
-
-var p = { x: 1, y: 2 };
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 18, 9))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 18, 15))
-
-var p: Point = { x: 0, y: undefined };
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->Point : Symbol(Point, Decl(validMultipleVariableDeclarations.ts, 13, 1))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 19, 16))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 19, 22))
->undefined : Symbol(undefined)
-
-var p = { x: 1, y: <number>undefined };
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 20, 9))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 20, 15))
->undefined : Symbol(undefined)
-
-var p: { x: number; y: number; } = { x: 1, y: 2 };
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 21, 8))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 21, 19))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 21, 36))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 21, 42))
-
-var p = <{ x: number; y: number; }>{ x: 0, y: undefined };
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 22, 10))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 22, 21))
->x : Symbol(x, Decl(validMultipleVariableDeclarations.ts, 22, 36))
->y : Symbol(y, Decl(validMultipleVariableDeclarations.ts, 22, 42))
->undefined : Symbol(undefined)
-
-var p: typeof p;
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
->p : Symbol(p, Decl(validMultipleVariableDeclarations.ts, 17, 3), Decl(validMultipleVariableDeclarations.ts, 18, 3), Decl(validMultipleVariableDeclarations.ts, 19, 3), Decl(validMultipleVariableDeclarations.ts, 20, 3), Decl(validMultipleVariableDeclarations.ts, 21, 3), Decl(validMultipleVariableDeclarations.ts, 22, 3), Decl(validMultipleVariableDeclarations.ts, 23, 3))
-
-var fn = function (s: string) { return 42; }
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
->s : Symbol(s, Decl(validMultipleVariableDeclarations.ts, 25, 19))
-
-var fn = (s: string) => 3;
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
->s : Symbol(s, Decl(validMultipleVariableDeclarations.ts, 26, 10))
-
-var fn: (s: string) => number;
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
->s : Symbol(s, Decl(validMultipleVariableDeclarations.ts, 27, 9))
-
-var fn: { (s: string): number };
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
->s : Symbol(s, Decl(validMultipleVariableDeclarations.ts, 28, 11))
-
-var fn = <(s: string) => number> null;
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
->s : Symbol(s, Decl(validMultipleVariableDeclarations.ts, 29, 11))
-
-var fn: typeof fn;
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
->fn : Symbol(fn, Decl(validMultipleVariableDeclarations.ts, 25, 3), Decl(validMultipleVariableDeclarations.ts, 26, 3), Decl(validMultipleVariableDeclarations.ts, 27, 3), Decl(validMultipleVariableDeclarations.ts, 28, 3), Decl(validMultipleVariableDeclarations.ts, 29, 3), Decl(validMultipleVariableDeclarations.ts, 30, 3))
-
-var a: string[]; 
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
-
-var a = ['a', 'b']
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
-
-var a = <string[]>[];
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
-
-var a: string[] = [];
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
-
-var a = new Array<string>();
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
-
-var a: typeof a;
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
->a : Symbol(a, Decl(validMultipleVariableDeclarations.ts, 32, 3), Decl(validMultipleVariableDeclarations.ts, 33, 3), Decl(validMultipleVariableDeclarations.ts, 34, 3), Decl(validMultipleVariableDeclarations.ts, 35, 3), Decl(validMultipleVariableDeclarations.ts, 36, 3), Decl(validMultipleVariableDeclarations.ts, 37, 3))
-
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
deleted file mode 100644
index 966128350b0..00000000000
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ /dev/null
@@ -1,152 +0,0 @@
-=== tests/cases/conformance/statements/VariableStatements/validMultipleVariableDeclarations.ts ===
-// all expected to be valid
-
-var x: number;
->x : number
-
-var x = 2;
->x : number
->2 : number
-
-if (true) {
->true : boolean
-
-    var x = 3;
->x : number
->3 : number
-
-    for (var x = 0; ;) { }
->x : number
->0 : number
-}
-var x = <number>undefined;
->x : number
-><number>undefined : number
->undefined : undefined
-
-// new declaration space, making redeclaring x as a string valid
-function declSpace() {
->declSpace : () => void
-
-    var x = 'this is a string';
->x : string
->'this is a string' : string
-}
-
-interface Point { x: number; y: number; }
->Point : Point
->x : number
->y : number
-
-var p: Point;
->p : Point
->Point : Point
-
-var p = { x: 1, y: 2 };
->p : Point
->{ x: 1, y: 2 } : { x: number; y: number; }
->x : number
->1 : number
->y : number
->2 : number
-
-var p: Point = { x: 0, y: undefined };
->p : Point
->Point : Point
->{ x: 0, y: undefined } : { x: number; y: undefined; }
->x : number
->0 : number
->y : undefined
->undefined : undefined
-
-var p = { x: 1, y: <number>undefined };
->p : Point
->{ x: 1, y: <number>undefined } : { x: number; y: number; }
->x : number
->1 : number
->y : number
-><number>undefined : number
->undefined : undefined
-
-var p: { x: number; y: number; } = { x: 1, y: 2 };
->p : Point
->x : number
->y : number
->{ x: 1, y: 2 } : { x: number; y: number; }
->x : number
->1 : number
->y : number
->2 : number
-
-var p = <{ x: number; y: number; }>{ x: 0, y: undefined };
->p : Point
-><{ x: number; y: number; }>{ x: 0, y: undefined } : { x: number; y: number; }
->x : number
->y : number
->{ x: 0, y: undefined } : { x: number; y: undefined; }
->x : number
->0 : number
->y : undefined
->undefined : undefined
-
-var p: typeof p;
->p : Point
->p : Point
-
-var fn = function (s: string) { return 42; }
->fn : (s: string) => number
->function (s: string) { return 42; } : (s: string) => number
->s : string
->42 : number
-
-var fn = (s: string) => 3;
->fn : (s: string) => number
->(s: string) => 3 : (s: string) => number
->s : string
->3 : number
-
-var fn: (s: string) => number;
->fn : (s: string) => number
->s : string
-
-var fn: { (s: string): number };
->fn : (s: string) => number
->s : string
-
-var fn = <(s: string) => number> null;
->fn : (s: string) => number
-><(s: string) => number> null : (s: string) => number
->s : string
->null : null
-
-var fn: typeof fn;
->fn : (s: string) => number
->fn : (s: string) => number
-
-var a: string[]; 
->a : string[]
-
-var a = ['a', 'b']
->a : string[]
->['a', 'b'] : string[]
->'a' : string
->'b' : string
-
-var a = <string[]>[];
->a : string[]
-><string[]>[] : string[]
->[] : undefined[]
-
-var a: string[] = [];
->a : string[]
->[] : undefined[]
-
-var a = new Array<string>();
->a : string[]
->new Array<string>() : string[]
->Array : ArrayConstructor
-
-var a: typeof a;
->a : string[]
->a : string[]
-
diff --git a/tests/baselines/reference/whileBreakStatements.js b/tests/baselines/reference/whileBreakStatements.js
index 818be39a242..15dffe3e582 100644
--- a/tests/baselines/reference/whileBreakStatements.js
+++ b/tests/baselines/reference/whileBreakStatements.js
@@ -1,4 +1,5 @@
 //// [whileBreakStatements.ts]
+
 while(true) {
     break;
 } 
diff --git a/tests/baselines/reference/whileBreakStatements.symbols b/tests/baselines/reference/whileBreakStatements.symbols
index 2ac7721621d..022fe9a12a8 100644
--- a/tests/baselines/reference/whileBreakStatements.symbols
+++ b/tests/baselines/reference/whileBreakStatements.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/whileBreakStatements.ts ===
+
 while(true) {
     break;
 } 
@@ -38,7 +39,7 @@ while (true)
 EIGHT:
 while (true) {
     var fn = function () { }
->fn : Symbol(fn, Decl(whileBreakStatements.ts, 38, 7))
+>fn : Symbol(fn, Decl(whileBreakStatements.ts, 39, 7))
 
     break EIGHT;
 }
diff --git a/tests/baselines/reference/whileBreakStatements.types b/tests/baselines/reference/whileBreakStatements.types
index e7ca0a5322f..a31d1e9b40e 100644
--- a/tests/baselines/reference/whileBreakStatements.types
+++ b/tests/baselines/reference/whileBreakStatements.types
@@ -1,4 +1,5 @@
 === tests/cases/conformance/statements/breakStatements/whileBreakStatements.ts ===
+
 while(true) {
 >true : boolean
 
diff --git a/tests/baselines/reference/whileContinueStatements.errors.txt b/tests/baselines/reference/whileContinueStatements.errors.txt
new file mode 100644
index 00000000000..c2009b02600
--- /dev/null
+++ b/tests/baselines/reference/whileContinueStatements.errors.txt
@@ -0,0 +1,59 @@
+tests/cases/conformance/statements/continueStatements/whileContinueStatements.ts(5,1): error TS7027: Unreachable code detected.
+
+
+==== tests/cases/conformance/statements/continueStatements/whileContinueStatements.ts (1 errors) ====
+    while(true) {
+        continue;
+    } 
+    
+    while (true) {
+    ~~~~~
+!!! error TS7027: Unreachable code detected.
+        if (true) {
+            continue;
+        }
+    }
+    
+    ONE:
+    
+    while (true) {
+        continue ONE;
+    }
+    
+    TWO:
+    THREE:
+    while (true) {
+        continue THREE;
+    }
+    
+    FOUR:
+    while (true) {
+        FIVE:
+        while (true) {
+            continue FOUR;
+        }
+    }
+    
+    while (true) {
+        SIX:
+        while (true)
+            continue SIX;
+    }
+    
+    SEVEN:
+    while (true)
+        while (true)
+            while (true)
+                continue SEVEN;
+    
+    EIGHT:
+    while (true) {
+        var fn = function () { }
+        continue EIGHT;
+    }
+    
+    NINE:
+    while (true) {
+        if (true) { continue NINE; }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/whileContinueStatements.symbols b/tests/baselines/reference/whileContinueStatements.symbols
deleted file mode 100644
index 67508556f70..00000000000
--- a/tests/baselines/reference/whileContinueStatements.symbols
+++ /dev/null
@@ -1,56 +0,0 @@
-=== tests/cases/conformance/statements/continueStatements/whileContinueStatements.ts ===
-while(true) {
-    continue;
-} 
-
-while (true) {
-    if (true) {
-        continue;
-    }
-}
-
-ONE:
-
-while (true) {
-    continue ONE;
-}
-
-TWO:
-THREE:
-while (true) {
-    continue THREE;
-}
-
-FOUR:
-while (true) {
-    FIVE:
-    while (true) {
-        continue FOUR;
-    }
-}
-
-while (true) {
-    SIX:
-    while (true)
-        continue SIX;
-}
-
-SEVEN:
-while (true)
-    while (true)
-        while (true)
-            continue SEVEN;
-
-EIGHT:
-while (true) {
-    var fn = function () { }
->fn : Symbol(fn, Decl(whileContinueStatements.ts, 44, 7))
-
-    continue EIGHT;
-}
-
-NINE:
-while (true) {
-    if (true) { continue NINE; }
-}
-
diff --git a/tests/baselines/reference/whileContinueStatements.types b/tests/baselines/reference/whileContinueStatements.types
deleted file mode 100644
index 6bf371cde9e..00000000000
--- a/tests/baselines/reference/whileContinueStatements.types
+++ /dev/null
@@ -1,110 +0,0 @@
-=== tests/cases/conformance/statements/continueStatements/whileContinueStatements.ts ===
-while(true) {
->true : boolean
-
-    continue;
-} 
-
-while (true) {
->true : boolean
-
-    if (true) {
->true : boolean
-
-        continue;
-    }
-}
-
-ONE:
->ONE : any
-
-while (true) {
->true : boolean
-
-    continue ONE;
->ONE : any
-}
-
-TWO:
->TWO : any
-
-THREE:
->THREE : any
-
-while (true) {
->true : boolean
-
-    continue THREE;
->THREE : any
-}
-
-FOUR:
->FOUR : any
-
-while (true) {
->true : boolean
-
-    FIVE:
->FIVE : any
-
-    while (true) {
->true : boolean
-
-        continue FOUR;
->FOUR : any
-    }
-}
-
-while (true) {
->true : boolean
-
-    SIX:
->SIX : any
-
-    while (true)
->true : boolean
-
-        continue SIX;
->SIX : any
-}
-
-SEVEN:
->SEVEN : any
-
-while (true)
->true : boolean
-
-    while (true)
->true : boolean
-
-        while (true)
->true : boolean
-
-            continue SEVEN;
->SEVEN : any
-
-EIGHT:
->EIGHT : any
-
-while (true) {
->true : boolean
-
-    var fn = function () { }
->fn : () => void
->function () { } : () => void
-
-    continue EIGHT;
->EIGHT : any
-}
-
-NINE:
->NINE : any
-
-while (true) {
->true : boolean
-
-    if (true) { continue NINE; }
->true : boolean
->NINE : any
-}
-
diff --git a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts
index 0c5d8d156bf..ca26f1b2a44 100644
--- a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts
+++ b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts
@@ -1,2 +1,23 @@
+// @Filename: ambientClassDeclarationExtends_singleFile.ts
 declare class A { }
 declare class B extends A { }
+
+declare class C {
+    public foo;
+}
+namespace D { var x; }
+declare class D extends C { }
+
+var d: C = new D();
+
+// @Filename: ambientClassDeclarationExtends_file1.ts
+
+declare class E {
+    public bar;
+}
+namespace F { var y; }
+
+// @Filename: ambientClassDeclarationExtends_file2.ts
+
+declare class F extends E { }
+var f: E = new F();
diff --git a/tests/cases/compiler/bestCommonTypeReturnStatement.ts b/tests/cases/compiler/bestCommonTypeReturnStatement.ts
index aff173664f6..cb481147f9b 100644
--- a/tests/cases/compiler/bestCommonTypeReturnStatement.ts
+++ b/tests/cases/compiler/bestCommonTypeReturnStatement.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 interface IPromise<T> {
     then(successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any): IPromise<any>;
 }
diff --git a/tests/cases/compiler/bindingPatternInParameter01.ts b/tests/cases/compiler/bindingPatternInParameter01.ts
new file mode 100644
index 00000000000..3b3a4312f87
--- /dev/null
+++ b/tests/cases/compiler/bindingPatternInParameter01.ts
@@ -0,0 +1,5 @@
+const nestedArray = [[[1, 2]], [[3, 4]]];
+
+nestedArray.forEach(([[a, b]]) => {
+  console.log(a, b);
+});
diff --git a/tests/cases/compiler/breakTarget3.ts b/tests/cases/compiler/breakTarget3.ts
index 9cef599692c..64a9357706f 100644
--- a/tests/cases/compiler/breakTarget3.ts
+++ b/tests/cases/compiler/breakTarget3.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/compiler/breakTarget4.ts b/tests/cases/compiler/breakTarget4.ts
index 2c3eadca7db..3e00bca659b 100644
--- a/tests/cases/compiler/breakTarget4.ts
+++ b/tests/cases/compiler/breakTarget4.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/compiler/breakTarget5.ts b/tests/cases/compiler/breakTarget5.ts
index a05ee1cf879..f0bceb5015f 100644
--- a/tests/cases/compiler/breakTarget5.ts
+++ b/tests/cases/compiler/breakTarget5.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target:
 while (true) {
   function f() {
diff --git a/tests/cases/compiler/capturedLetConstInLoop1.ts b/tests/cases/compiler/capturedLetConstInLoop1.ts
new file mode 100644
index 00000000000..bc731fdd35f
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop1.ts
@@ -0,0 +1,113 @@
+//==== let
+for (let x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+//=========const
+for (const x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts
new file mode 100644
index 00000000000..314fc4a9919
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts
@@ -0,0 +1,114 @@
+// @target: ES6
+//==== let
+for (let x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+//=========const
+for (const x in {}) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop2.ts b/tests/cases/compiler/capturedLetConstInLoop2.ts
new file mode 100644
index 00000000000..7dbd5d01f93
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop2.ts
@@ -0,0 +1,176 @@
+
+
+// ========let
+function foo0(x) {
+    for (let x of []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3(x) {
+    do {
+        let x;
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        let a = arguments.length;
+        let x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+///=======const
+function foo0_c(x) {
+    for (const x of []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        const a = arguments.length;
+        const x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y =1 ;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts
new file mode 100644
index 00000000000..00aed712188
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts
@@ -0,0 +1,176 @@
+// @target: ES6
+
+// ========let
+function foo0(x) {
+    for (let x of []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3(x) {
+    do {
+        let x;
+        let a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        let a = arguments.length;
+        let x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        let a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+///=======const
+function foo0_c(x) {
+    for (const x of []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + a });
+        (() => x + a);
+    } while (1 === 1)
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        const a = arguments.length;
+        const x = 1;
+        (function() { return x + a });
+        (() => x + a);
+    }
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y =1 ;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    } while (1 === 1)
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        const a = arguments.length;
+        (function() { return x + y + a });
+        (() => x + y + a);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop3.ts b/tests/cases/compiler/capturedLetConstInLoop3.ts
new file mode 100644
index 00000000000..dc5eef6dd34
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop3.ts
@@ -0,0 +1,217 @@
+///=========let
+declare function use(a: any);
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+//===const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        const x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts
new file mode 100644
index 00000000000..657c5190473
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts
@@ -0,0 +1,219 @@
+// @target: ES6
+
+///=========let
+declare function use(a: any);
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+//===const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo0_1_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        const x = 1;
+        (function() { return x + v });
+        (() => x + v);
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+    }
+    
+    use(v);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop4.ts b/tests/cases/compiler/capturedLetConstInLoop4.ts
new file mode 100644
index 00000000000..58f05876f89
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop4.ts
@@ -0,0 +1,143 @@
+// @module: system
+
+//======let
+export function exportedFoo() {
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+}
+
+for (let x of []) {
+    var v0 = x;
+    (function() { return x + v0});
+    (() => x);    
+}
+
+for (let x in []) {
+    var v00 = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (let x = 0; x < 1; ++x) {
+    var v1 = x;
+    (function() { return x + v1});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    var v2 = x;
+    (function() { return x + v2});
+    (() => x);
+}
+
+do {
+    let x;
+    var v3 = x;
+    (function() { return x + v3});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v4 = x;
+    (function() { return x + v4});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    var v5 = x;
+    (function() { return x + y + v5});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    var v6 = x;
+    (function() { return x + y + v6});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    var v7 = x;
+    (function() { return x + y + v7});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v8 = x;
+    (function() { return x + y + v8});
+    (() => x + y);
+}
+
+//======const
+export function exportedFoo2() {
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+}
+
+for (const x of []) {
+    var v0_c = x;
+    (function() { return x + v0_c});
+    (() => x);    
+}
+
+for (const x in []) {
+    var v00_c = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (const x = 0; x < 1;) {
+    var v1_c = x;
+    (function() { return x + v1_c});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x =1;
+    var v2_c = x;
+    (function() { return x + v2_c});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    var v3_c = x;
+    (function() { return x + v3_c});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v4_c = x;
+    (function() { return x + v4_c});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    var v5_c = x;
+    (function() { return x + y + v5_c});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    var v6_c = x;
+    (function() { return x + y + v6_c});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    var v7_c = x;
+    (function() { return x + y + v7_c});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v8_c = x;
+    (function() { return x + y + v8_c});
+    (() => x + y);
+}
diff --git a/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts
new file mode 100644
index 00000000000..e65c01e90e2
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts
@@ -0,0 +1,143 @@
+// @target: ES6
+
+//======let
+export function exportedFoo() {
+    return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
+}
+
+for (let x of []) {
+    var v0 = x;
+    (function() { return x + v0});
+    (() => x);    
+}
+
+for (let x in []) {
+    var v00 = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (let x = 0; x < 1; ++x) {
+    var v1 = x;
+    (function() { return x + v1});
+    (() => x);
+}
+
+while (1 === 1) {
+    let x;
+    var v2 = x;
+    (function() { return x + v2});
+    (() => x);
+}
+
+do {
+    let x;
+    var v3 = x;
+    (function() { return x + v3});
+    (() => x);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v4 = x;
+    (function() { return x + v4});
+    (() => x);
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    var v5 = x;
+    (function() { return x + y + v5});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    let x, y;
+    var v6 = x;
+    (function() { return x + y + v6});
+    (() => x + y);
+}
+
+do {
+    let x, y;
+    var v7 = x;
+    (function() { return x + y + v7});
+    (() => x + y);
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    var v8 = x;
+    (function() { return x + y + v8});
+    (() => x + y);
+}
+
+//======const
+export function exportedFoo2() {
+    return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
+}
+
+for (const x of []) {
+    var v0_c = x;
+    (function() { return x + v0_c});
+    (() => x);    
+}
+
+for (const x in []) {
+    var v00_c = x;
+    (function() { return x + v00});
+    (() => x);    
+}
+
+for (const x = 0; x < 1;) {
+    var v1_c = x;
+    (function() { return x + v1_c});
+    (() => x);
+}
+
+while (1 === 1) {
+    const x =1;
+    var v2_c = x;
+    (function() { return x + v2_c});
+    (() => x);
+}
+
+do {
+    const x = 1;
+    var v3_c = x;
+    (function() { return x + v3_c});
+    (() => x);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v4_c = x;
+    (function() { return x + v4_c});
+    (() => x);
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    var v5_c = x;
+    (function() { return x + y + v5_c});
+    (() => x + y);
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    var v6_c = x;
+    (function() { return x + y + v6_c});
+    (() => x + y);
+}
+
+do {
+    const x = 1, y = 1;
+    var v7_c = x;
+    (function() { return x + y + v7_c});
+    (() => x + y);
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    var v8_c = x;
+    (function() { return x + y + v8_c});
+    (() => x + y);
+}
diff --git a/tests/cases/compiler/capturedLetConstInLoop5.ts b/tests/cases/compiler/capturedLetConstInLoop5.ts
new file mode 100644
index 00000000000..475137c14cc
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop5.ts
@@ -0,0 +1,279 @@
+declare function use(a: any);
+
+//====let
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    };
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+//====const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts
new file mode 100644
index 00000000000..035e21b9e84
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts
@@ -0,0 +1,281 @@
+// @target: ES6
+
+declare function use(a: any);
+
+//====let
+function foo0(x) {
+    for (let x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00(x) {
+    for (let x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1(x) {
+    for (let x = 0; x < 1; ++x) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2(x) {
+    while (1 === 1) {
+        let x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3(x) {
+    do {
+        let x;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4(x) {
+    for (let y = 0; y < 1; ++y) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5(x) {
+    for (let x = 0, y = 1; x < 1; ++x) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6(x) {
+    while (1 === 1) {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    };
+    
+    use(v)
+}
+
+function foo7(x) {
+    do {
+        let x, y;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1);
+    
+    use(v);
+}
+
+
+function foo8(x) {
+    for (let y = 0; y < 1; ++y) {
+        let x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+//====const
+function foo0_c(x) {
+    for (const x of []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo00_c(x) {
+    for (const x in []) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo1_c(x) {
+    for (const x = 0; x < 1;) {
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+
+    use(v);
+}
+
+function foo2_c(x) {
+    while (1 === 1) {
+        const x = 1;
+        var v = x;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo3_c(x) {
+    do {
+        const x = 1;
+        var v;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+function foo4_c(x) {
+    for (const y = 0; y < 1;) {
+        var v = y;
+        let x = 1;
+        (function() { return x + v });
+        (() => x + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+function foo5_c(x) {
+    for (const x = 0, y = 1; x < 1;) {
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
+
+
+function foo6_c(x) {
+    while (1 === 1) {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v)
+}
+
+function foo7_c(x) {
+    do {
+        const x = 1, y = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    } while (1 === 1)
+    
+    use(v);
+}
+
+
+function foo8_c(x) {
+    for (const y = 0; y < 1;) {
+        const x = 1;
+        var v = x;
+        (function() { return x + y + v });
+        (() => x + y + v);
+        if (x == 1) {
+            return;
+        }
+    }
+    
+    use(v);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop6.ts b/tests/cases/compiler/capturedLetConstInLoop6.ts
new file mode 100644
index 00000000000..321d20e3c20
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop6.ts
@@ -0,0 +1,237 @@
+// ====let
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
diff --git a/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts
new file mode 100644
index 00000000000..f43fe5851d2
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts
@@ -0,0 +1,238 @@
+// @target: ES6
+// ====let
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+// ====const
+
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+} while (1 === 1)
+
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 2) {
+        continue;
+    }
+}
+
diff --git a/tests/cases/compiler/capturedLetConstInLoop7.ts b/tests/cases/compiler/capturedLetConstInLoop7.ts
new file mode 100644
index 00000000000..a1d35c4038b
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop7.ts
@@ -0,0 +1,375 @@
+//===let
+l0:
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0;
+    }
+}
+
+l00:
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00;
+    }
+}
+
+l1:
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1;
+    }
+}
+
+l2:
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2;
+    }
+}
+
+l3:
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3;
+    }
+} while (1 === 1)
+
+l4:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4;
+    }
+}
+
+l5:
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5;
+    }
+}
+
+l6:
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6;
+    }
+
+}
+
+l7:
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7;
+    }
+} while (1 === 1)
+
+l8:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8;
+    }
+}
+
+//===const
+l0_c:
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0_c;
+    }
+}
+
+l00_c:
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00_c;
+    }
+}
+
+l1_c:
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1_c;
+    }
+}
+
+l2_c:
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2_c;
+    }
+}
+
+l3_c:
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3_c;
+    }
+} while (1 === 1)
+
+l4_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4_c;
+    }
+}
+
+l5_c:
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5_c;
+    }
+}
+
+l6_c:
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6_c;
+    }
+
+}
+
+l7_c:
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7_c;
+    }
+} while (1 === 1)
+
+l8_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8_c;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts
new file mode 100644
index 00000000000..14b1d0c85af
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts
@@ -0,0 +1,376 @@
+// @target: ES6
+//===let
+l0:
+for (let x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0;
+    }
+}
+
+l00:
+for (let x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00;
+    }
+}
+
+l1:
+for (let x = 0; x < 1; ++x) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1;
+    }
+}
+
+l2:
+while (1 === 1) {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2;
+    }
+}
+
+l3:
+do {
+    let x;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3;
+    }
+} while (1 === 1)
+
+l4:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4;
+    }
+}
+
+l5:
+for (let x = 0, y = 1; x < 1; ++x) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5;
+    }
+}
+
+l6:
+while (1 === 1) {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6;
+    }
+
+}
+
+l7:
+do {
+    let x, y;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7;
+    }
+} while (1 === 1)
+
+l8:
+for (let y = 0; y < 1; ++y) {
+    let x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8;
+    }
+}
+
+//===const
+l0_c:
+for (const x of []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l0_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l0_c;
+    }
+}
+
+l00_c:
+for (const x in []) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l00_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l00_c;
+    }
+}
+
+l1_c:
+for (const x = 0; x < 1;) {
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l1_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l1_c;
+    }
+}
+
+l2_c:
+while (1 === 1) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l2_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l2_c;
+    }
+}
+
+l3_c:
+do {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l3_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l3_c;
+    }
+} while (1 === 1)
+
+l4_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x});
+    (() => x);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l4_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l4_c;
+    }
+}
+
+l5_c:
+for (const x = 0, y = 1; x < 1;) {
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l5_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l5_c;
+    }
+}
+
+l6_c:
+while (1 === 1) {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l6_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l6_c;
+    }
+
+}
+
+l7_c:
+do {
+    const x = 1, y = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l7_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l7_c;
+    }
+} while (1 === 1)
+
+l8_c:
+for (const y = 0; y < 1;) {
+    const x = 1;
+    (function() { return x + y});
+    (() => x + y);
+    if (x == 1) {
+        break;
+    }
+    if (x == 1) {
+        break l8_c;
+    }
+    if (x == 2) {
+        continue;
+    }
+    if (x == 2) {
+        continue l8_c;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop8.ts b/tests/cases/compiler/capturedLetConstInLoop8.ts
new file mode 100644
index 00000000000..0467267626c
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop8.ts
@@ -0,0 +1,125 @@
+function foo() {
+    l0:
+    for (let z = 0; z < 1; ++z) {
+        l1:
+        for (let x = 0; x < 1; ++x) {
+            ll1:
+            for (let y = 0; y < 1; ++y) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+    l0:
+    for (const z = 0; z < 1;) {
+        l1:
+        for (const x = 0; x < 1;) {
+            ll1:
+            for (const y = 0; y < 1;) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
diff --git a/tests/cases/compiler/capturedLetConstInLoop8_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop8_ES6.ts
new file mode 100644
index 00000000000..0cad7bad6a7
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop8_ES6.ts
@@ -0,0 +1,126 @@
+// @target: ES6
+function foo() {
+    l0:
+    for (let z = 0; z < 1; ++z) {
+        l1:
+        for (let x = 0; x < 1; ++x) {
+            ll1:
+            for (let y = 0; y < 1; ++y) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
+
+function foo_c() {
+    l0:
+    for (const z = 0; z < 1;) {
+        l1:
+        for (const x = 0; x < 1;) {
+            ll1:
+            for (const y = 0; y < 1;) {
+                (function() { return x + y });
+                (() => x + y);
+                if (y == 1) {
+                    break;
+                }
+                if (y == 1) {
+                    break l1;
+                }
+                if (y == 1) {
+                    break ll1;
+                }
+                if (y == 1) {
+                    continue l0;
+                }
+
+                if (x == 2) {
+                    continue;
+                }
+                if (x == 2) {
+                    continue l1;
+                }
+                if (x == 2) {
+                    continue ll1;
+                }
+                if (x == 2) {
+                    return "123"
+                }
+                if (x == 3) {
+                    return;
+                }
+            }
+            if (x == 1) {
+                break;
+            }
+            if (x == 1) {
+                break l1;
+            }
+            if (x == 2) {
+                continue;
+            }
+            if (x == 2) {
+                continue l1;
+            }
+            if (x == 2) {
+                continue l0;
+            }
+            if (x == 2) {
+                return "456";
+            }
+            if (x == 3) {
+                return;
+            }
+        }
+    }
+}
diff --git a/tests/cases/compiler/capturedLetConstInLoop9.ts b/tests/cases/compiler/capturedLetConstInLoop9.ts
new file mode 100644
index 00000000000..4b67349690d
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop9.ts
@@ -0,0 +1,138 @@
+for (let x = 0; x < 1; ++x) {
+    let x;
+    (function() { return x });
+    {
+        let x;
+        (function() { return x });
+    }
+
+    try { }
+    catch (e) {
+        let x;
+        (function() { return x });
+    }
+
+    switch (x) {
+        case 1:
+            let x;
+            (function() { return x });
+           break;
+    }
+    
+    while (1 == 1) {
+        let x;
+        (function() { return x });
+    }
+    
+    class A {
+        m() {
+            return x + 1;
+        }
+    }
+}
+
+declare function use(a: any);
+
+function foo() {
+    l0:
+    for (let a of []) {
+        
+        if (a === 1) {
+            break;
+        }
+        
+        if (a === 2) {
+            break l0;
+        }
+        
+        for (let b of []) {
+            var [{x, y:z}] = [{x:1, y:2}];
+            if (b === 1) {
+                break;
+            }
+            
+            
+            if (b === 2) {
+                break l0;
+            }
+            
+            l1:
+            if (b === 3) {
+                break l1;
+            }
+            
+            return 50;
+        }
+
+        for (let b of []) {
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+            if (b === 1) {
+                break;
+            }
+            
+            if (b === 2) {
+                break l0;
+            }
+            
+            () => b
+            return 100;
+        }
+
+        
+        () => a;
+    }
+    
+    use(x);
+    use(z);
+    use(x1);
+    use(z1);
+}
+
+function foo2() {
+    for (let x of []) {
+        if (x === 1) {
+            break;
+        }
+        else if (x === 2) {
+            continue;
+        }
+        
+        while (1 === 1) {
+            if (x) {
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+            case 1: break;
+            case 2: continue;
+        }
+        
+        for (let y of []) {
+            switch(y) {
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+
+class C {
+    constructor(private N: number) { }
+    foo() {
+        for (let i = 0; i < 100; i++) {
+            let f = () => this.N * i;
+        }
+    }
+}
+
+function foo3 () {
+    let x = arguments.length;
+    for (let y of []) {
+        let z = arguments.length;
+        (function() { return y + z + arguments.length; });
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts
new file mode 100644
index 00000000000..25c696ff7e6
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts
@@ -0,0 +1,139 @@
+// @target: ES6
+
+for (let x = 0; x < 1; ++x) {
+    let x;
+    (function() { return x });
+    {
+        let x;
+        (function() { return x });
+    }
+
+    try { }
+    catch (e) {
+        let x;
+        (function() { return x });
+    }
+
+    switch (x) {
+        case 1:
+            let x;
+            (function() { return x });
+           break;
+    }
+    
+    while (1 == 1) {
+        let x;
+        (function() { return x });
+    }
+    
+    class A {
+        m() {
+            return x + 1;
+        }
+    }
+}
+
+declare function use(a: any);
+
+function foo() {
+    l0:
+    for (let a of []) {
+        
+        if (a === 1) {
+            break;
+        }
+        
+        if (a === 2) {
+            break l0;
+        }
+        
+        for (let b of []) {
+            var [{x, y:z}] = [{x:1, y:2}];
+            if (b === 1) {
+                break;
+            }
+            
+            
+            if (b === 2) {
+                break l0;
+            }
+            
+            l1:
+            if (b === 3) {
+                break l1;
+            }
+            
+            return 50;
+        }
+
+        for (let b of []) {
+            var [{x1, y:z1}] = [{x1:1, y:arguments.length}];
+            if (b === 1) {
+                break;
+            }
+            
+            if (b === 2) {
+                break l0;
+            }
+            () => b
+            return 100;
+        }
+
+        
+        () => a;
+    }
+    
+    use(x);
+    use(z);
+    use(x1);
+    use(z1);
+}
+
+function foo2() {
+    for (let x of []) {
+        if (x === 1) {
+            break;
+        }
+        else if (x === 2) {
+            continue;
+        }
+        
+        while (1 === 1) {
+            if (x) {
+                break;
+            }
+            else {
+                continue;
+            }
+        }
+        
+        switch(x) {
+            case 1: break;
+            case 2: continue;
+        }
+        
+        for (let y of []) {
+            switch(y) {
+                case 1: break;
+                case 2: continue;
+            }
+        }
+    }
+}
+
+class C {
+    constructor(private N: number) { }
+    foo() {
+        for (let i = 0; i < 100; i++) {
+            let f = () => this.N * i;
+        }
+    }
+}
+
+function foo3 () {
+    let x = arguments.length;
+    for (let y of []) {
+        let z = arguments.length;
+        (function() { return y + z + arguments.length; });
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts b/tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts
new file mode 100644
index 00000000000..931f64a4b29
--- /dev/null
+++ b/tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts
@@ -0,0 +1,11 @@
+declare function use(a: any): void;
+
+class A {
+    doIt(x: Array<string>): void {
+        x.forEach((v) => {
+            switch(v) {
+                case "test": use(this);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentEmitAtEndOfFile1.ts b/tests/cases/compiler/commentEmitAtEndOfFile1.ts
index b1b863890d5..5713ef006e5 100644
--- a/tests/cases/compiler/commentEmitAtEndOfFile1.ts
+++ b/tests/cases/compiler/commentEmitAtEndOfFile1.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 // test
 var f = ''
 // test #2
diff --git a/tests/cases/compiler/commentsAtEndOfFile1.ts b/tests/cases/compiler/commentsAtEndOfFile1.ts
index 8e37b2361a5..04c90b3433a 100644
--- a/tests/cases/compiler/commentsAtEndOfFile1.ts
+++ b/tests/cases/compiler/commentsAtEndOfFile1.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 Input:
 ;
 //Testing two
diff --git a/tests/cases/compiler/commonSourceDir1.ts b/tests/cases/compiler/commonSourceDir1.ts
new file mode 100644
index 00000000000..1a178ac0226
--- /dev/null
+++ b/tests/cases/compiler/commonSourceDir1.ts
@@ -0,0 +1,6 @@
+// @outDir: A:/
+// @Filename: A:/foo/bar.ts
+var x: number;
+
+// @Filename: A:/foo/baz.ts
+var y: number;
diff --git a/tests/cases/compiler/commonSourceDir2.ts b/tests/cases/compiler/commonSourceDir2.ts
new file mode 100644
index 00000000000..68dab0727a3
--- /dev/null
+++ b/tests/cases/compiler/commonSourceDir2.ts
@@ -0,0 +1,6 @@
+// @outDir: A:/
+// @Filename: A:/foo/bar.ts
+var x: number;
+
+// @Filename: B:/foo/baz.ts
+var y: number;
\ No newline at end of file
diff --git a/tests/cases/compiler/commonSourceDir3.ts b/tests/cases/compiler/commonSourceDir3.ts
new file mode 100644
index 00000000000..54b6e8c89b7
--- /dev/null
+++ b/tests/cases/compiler/commonSourceDir3.ts
@@ -0,0 +1,7 @@
+// @useCaseSensitiveFileNames: false
+// @outDir: A:/
+// @Filename: A:/foo/bar.ts
+var x: number;
+
+// @Filename: a:/foo/baz.ts
+var y: number;
\ No newline at end of file
diff --git a/tests/cases/compiler/commonSourceDir4.ts b/tests/cases/compiler/commonSourceDir4.ts
new file mode 100644
index 00000000000..41ee7a0344a
--- /dev/null
+++ b/tests/cases/compiler/commonSourceDir4.ts
@@ -0,0 +1,7 @@
+// @useCaseSensitiveFileNames: true
+// @outDir: A:/
+// @Filename: A:/foo/bar.ts
+var x: number;
+
+// @Filename: a:/foo/baz.ts
+var y: number;
\ No newline at end of file
diff --git a/tests/cases/compiler/computedPropertiesInDestructuring1.ts b/tests/cases/compiler/computedPropertiesInDestructuring1.ts
new file mode 100644
index 00000000000..d3ccaa57ad1
--- /dev/null
+++ b/tests/cases/compiler/computedPropertiesInDestructuring1.ts
@@ -0,0 +1,36 @@
+// destructuring in variable declarations
+let foo = "bar";
+let {[foo]: bar} = {bar: "bar"};
+
+let {["bar"]: bar2} = {bar: "bar"};
+
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {bar: "bar"};
+
+let [{[foo]: bar4}] = [{bar: "bar"}];
+let [{[foo2()]: bar5}] = [{bar: "bar"}];
+
+function f1({["bar"]: x}: { bar: number }) {}
+function f2({[foo]: x}: { bar: number }) {}
+function f3({[foo2()]: x}: { bar: number }) {}
+function f4([{[foo]: x}]: [{ bar: number }]) {}
+function f5([{[foo2()]: x}]: [{ bar: number }]) {}
+
+// report errors on type errors in computed properties used in destructuring
+let [{[foo()]: bar6}] = [{bar: "bar"}];
+let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
+
+// destructuring assignment
+({[foo]: bar} = {bar: "bar"});
+
+({["bar"]: bar2} = {bar: "bar"});
+
+({[foo2()]: bar3} = {bar: "bar"});
+
+[{[foo]: bar4}] = [{bar: "bar"}];
+[{[foo2()]: bar5}] = [{bar: "bar"}];
+
+[{[foo()]: bar4}] = [{bar: "bar"}];
+[{[(1 + {})]: bar4}] = [{bar: "bar"}];
+
+
diff --git a/tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts b/tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts
new file mode 100644
index 00000000000..4951e474fdb
--- /dev/null
+++ b/tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts
@@ -0,0 +1,36 @@
+// @target: ES6
+// destructuring in variable declarations
+let foo = "bar";
+let {[foo]: bar} = {bar: "bar"};
+
+let {["bar"]: bar2} = {bar: "bar"};
+let {[11]: bar2_1} = {11: "bar"};
+
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {bar: "bar"};
+
+let [{[foo]: bar4}] = [{bar: "bar"}];
+let [{[foo2()]: bar5}] = [{bar: "bar"}];
+
+function f1({["bar"]: x}: { bar: number }) {}
+function f2({[foo]: x}: { bar: number }) {}
+function f3({[foo2()]: x}: { bar: number }) {}
+function f4([{[foo]: x}]: [{ bar: number }]) {}
+function f5([{[foo2()]: x}]: [{ bar: number }]) {}
+
+// report errors on type errors in computed properties used in destructuring
+let [{[foo()]: bar6}] = [{bar: "bar"}];
+let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}];
+
+// destructuring assignment
+({[foo]: bar} = {bar: "bar"});
+
+({["bar"]: bar2} = {bar: "bar"});
+
+({[foo2()]: bar3} = {bar: "bar"});
+
+[{[foo]: bar4}] = [{bar: "bar"}];
+[{[foo2()]: bar5}] = [{bar: "bar"}];
+
+[{[foo()]: bar4}] = [{bar: "bar"}];
+[{[(1 + {})]: bar4}] = [{bar: "bar"}];
diff --git a/tests/cases/compiler/computedPropertiesInDestructuring2.ts b/tests/cases/compiler/computedPropertiesInDestructuring2.ts
new file mode 100644
index 00000000000..806c528c17c
--- /dev/null
+++ b/tests/cases/compiler/computedPropertiesInDestructuring2.ts
@@ -0,0 +1,2 @@
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {};
\ No newline at end of file
diff --git a/tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts b/tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts
new file mode 100644
index 00000000000..c21f86bed1c
--- /dev/null
+++ b/tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts
@@ -0,0 +1,4 @@
+// @target: ES6
+
+let foo2 = () => "bar";
+let {[foo2()]: bar3} = {};
\ No newline at end of file
diff --git a/tests/cases/compiler/conditionalExpressions2.ts b/tests/cases/compiler/conditionalExpressions2.ts
index 6f2f097f6de..ece002d7778 100644
--- a/tests/cases/compiler/conditionalExpressions2.ts
+++ b/tests/cases/compiler/conditionalExpressions2.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 var a = false ? 1 : null;
 var b = false ? undefined : 0;
 var c = false ? 1 : 0;
diff --git a/tests/cases/compiler/constDeclarations-invalidContexts.ts b/tests/cases/compiler/constDeclarations-invalidContexts.ts
index b5093180990..6d21ee31ec2 100644
--- a/tests/cases/compiler/constDeclarations-invalidContexts.ts
+++ b/tests/cases/compiler/constDeclarations-invalidContexts.ts
@@ -1,3 +1,4 @@
+// @allowUnreachableCode: true
 // @target: ES6
 
 // Errors, const must be defined inside a block
diff --git a/tests/cases/compiler/constDeclarations-validContexts.ts b/tests/cases/compiler/constDeclarations-validContexts.ts
index ffde8e45d6f..63af6d16959 100644
--- a/tests/cases/compiler/constDeclarations-validContexts.ts
+++ b/tests/cases/compiler/constDeclarations-validContexts.ts
@@ -1,3 +1,4 @@
+// @allowUnreachableCode: true
 // @target: ES6
 
 
diff --git a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts
index a93628e5494..63e0fc30141 100644
--- a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts
+++ b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 declare module "fs" {
     export class File {
         constructor(filename: string);
diff --git a/tests/cases/compiler/continueNotInIterationStatement4.ts b/tests/cases/compiler/continueNotInIterationStatement4.ts
index 5996eb4323a..218cb151df3 100644
--- a/tests/cases/compiler/continueNotInIterationStatement4.ts
+++ b/tests/cases/compiler/continueNotInIterationStatement4.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 TWO:
 while (true){
   var x = () => {
diff --git a/tests/cases/compiler/continueTarget3.ts b/tests/cases/compiler/continueTarget3.ts
index 26bea241a7a..a7b47ff071b 100644
--- a/tests/cases/compiler/continueTarget3.ts
+++ b/tests/cases/compiler/continueTarget3.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/compiler/continueTarget4.ts b/tests/cases/compiler/continueTarget4.ts
index e00c222aa9c..5ba2bd69b11 100644
--- a/tests/cases/compiler/continueTarget4.ts
+++ b/tests/cases/compiler/continueTarget4.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/compiler/continueTarget5.ts b/tests/cases/compiler/continueTarget5.ts
index dd3a806ab2d..5f3d068282b 100644
--- a/tests/cases/compiler/continueTarget5.ts
+++ b/tests/cases/compiler/continueTarget5.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target:
 while (true) {
   function f() {
diff --git a/tests/cases/compiler/declarationEmitDetachedComment1.ts b/tests/cases/compiler/declarationEmitDetachedComment1.ts
new file mode 100644
index 00000000000..8d49482f3cc
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitDetachedComment1.ts
@@ -0,0 +1,34 @@
+// @target: es5
+// @module: commonjs
+// @declaration: true
+// @removeComments: false
+
+// @filename: test1.ts
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+
+}
+
+// @filename: test2.ts
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+
+}
+
+// @filename: test3.ts
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+
+}
diff --git a/tests/cases/compiler/declarationEmitDetachedComment2.ts b/tests/cases/compiler/declarationEmitDetachedComment2.ts
new file mode 100644
index 00000000000..1eed803c625
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitDetachedComment2.ts
@@ -0,0 +1,34 @@
+// @target: es5
+// @module: commonjs
+// @declaration: true
+// @removeComments: true
+
+// @filename: test1.ts
+/*! Copyright 2015 MyCompany Inc. */
+
+/**
+ * Hello class
+ */
+class Hello {
+
+}
+
+// @filename: test2.ts
+/* A comment at the top of the file. */
+
+/**
+ * Hi class
+ */
+class Hi {
+
+}
+
+// @filename: test3.ts
+// A one-line comment at the top of the file.
+
+/**
+ * Hola class
+ */
+class Hola {
+
+}
diff --git a/tests/cases/compiler/downlevelLetConst16.ts b/tests/cases/compiler/downlevelLetConst16.ts
index 30a27ba61f4..b30f26b4b82 100644
--- a/tests/cases/compiler/downlevelLetConst16.ts
+++ b/tests/cases/compiler/downlevelLetConst16.ts
@@ -1,4 +1,6 @@
 // @target:es5
+// @allowUnreachableCode: true
+
 'use strict'
 
 declare function use(a: any);
diff --git a/tests/cases/compiler/downlevelLetConst17.ts b/tests/cases/compiler/downlevelLetConst17.ts
index b581281f679..7cea2031ac5 100644
--- a/tests/cases/compiler/downlevelLetConst17.ts
+++ b/tests/cases/compiler/downlevelLetConst17.ts
@@ -1,4 +1,5 @@
 // @target:es5
+// @allowUnreachableCode: true
 'use strict'
 
 declare function use(a: any);
diff --git a/tests/cases/compiler/downlevelLetConst18.ts b/tests/cases/compiler/downlevelLetConst18.ts
index 59f2ee7a46e..61cb2f46cc9 100644
--- a/tests/cases/compiler/downlevelLetConst18.ts
+++ b/tests/cases/compiler/downlevelLetConst18.ts
@@ -1,4 +1,6 @@
 // @target:es5
+// @allowUnreachableCode: true
+
 'use strict'
 
 for (let x; ;) {
@@ -6,7 +8,7 @@ for (let x; ;) {
 }
 
 for (let x; ;) {
-    function foo() { x };
+    function foo1() { x };
 }
 
 for (let x; ;) {
diff --git a/tests/cases/compiler/duplicateLabel1.ts b/tests/cases/compiler/duplicateLabel1.ts
index c588e7b8183..ff248c64548 100644
--- a/tests/cases/compiler/duplicateLabel1.ts
+++ b/tests/cases/compiler/duplicateLabel1.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target:
 target:
 while (true) {
diff --git a/tests/cases/compiler/duplicateLabel2.ts b/tests/cases/compiler/duplicateLabel2.ts
index bdb0396a246..5ebf273c118 100644
--- a/tests/cases/compiler/duplicateLabel2.ts
+++ b/tests/cases/compiler/duplicateLabel2.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target:
 while (true) {
   target:
diff --git a/tests/cases/compiler/duplicateLabel3.ts b/tests/cases/compiler/duplicateLabel3.ts
index d4db9399ed2..d6add980447 100644
--- a/tests/cases/compiler/duplicateLabel3.ts
+++ b/tests/cases/compiler/duplicateLabel3.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target:
 while (true) {
   function f() {
diff --git a/tests/cases/compiler/duplicateLabel4.ts b/tests/cases/compiler/duplicateLabel4.ts
index 2c62180a2ab..bf7ea5c22c6 100644
--- a/tests/cases/compiler/duplicateLabel4.ts
+++ b/tests/cases/compiler/duplicateLabel4.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 target:
 while (true) {
 }
diff --git a/tests/cases/compiler/duplicateLocalVariable1.ts b/tests/cases/compiler/duplicateLocalVariable1.ts
index fc20a19c2d9..f6288cfc6ae 100644
--- a/tests/cases/compiler/duplicateLocalVariable1.ts
+++ b/tests/cases/compiler/duplicateLocalVariable1.ts
@@ -1,4 +1,6 @@
-//@module: commonjs
+
+// @allowUnreachableCode: true
+/ /@module: commonjs
 
 //import FileManager = require('filemanager');
 //import App = require('app');
diff --git a/tests/cases/compiler/duplicateVariablesByScope.ts b/tests/cases/compiler/duplicateVariablesByScope.ts
index 481c1bb950e..dc811130d4f 100644
--- a/tests/cases/compiler/duplicateVariablesByScope.ts
+++ b/tests/cases/compiler/duplicateVariablesByScope.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // duplicate local variables are only reported at global scope
 
 module M {
diff --git a/tests/cases/compiler/emptyThenWarning.ts b/tests/cases/compiler/emptyThenWarning.ts
new file mode 100644
index 00000000000..4811c0b4400
--- /dev/null
+++ b/tests/cases/compiler/emptyThenWarning.ts
@@ -0,0 +1,6 @@
+if(1);
+
+let x = 0;
+if (true === true); {  
+    x = 1;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/emptyThenWithoutWarning.ts b/tests/cases/compiler/emptyThenWithoutWarning.ts
new file mode 100644
index 00000000000..c35b9b3181d
--- /dev/null
+++ b/tests/cases/compiler/emptyThenWithoutWarning.ts
@@ -0,0 +1,7 @@
+let a = 4;
+
+if(a === 1 || a === 2 || a === 3) {
+}
+else {
+    let message = "Ooops";
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ClassSuperCodegenBug.ts b/tests/cases/compiler/es6ClassSuperCodegenBug.ts
index 7ab8344c815..2e3f306d5d6 100644
--- a/tests/cases/compiler/es6ClassSuperCodegenBug.ts
+++ b/tests/cases/compiler/es6ClassSuperCodegenBug.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 class A {
 	constructor(str1:string, str2:string) {}
 }
diff --git a/tests/cases/compiler/escapedIdentifiers.ts b/tests/cases/compiler/escapedIdentifiers.ts
index 795aeca2481..c58c59d9b42 100644
--- a/tests/cases/compiler/escapedIdentifiers.ts
+++ b/tests/cases/compiler/escapedIdentifiers.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 /*
     0 .. \u0030
     9 .. \u0039
diff --git a/tests/cases/compiler/for.ts b/tests/cases/compiler/for.ts
index e27dab7dbd2..636c7e4a5fc 100644
--- a/tests/cases/compiler/for.ts
+++ b/tests/cases/compiler/for.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 for (var i = 0; i < 10; i++) { // ok
     var x1 = i;
 }
diff --git a/tests/cases/compiler/functionOverloads12.ts b/tests/cases/compiler/functionOverloads12.ts
index 3e8a9882d08..48a8af06cc5 100644
--- a/tests/cases/compiler/functionOverloads12.ts
+++ b/tests/cases/compiler/functionOverloads12.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function foo():string;
 function foo():number;
 function foo():any { if (true) return ""; else return 0;}
diff --git a/tests/cases/compiler/functionReturn.ts b/tests/cases/compiler/functionReturn.ts
index 8ea0cb8f5a1..897480c64d6 100644
--- a/tests/cases/compiler/functionReturn.ts
+++ b/tests/cases/compiler/functionReturn.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function f0(): void { }
 function f1() {
     var n: any = f0();
diff --git a/tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts b/tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts
new file mode 100644
index 00000000000..c8936034a25
--- /dev/null
+++ b/tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts
@@ -0,0 +1,4 @@
+function bar(): typeof b {
+    var b = 1;
+    return undefined;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/functionWithNoBestCommonType1.ts b/tests/cases/compiler/functionWithNoBestCommonType1.ts
index 11628812925..2d7a1191770 100644
--- a/tests/cases/compiler/functionWithNoBestCommonType1.ts
+++ b/tests/cases/compiler/functionWithNoBestCommonType1.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function foo() {
     return true;
     return bar();
diff --git a/tests/cases/compiler/functionWithNoBestCommonType2.ts b/tests/cases/compiler/functionWithNoBestCommonType2.ts
index 974ccdfe035..6bc3878d834 100644
--- a/tests/cases/compiler/functionWithNoBestCommonType2.ts
+++ b/tests/cases/compiler/functionWithNoBestCommonType2.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 var v = function () {
    return true;
    return bar();
diff --git a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
index 81259fd7c0c..fde615af41d 100644
--- a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
+++ b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // @target: es5
 
 function f1(): string {
diff --git a/tests/cases/compiler/ifElseWithStatements1.ts b/tests/cases/compiler/ifElseWithStatements1.ts
index a7f337068cb..5ed7f7dd7a3 100644
--- a/tests/cases/compiler/ifElseWithStatements1.ts
+++ b/tests/cases/compiler/ifElseWithStatements1.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 if (true)
     f();
 else
diff --git a/tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts b/tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts
index d150fb1930a..6465e7f1200 100644
--- a/tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts
+++ b/tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function foo() {
     if (true) {
         return 42;
diff --git a/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts b/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts
index 2620e7d88d4..e325ae4582a 100644
--- a/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 class a {
     static get x(): () => string {
         return null;;
diff --git a/tests/cases/compiler/letAndVarRedeclaration.ts b/tests/cases/compiler/letAndVarRedeclaration.ts
index 1f901ded520..aaf2ce1a68c 100644
--- a/tests/cases/compiler/letAndVarRedeclaration.ts
+++ b/tests/cases/compiler/letAndVarRedeclaration.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // @target: es6
 
 let e0
diff --git a/tests/cases/compiler/letDeclarations-invalidContexts.ts b/tests/cases/compiler/letDeclarations-invalidContexts.ts
index 4d165ba2cda..cde6c2006bb 100644
--- a/tests/cases/compiler/letDeclarations-invalidContexts.ts
+++ b/tests/cases/compiler/letDeclarations-invalidContexts.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // @target: ES6
 
 // Errors, let must be defined inside a block
diff --git a/tests/cases/compiler/letDeclarations-scopes.ts b/tests/cases/compiler/letDeclarations-scopes.ts
index 93f4ce5b4ed..b050a5e9bd0 100644
--- a/tests/cases/compiler/letDeclarations-scopes.ts
+++ b/tests/cases/compiler/letDeclarations-scopes.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // @target: ES6
 
 // global
diff --git a/tests/cases/compiler/letDeclarations-validContexts.ts b/tests/cases/compiler/letDeclarations-validContexts.ts
index baedfa2644c..2a4022901c1 100644
--- a/tests/cases/compiler/letDeclarations-validContexts.ts
+++ b/tests/cases/compiler/letDeclarations-validContexts.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // @target: ES6
 
 
diff --git a/tests/cases/compiler/literalsInComputedProperties1.ts b/tests/cases/compiler/literalsInComputedProperties1.ts
new file mode 100644
index 00000000000..e3fed5b80aa
--- /dev/null
+++ b/tests/cases/compiler/literalsInComputedProperties1.ts
@@ -0,0 +1,52 @@
+// @noImplicitAny: true
+
+let x = {
+    1:1,
+    [2]:1,
+    "3":1,
+    ["4"]:1
+}
+x[1].toExponential();
+x[2].toExponential();
+x[3].toExponential();
+x[4].toExponential();
+
+interface A {
+    1:number;
+    [2]:number;
+    "3":number;
+    ["4"]:number;
+}
+
+let y:A;
+y[1].toExponential();
+y[2].toExponential();
+y[3].toExponential();
+y[4].toExponential();
+
+class C {
+    1:number;
+    [2]:number;
+    "3":number;
+    ["4"]:number;
+}
+
+let z:C;
+z[1].toExponential();
+z[2].toExponential();
+z[3].toExponential();
+z[4].toExponential();
+
+enum X {
+    1 = 1,
+    [2] = 2,
+    "3" = 3,
+    ["4"] = 4,
+    "foo" = 5,
+    ["bar"] = 6
+}
+
+let a = X["foo"];
+let a0 = X["bar"];
+
+// TODO: make sure that enum still disallow template literals as member names
\ No newline at end of file
diff --git a/tests/cases/compiler/localClassesInLoop.ts b/tests/cases/compiler/localClassesInLoop.ts
new file mode 100644
index 00000000000..1d5f84d2843
--- /dev/null
+++ b/tests/cases/compiler/localClassesInLoop.ts
@@ -0,0 +1,10 @@
+declare function use(a: any);
+
+"use strict"
+var data = [];
+for (let x = 0; x < 2; ++x) {
+    class C { }
+    data.push(() => C);
+}
+
+use(data[0]() === data[1]());
\ No newline at end of file
diff --git a/tests/cases/compiler/localClassesInLoop_ES6.ts b/tests/cases/compiler/localClassesInLoop_ES6.ts
new file mode 100644
index 00000000000..6f0c2c6b33a
--- /dev/null
+++ b/tests/cases/compiler/localClassesInLoop_ES6.ts
@@ -0,0 +1,12 @@
+// @target: ES6
+
+declare function use(a: any);
+
+"use strict"
+var data = [];
+for (let x = 0; x < 2; ++x) {
+    class C { }
+    data.push(() => C);
+}
+
+use(data[0]() === data[1]());
\ No newline at end of file
diff --git a/tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts b/tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts
new file mode 100644
index 00000000000..6395813b658
--- /dev/null
+++ b/tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts
@@ -0,0 +1,15 @@
+class A {
+    f() {}
+    static m1 (a: string): void;
+    m1 (a: number): void;
+    m1 (a: any): void {
+    }
+}
+
+class B {
+    f() {}
+    m1 (a: string): void;
+    static m1 (a: number): void;
+    m1 (a: any): void {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/nestedRedeclarationInES6AMD.ts b/tests/cases/compiler/nestedRedeclarationInES6AMD.ts
new file mode 100644
index 00000000000..e518e354cd0
--- /dev/null
+++ b/tests/cases/compiler/nestedRedeclarationInES6AMD.ts
@@ -0,0 +1,8 @@
+// @target: ES6
+// @module: AMD
+function a() {
+    {
+        let status = 1;
+        status = 2;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noReachabilityErrorsOnEmptyStatement.ts b/tests/cases/compiler/noReachabilityErrorsOnEmptyStatement.ts
new file mode 100644
index 00000000000..81152c82b43
--- /dev/null
+++ b/tests/cases/compiler/noReachabilityErrorsOnEmptyStatement.ts
@@ -0,0 +1,3 @@
+function foo() {
+    return 1;;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts b/tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts
new file mode 100644
index 00000000000..6ec4c6076f2
--- /dev/null
+++ b/tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts
@@ -0,0 +1,8 @@
+class A {
+    m1: string;
+    f() {}
+    m1 (a: string): void;
+    m1 (a: number): void;
+    m1 (a: any): void {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/nonMergedOverloads.ts b/tests/cases/compiler/nonMergedOverloads.ts
new file mode 100644
index 00000000000..582cd72e1f4
--- /dev/null
+++ b/tests/cases/compiler/nonMergedOverloads.ts
@@ -0,0 +1,5 @@
+var f = 10;
+
+export function f();
+export function f() {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/null.ts b/tests/cases/compiler/null.ts
index eb88d387bcc..e8fa9a5d687 100644
--- a/tests/cases/compiler/null.ts
+++ b/tests/cases/compiler/null.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 var x=null; 
 var y=3+x;  
 var z=3+null; 
diff --git a/tests/cases/compiler/objectLiteralExcessProperties.ts b/tests/cases/compiler/objectLiteralExcessProperties.ts
new file mode 100644
index 00000000000..0aa81703c33
--- /dev/null
+++ b/tests/cases/compiler/objectLiteralExcessProperties.ts
@@ -0,0 +1,21 @@
+interface Book {
+    foreword: string;
+}
+
+interface Cover {
+    color?: string;
+}
+
+var b1: Book = { forword: "oops" };
+
+var b2: Book | string = { foreward: "nope" };
+
+var b3: Book | (Book[]) = [{ foreword: "hello" }, { forwards: "back" }];
+
+var b4: Book & Cover = { foreword: "hi", colour: "blue" };
+
+var b5: Book & Cover = { foreward: "hi", color: "blue" };
+
+var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
+
+var b7: Book & number = { foreword: "hi", price: 10.99 };
diff --git a/tests/cases/compiler/optionsInlineSourceMapMapRoot.ts b/tests/cases/compiler/optionsInlineSourceMapMapRoot.ts
new file mode 100644
index 00000000000..ddea5f363c7
--- /dev/null
+++ b/tests/cases/compiler/optionsInlineSourceMapMapRoot.ts
@@ -0,0 +1,4 @@
+// @mapRoot: local
+// @inlineSourceMap: true
+
+var a = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts b/tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts
new file mode 100644
index 00000000000..b4fdc66e309
--- /dev/null
+++ b/tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts
@@ -0,0 +1,4 @@
+// @sourceRoot: local
+// @inlineSourceMap: true
+
+var a = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/optionsInlineSourceMapSourcemap.ts b/tests/cases/compiler/optionsInlineSourceMapSourcemap.ts
new file mode 100644
index 00000000000..d78097985d8
--- /dev/null
+++ b/tests/cases/compiler/optionsInlineSourceMapSourcemap.ts
@@ -0,0 +1,4 @@
+// @sourcemap: true
+// @inlineSourceMap: true
+
+var a = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/optionsSourcemapInlineSources.ts b/tests/cases/compiler/optionsSourcemapInlineSources.ts
new file mode 100644
index 00000000000..dddfb5f84ca
--- /dev/null
+++ b/tests/cases/compiler/optionsSourcemapInlineSources.ts
@@ -0,0 +1,4 @@
+// @sourcemap: true
+// @inlineSources: true
+
+var a = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts b/tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts
new file mode 100644
index 00000000000..c7a74469dc1
--- /dev/null
+++ b/tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts
@@ -0,0 +1,5 @@
+// @sourcemap: true
+// @inlineSources: true
+// @mapRoot: local
+
+var a = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts b/tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts
new file mode 100644
index 00000000000..4fd372658ad
--- /dev/null
+++ b/tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts
@@ -0,0 +1,5 @@
+// @sourcemap: true
+// @inlineSources: true
+// @sourceRoot: local
+
+var a = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/outModuleConcatAmd.ts b/tests/cases/compiler/outModuleConcatAmd.ts
new file mode 100644
index 00000000000..411a13e72a2
--- /dev/null
+++ b/tests/cases/compiler/outModuleConcatAmd.ts
@@ -0,0 +1,12 @@
+// @target: ES5
+// @sourcemap: true
+// @declaration: true
+// @module: amd
+// @outFile: all.js
+
+// @Filename: ref/a.ts
+export class A { }
+
+// @Filename: b.ts
+import {A} from "./ref/a";
+export class B extends A { }
\ No newline at end of file
diff --git a/tests/cases/compiler/outModuleConcatCommonjs.ts b/tests/cases/compiler/outModuleConcatCommonjs.ts
new file mode 100644
index 00000000000..0cb57bd11e7
--- /dev/null
+++ b/tests/cases/compiler/outModuleConcatCommonjs.ts
@@ -0,0 +1,14 @@
+// @target: ES5
+// @sourcemap: true
+// @declaration: true
+// @module: commonjs
+// @outFile: all.js
+
+// This should be an error
+
+// @Filename: ref/a.ts
+export class A { }
+
+// @Filename: b.ts
+import {A} from "./ref/a";
+export class B extends A { }
\ No newline at end of file
diff --git a/tests/cases/compiler/outModuleConcatES6.ts b/tests/cases/compiler/outModuleConcatES6.ts
new file mode 100644
index 00000000000..e98514e9adc
--- /dev/null
+++ b/tests/cases/compiler/outModuleConcatES6.ts
@@ -0,0 +1,14 @@
+// @target: ES6
+// @sourcemap: true
+// @declaration: true
+// @module: es6
+// @outFile: all.js
+
+// This should be an error
+
+// @Filename: ref/a.ts
+export class A { }
+
+// @Filename: b.ts
+import {A} from "./ref/a";
+export class B extends A { }
\ No newline at end of file
diff --git a/tests/cases/compiler/outModuleConcatSystem.ts b/tests/cases/compiler/outModuleConcatSystem.ts
new file mode 100644
index 00000000000..c8d9b4e9737
--- /dev/null
+++ b/tests/cases/compiler/outModuleConcatSystem.ts
@@ -0,0 +1,12 @@
+// @target: ES5
+// @sourcemap: true
+// @declaration: true
+// @module: system
+// @outFile: all.js
+
+// @Filename: ref/a.ts
+export class A { }
+
+// @Filename: b.ts
+import {A} from "./ref/a";
+export class B extends A { }
\ No newline at end of file
diff --git a/tests/cases/compiler/outModuleConcatUmd.ts b/tests/cases/compiler/outModuleConcatUmd.ts
new file mode 100644
index 00000000000..fa4a4a519c6
--- /dev/null
+++ b/tests/cases/compiler/outModuleConcatUmd.ts
@@ -0,0 +1,14 @@
+// @target: ES5
+// @sourcemap: true
+// @declaration: true
+// @module: umd
+// @outFile: all.js
+
+// This should error
+
+// @Filename: ref/a.ts
+export class A { }
+
+// @Filename: b.ts
+import {A} from "./ref/a";
+export class B extends A { }
\ No newline at end of file
diff --git a/tests/cases/compiler/outModuleTripleSlashRefs.ts b/tests/cases/compiler/outModuleTripleSlashRefs.ts
new file mode 100644
index 00000000000..fdeb4f93453
--- /dev/null
+++ b/tests/cases/compiler/outModuleTripleSlashRefs.ts
@@ -0,0 +1,33 @@
+// @target: ES5
+// @sourcemap: true
+// @declaration: true
+// @module: amd
+// @outFile: all.js
+
+// @Filename: ref/a.ts
+/// <reference path="./b.ts" />
+export class A {
+	member: typeof GlobalFoo;
+}
+
+// @Filename: ref/b.ts
+/// <reference path="./c.d.ts" />
+class Foo {
+	member: Bar;
+}
+declare var GlobalFoo: Foo;
+
+// @Filename: ref/c.d.ts
+/// <reference path="./d.d.ts" />
+declare class Bar {
+	member: Baz;
+}
+
+// @Filename: ref/d.d.ts
+declare class Baz {
+	member: number;
+}
+
+// @Filename: b.ts
+import {A} from "./ref/a";
+export class B extends A { }
diff --git a/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts b/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts
index 21884031aec..12b99fb29ce 100644
--- a/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts
+++ b/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts
@@ -1 +1,3 @@
+// @allowUnreachableCode: true
+
 var f: (x: 'hi') => number = ('hi') => { return 1; };
\ No newline at end of file
diff --git a/tests/cases/compiler/parameterNamesInTypeParameterList.ts b/tests/cases/compiler/parameterNamesInTypeParameterList.ts
new file mode 100644
index 00000000000..dba122db866
--- /dev/null
+++ b/tests/cases/compiler/parameterNamesInTypeParameterList.ts
@@ -0,0 +1,23 @@
+function f0<T extends typeof a>(a: T) {
+	a.b;
+}
+
+function f1<T extends typeof a>({a}: {a:T}) {
+	a.b;
+}
+
+function f2<T extends typeof a>([a]: T[]) {
+	a.b;
+}
+
+class A {
+	m0<T extends typeof a>(a: T) {
+		a.b
+	}
+	m1<T extends typeof a>({a}: {a:T}) {
+		a.b
+	}
+	m2<T extends typeof a>([a]: T[]) {
+		a.b
+	}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/reachabilityChecks1.ts b/tests/cases/compiler/reachabilityChecks1.ts
new file mode 100644
index 00000000000..6430556a203
--- /dev/null
+++ b/tests/cases/compiler/reachabilityChecks1.ts
@@ -0,0 +1,76 @@
+// @allowUnreachableCode: false
+// @preserveConstEnums: true
+
+while (true);
+var x = 1;
+
+module A {
+    while (true);
+    let x;
+}
+
+module A1 {
+    do {} while(true);
+    module A {
+        interface F {}
+    }
+}
+
+module A2 {
+    while (true);
+    module A {
+        var x = 1;
+    }
+}
+
+module A3 {
+    while (true);
+    type T = string;
+}
+
+module A4 {
+    while (true);
+    module A {
+        const enum E { X }
+    }
+}
+
+function f1(x) {
+    if (x) {
+        return;
+    }
+    else {
+        throw new Error("123");
+    }
+    var x;
+}
+
+function f2() {
+    return;
+    class A {
+    }
+}
+
+module B {
+    for (; ;);
+    module C {
+    }
+}
+
+function f3() {
+    do {
+    } while (true);
+    enum E {
+        X = 1
+    }
+}
+
+function f4() {
+    if (true) {
+        throw new Error();
+    }
+    const enum E {
+        X = 1
+    }
+}
+
diff --git a/tests/cases/compiler/reachabilityChecks2.ts b/tests/cases/compiler/reachabilityChecks2.ts
new file mode 100644
index 00000000000..5a7a8aaab58
--- /dev/null
+++ b/tests/cases/compiler/reachabilityChecks2.ts
@@ -0,0 +1,13 @@
+// @allowUnreachableCode: false
+// @preserveConstEnums: false
+
+while (true) { }
+const enum E { X }
+
+module A4 {
+    while (true);
+    module A {
+        const enum E { X }
+    }
+}
+
diff --git a/tests/cases/compiler/reachabilityChecks3.ts b/tests/cases/compiler/reachabilityChecks3.ts
new file mode 100644
index 00000000000..19f57e55b67
--- /dev/null
+++ b/tests/cases/compiler/reachabilityChecks3.ts
@@ -0,0 +1,16 @@
+// @allowUnusedLabels: false
+
+let x = 1;
+loop: while (true) {
+    if (x == 100) {
+        break;
+    }
+    else {
+        x++;
+    }
+}
+{
+    x: 100
+}
+
+var y = () => { f: 1 }
\ No newline at end of file
diff --git a/tests/cases/compiler/reachabilityChecks4.ts b/tests/cases/compiler/reachabilityChecks4.ts
new file mode 100644
index 00000000000..f07395ac38e
--- /dev/null
+++ b/tests/cases/compiler/reachabilityChecks4.ts
@@ -0,0 +1,15 @@
+// @noFallthroughCasesInSwitch: true
+
+function foo(x, y) {
+    switch (x) {
+        case 1:
+        case 2:
+            return 1;
+        case 3:
+            if (y) {
+                return 2;
+            }
+        case 4:
+            return 3;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/reachabilityChecks5.ts b/tests/cases/compiler/reachabilityChecks5.ts
new file mode 100644
index 00000000000..97df11ccb79
--- /dev/null
+++ b/tests/cases/compiler/reachabilityChecks5.ts
@@ -0,0 +1,131 @@
+// @allowUnreachableCode: false
+// @noImplicitReturns: true
+
+function f0(x): number {
+    while (true);
+}
+
+function f1(x): number {
+    if (x) {
+        return 1
+    }
+}
+
+function f2(x): number {
+    while (x) {
+        throw new Error();
+    }
+    return 1;
+}
+
+function f3(x): number {
+    while (x) {
+        throw new Error();
+    }
+}
+
+function f3_1 (x): number {
+    while (x) {
+    }
+    throw new Error();
+}
+
+function f4(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+    }
+    catch (e) {
+    }
+}
+
+function f5(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 2;
+    }
+}
+
+function f6(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+        else 
+        {
+            throw new Error();
+        }
+    }
+    catch (e) {
+    }
+}
+
+function f7(x): number {
+    try {
+        if (x) {
+            return 1;
+        }
+        else {
+            throw new Error();
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f8(x): number {
+    try {
+        if (true) {
+            x++;
+        }
+        else {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f9(x): number {
+    try {
+        while (false) {
+            return 1;
+        }
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f10(x): number {
+    try {
+        do {
+            x++;
+        } while (true);
+    }
+    catch (e) {
+        return 1;
+    }
+}
+
+function f11(x): number {
+    test:
+    try {
+        do {
+            do {
+                break test;
+            } while (true);
+            x++;
+        } while (true);
+    }
+    catch (e) {
+        return 1;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveMods.ts b/tests/cases/compiler/recursiveMods.ts
index fa07646ba72..84dbafff558 100644
--- a/tests/cases/compiler/recursiveMods.ts
+++ b/tests/cases/compiler/recursiveMods.ts
@@ -1,4 +1,6 @@
-//@module: commonjs
+// @allowUnreachableCode: true
+// @module: commonjs
+
 export module Foo {
 	export class C {}
 }
diff --git a/tests/cases/compiler/returnStatement1.ts b/tests/cases/compiler/returnStatement1.ts
index e87635b37d7..06d1bdb9569 100644
--- a/tests/cases/compiler/returnStatement1.ts
+++ b/tests/cases/compiler/returnStatement1.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function f() {
     return function (s) {
         var x = s;
diff --git a/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts b/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts
new file mode 100644
index 00000000000..8b08fd64e3e
--- /dev/null
+++ b/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts
@@ -0,0 +1,16 @@
+// @target: ES6
+// @module: commonjs
+
+// @filename: existingModule.ts
+export var x = 1;
+
+// @filename: test.ts
+import {x} from './existingModule';
+import {foo} from './missingModule';
+
+declare function use(a: any): void;
+
+const test = { x, foo };
+
+use(x);
+use(foo);
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapValidationLabeled.ts b/tests/cases/compiler/sourceMapValidationLabeled.ts
index 5993e82aacc..e36bdd9a0b3 100644
--- a/tests/cases/compiler/sourceMapValidationLabeled.ts
+++ b/tests/cases/compiler/sourceMapValidationLabeled.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
 // @sourcemap: true
+
 x:
 var b = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts b/tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts
new file mode 100644
index 00000000000..57ba843a69c
--- /dev/null
+++ b/tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts
@@ -0,0 +1,4 @@
+// @sourcemap: true
+((item: string) =>
+    item
+)
\ No newline at end of file
diff --git a/tests/cases/compiler/systemModule8.ts b/tests/cases/compiler/systemModule8.ts
index c3e0c7c7437..4490b2a8529 100644
--- a/tests/cases/compiler/systemModule8.ts
+++ b/tests/cases/compiler/systemModule8.ts
@@ -1,3 +1,4 @@
+// @allowUnreachableCode: true
 // @module: system
 
 export var x;
diff --git a/tests/cases/compiler/typeAliasDeclareKeyword01.d.ts b/tests/cases/compiler/typeAliasDeclareKeyword01.d.ts
new file mode 100644
index 00000000000..cf2a5061937
--- /dev/null
+++ b/tests/cases/compiler/typeAliasDeclareKeyword01.d.ts
@@ -0,0 +1,2 @@
+type Foo = number;
+declare type Bar = string;
\ No newline at end of file
diff --git a/tests/cases/compiler/typeCheckTypeArgument.ts b/tests/cases/compiler/typeCheckTypeArgument.ts
index ea125f62c07..1647f40dafb 100644
--- a/tests/cases/compiler/typeCheckTypeArgument.ts
+++ b/tests/cases/compiler/typeCheckTypeArgument.ts
@@ -1,4 +1,3 @@
-/// <reference no-default-lib="true"/>
 
 var f: <T extends UNKNOWN>() => void;
 
diff --git a/tests/cases/compiler/typeParameterEquality.ts b/tests/cases/compiler/typeParameterEquality.ts
new file mode 100644
index 00000000000..aa136aa3655
--- /dev/null
+++ b/tests/cases/compiler/typeParameterEquality.ts
@@ -0,0 +1,5 @@
+// @target: es6
+class C {
+    get x(): <T>(a: T) => T { return null; }
+    set x(p: <U>(a: U) => U) {}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/typeParametersAndParametersInComputedNames.ts b/tests/cases/compiler/typeParametersAndParametersInComputedNames.ts
new file mode 100644
index 00000000000..273dcb2a3ea
--- /dev/null
+++ b/tests/cases/compiler/typeParametersAndParametersInComputedNames.ts
@@ -0,0 +1,8 @@
+function foo<T>(a: T) : string {
+    return "";
+}
+
+class A {
+    [foo<T>(a)]<T>(a: T) {  
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts b/tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts
new file mode 100644
index 00000000000..e3bc08e3307
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts
@@ -0,0 +1,45 @@
+interface BaseInterface {
+    required: number;
+    optional?: number;
+}
+
+class BaseClass {
+    baseMethod() { }
+    baseNumber: number;
+}
+
+interface Child extends BaseInterface {
+    additional: number;
+}
+
+class Child extends BaseClass {
+    classNumber: number;
+    method() { }
+}
+
+interface ChildNoBaseClass extends BaseInterface {
+    additional2: string;
+}
+class ChildNoBaseClass {
+    classString: string;
+    method2() { }
+}
+class Grandchild extends ChildNoBaseClass {
+}
+
+// checks if properties actually were merged
+var child : Child;
+child.required;
+child.optional;
+child.additional;
+child.baseNumber;
+child.classNumber;
+child.baseMethod();
+child.method();
+
+var grandchild: Grandchild;
+grandchild.required;
+grandchild.optional;
+grandchild.additional2;
+grandchild.classString;
+grandchild.method2();
diff --git a/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts
new file mode 100644
index 00000000000..14885ca9905
--- /dev/null
+++ b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts
@@ -0,0 +1,30 @@
+class A<T> {
+    genericVar: T
+}
+function B1<U>() {
+    // class expression can use T
+    return class extends A<U> { }
+}
+class B2<V> {
+    anon = class extends A<V> { }
+}
+function B3<W>() {
+    return class Inner<TInner> extends A<W> { }
+}
+// extends can call B
+class K extends B1<number>() {
+    namae: string;
+}
+class C extends (new B2<number>().anon) {
+    name: string;
+}
+let b3Number = B3<number>();
+class S extends b3Number<string> {
+    nom: string;
+}
+var c = new C();
+var k = new K();
+var s = new S();
+c.genericVar = 12;
+k.genericVar = 12;
+s.genericVar = 12;
diff --git a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts
index 70c0b35763e..54c95c95a37 100644
--- a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts
+++ b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts
@@ -10,16 +10,16 @@ class C {
     static get ["computedname"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname1"]() {
         return "";
     }
-    get ["computedname"]() {
+    get ["computedname2"]() {
         return "";
     }
 
-    set ["computedname"](x: any) {
+    set ["computedname3"](x: any) {
     }
-    set ["computedname"](y: string) {
+    set ["computedname4"](y: string) {
     }
 
     set foo(a: string) { }
diff --git a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts
index c5d95bc6cb1..b7399a3511c 100644
--- a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts
+++ b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts
@@ -2,18 +2,18 @@
 class D {
     _bar: string;
     foo() { }
-    ["computedName"]() { }
-    ["computedName"](a: string) { }
-    ["computedName"](a: string): number { return 1; }
+    ["computedName1"]() { }
+    ["computedName2"](a: string) { }
+    ["computedName3"](a: string): number { return 1; }
     bar(): string {
         return this._bar;
     } 
     baz(a: any, x: string): string {
         return "HELLO";
     }
-    static ["computedname"]() { }
-    static ["computedname"](a: string) { }
-    static ["computedname"](a: string): boolean { return true; }
+    static ["computedname4"]() { }
+    static ["computedname5"](a: string) { }
+    static ["computedname6"](a: string): boolean { return true; }
     static staticMethod() {
         var x = 1 + 2;
         return x
diff --git a/tests/cases/conformance/es6/modules/reExportDefaultExport.ts b/tests/cases/conformance/es6/modules/reExportDefaultExport.ts
new file mode 100644
index 00000000000..730435fd4ee
--- /dev/null
+++ b/tests/cases/conformance/es6/modules/reExportDefaultExport.ts
@@ -0,0 +1,15 @@
+// @module: commonjs
+// @target: ES5
+
+// @filename: m1.ts
+export default function f() {
+}
+export {f};
+
+
+// @filename: m2.ts
+import foo from "./m1";
+import {f} from "./m1";
+
+f();
+foo();
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts
index b36f423be21..62311ee75c9 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 // expected error for all the LHS of compound assignments (arithmetic and addition)
 var value;
 
diff --git a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts
index cd0fb64e0d2..d6bfd84fd9a 100644
--- a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts
+++ b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 class Base { private p; }
 class Derived1 extends Base { private m; }
 class Derived2 extends Base { private n; }
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts
new file mode 100644
index 00000000000..54e9a1bd8fe
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts
@@ -0,0 +1,18 @@
+enum E {}
+enum V {}
+
+let x: number|string|E|V;
+
+if (typeof x === "number") {
+    x; // number|E|V
+}
+else {
+    x; // string
+}
+
+if (typeof x !== "number") {
+    x; // string
+}
+else {
+    x; // number|E|V
+}
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts
new file mode 100644
index 00000000000..aa394aaa75b
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts
@@ -0,0 +1,16 @@
+let x: string | number;
+
+if (typeof x === "string") {
+    let n = class {
+        constructor() {
+            let y: string = x;
+        }
+    }
+}
+else {
+    let m = class {
+        constructor() {
+            let y: number = x;
+        }
+    }
+}
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts
new file mode 100644
index 00000000000..6423af18a5a
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts
@@ -0,0 +1,14 @@
+let strOrBool: string|boolean;
+if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') {
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+}
+
+if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') {
+	let label: string = (typeof strOrBool === 'string') ? strOrBool : "string";
+	let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false;
+	let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string";
+	let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false;
+}
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormInstanceOf.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormInstanceOf.ts
index 233909f44aa..31514fca749 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormInstanceOf.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormInstanceOf.ts
@@ -13,18 +13,55 @@ class C2 {
 class D1 extends C1 {
     p3: number;
 }
+class C3 {
+    p4: number;
+}
 var str: string;
 var num: number;
 var strOrNum: string | number;
 
-var c1Orc2: C1 | C2;
-str = c1Orc2 instanceof C1 && c1Orc2.p1; // C1
-num = c1Orc2 instanceof C2 && c1Orc2.p2; // C2
-str = c1Orc2 instanceof D1 && c1Orc2.p1; // D1
-num = c1Orc2 instanceof D1 && c1Orc2.p3; // D1
+var ctor1: C1 | C2;
+str = ctor1 instanceof C1 && ctor1.p1; // C1
+num = ctor1 instanceof C2 && ctor1.p2; // C2
+str = ctor1 instanceof D1 && ctor1.p1; // D1
+num = ctor1 instanceof D1 && ctor1.p3; // D1
+
+var ctor2: C2 | D1;
+num = ctor2 instanceof C2 && ctor2.p2; // C2
+num = ctor2 instanceof D1 && ctor2.p3; // D1
+str = ctor2 instanceof D1 && ctor2.p1; // D1
+var r2: D1 | C2 = ctor2 instanceof C1 && ctor2; // C2 | D1
 
-var c2Ord1: C2 | D1;
-num = c2Ord1 instanceof C2 && c2Ord1.p2; // C2
-num = c2Ord1 instanceof D1 && c2Ord1.p3; // D1
-str = c2Ord1 instanceof D1 && c2Ord1.p1; // D1
-var r2: D1 | C2 = c2Ord1 instanceof C1 && c2Ord1; // C2 | D1
\ No newline at end of file
+var ctor3: C1 | C2;
+if (ctor3 instanceof C1) {
+    ctor3.p1; // C1
+}
+else {
+    ctor3.p2; // C2
+}
+
+var ctor4: C1 | C2 | C3;
+if (ctor4 instanceof C1) {
+    ctor4.p1; // C1
+}
+else if (ctor4 instanceof C2) {
+    ctor4.p2; // C2
+}
+else {
+    ctor4.p4; // C3
+}
+
+var ctor5: C1 | D1 | C2;
+if (ctor5 instanceof C1) {
+    ctor5.p1; // C1
+}
+else {
+    ctor5.p2; // C2
+}
+
+var ctor6: C1 | C2 | C3;
+if (ctor6 instanceof C1 || ctor6 instanceof C2) {
+}
+else {
+    ctor6.p4; // C3
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
index 9d7d555fc18..ac3403d8151 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
@@ -22,19 +22,19 @@ if (typeof strOrC === "Object") {
     c = strOrC; // C
 }
 else {
-    var r2: string | C = strOrC; // string | C
+    var r2: string = strOrC; // string
 }
 if (typeof numOrC === "Object") {
     c = numOrC; // C
 }
 else {
-    var r3: number | C = numOrC; // number | C
+    var r3: number  = numOrC; // number
 }
 if (typeof boolOrC === "Object") {
     c = boolOrC; // C
 }
 else {
-    var r4: boolean | C = boolOrC; // boolean | C
+    var r4: boolean = boolOrC; // boolean
 }
 
 // Narrowing occurs only if target type is a subtype of variable type
@@ -49,19 +49,19 @@ else {
 //  - when true, narrows the type of x by typeof x === s when false, or
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrC !== "Object") {
-    var r2: string | C = strOrC; // string | C
+    var r2: string = strOrC; // string
 }
 else {
     c = strOrC; // C
 }
 if (typeof numOrC !== "Object") {
-    var r3: number | C = numOrC; // number | C
+    var r3: number = numOrC; // number
 }
 else {
     c = numOrC; // C
 }
 if (typeof boolOrC !== "Object") {
-    var r4: boolean | C = boolOrC; // boolean | C
+    var r4: boolean = boolOrC; // boolean
 }
 else {
     c = boolOrC; // C
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts
new file mode 100644
index 00000000000..4e9e3137d78
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts
@@ -0,0 +1,9 @@
+var x: string|number;
+
+var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
+
+var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
+
+var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
+
+var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts
new file mode 100644
index 00000000000..9a44603d2d4
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts
@@ -0,0 +1,11 @@
+let stringOrNumber: string | number;
+
+if (typeof stringOrNumber === "number") {
+    if (typeof stringOrNumber !== "number") {
+        stringOrNumber;
+    }
+}
+
+if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") {
+    stringOrNumber;
+}
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts
new file mode 100644
index 00000000000..766c5ed8ca2
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts
@@ -0,0 +1,184 @@
+// undefined type guard adds no new type information
+function test1(a: any) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test2(a: any) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test3(a: any) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test4(a: any) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test5(a: boolean | void) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test6(a: boolean | void) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test7(a: boolean | void) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test8(a: boolean | void) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test9(a: boolean | number) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test10(a: boolean | number) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test11(a: boolean | number) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test12(a: boolean | number) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test13(a: boolean | number | void) {
+    if (typeof a !== "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test14(a: boolean | number | void) {
+    if (typeof a === "undefined") {
+        if (typeof a === "boolean") {
+            a;
+        }
+        else {
+            a;
+        }
+    }
+    else {
+        a;
+    }
+}
+
+function test15(a: boolean | number | void) {
+    if (typeof a === "undefined" || typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
+
+function test16(a: boolean | number | void) {
+    if (typeof a !== "undefined" && typeof a === "boolean") {
+		a;
+    }
+    else {
+        a;
+    }
+}
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts
index ec23b75b590..5dbc925d04b 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts
@@ -40,12 +40,12 @@ function foo4(x: number | string | boolean) {
                 : x.toString(); // number
         })(x); // x here is narrowed to number | boolean
 }
-// Type guards affect nested function expressions, but not nested function declarations
+// Type guards affect nested function expressions and nested function declarations
 function foo5(x: number | string | boolean) {
     if (typeof x === "string") {
         var y = x; // string;
         function foo() {
-            var z = x; // number | string | boolean, type guard has no effect
+            var z = x; // string
         }
     }
 }
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts
index 00460181c2b..c22ed94087b 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 // typeof  operator on boolean type
 var BOOLEAN: boolean;
 
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType.ts
index 9abb602db06..57b22e3646c 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 // typeof  operator on enum type
 
 enum ENUM { };
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts
index 06ac3e29784..81687e4f860 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts
@@ -1,3 +1,4 @@
+// @allowUnusedLabels: true
 // typeof  operator on number type
 var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
diff --git a/tests/cases/conformance/functions/functionImplementationErrors.ts b/tests/cases/conformance/functions/functionImplementationErrors.ts
index ddd3ba0a2c1..0a7c7812932 100644
--- a/tests/cases/conformance/functions/functionImplementationErrors.ts
+++ b/tests/cases/conformance/functions/functionImplementationErrors.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // FunctionExpression with no return type annotation with multiple return statements with unrelated types
 var f1 = function () {
     return '';
diff --git a/tests/cases/conformance/functions/functionImplementations.ts b/tests/cases/conformance/functions/functionImplementations.ts
index df36a0b4457..3c5adefd2e4 100644
--- a/tests/cases/conformance/functions/functionImplementations.ts
+++ b/tests/cases/conformance/functions/functionImplementations.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // FunctionExpression with no return type annotation and no return statement returns void
 var v: void = function () { } ();
 
diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts
index 31407b88590..d35002e2f65 100644
--- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts
+++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClass2.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 class Foo {
     x: string;
     y() { }
diff --git a/tests/cases/conformance/jsx/tsxErrorRecovery2.tsx b/tests/cases/conformance/jsx/tsxErrorRecovery2.tsx
new file mode 100644
index 00000000000..e189e0e7791
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxErrorRecovery2.tsx
@@ -0,0 +1,10 @@
+//@jsx: preserve
+
+//@filename: file1.tsx
+declare namespace JSX { interface Element { } }
+
+<div></div>
+<div></div>
+
+//@filename: file2.tsx
+var x = <div></div><div></div>
diff --git a/tests/cases/conformance/jsx/tsxErrorRecovery3.tsx b/tests/cases/conformance/jsx/tsxErrorRecovery3.tsx
new file mode 100644
index 00000000000..9d444b07cb2
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxErrorRecovery3.tsx
@@ -0,0 +1,10 @@
+//@jsx: react
+
+//@filename: file1.tsx
+declare namespace JSX { interface Element { } }
+
+<div></div>
+<div></div>
+
+//@filename: file2.tsx
+var x = <div></div><div></div>
diff --git a/tests/cases/conformance/jsx/tsxReactEmit7.tsx b/tests/cases/conformance/jsx/tsxReactEmit7.tsx
new file mode 100644
index 00000000000..847a55d4719
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxReactEmit7.tsx
@@ -0,0 +1,22 @@
+//@jsx: react
+//@module: commonjs
+
+//@filename: file.tsx
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var m = <div x-y="val"></div>;
+var n = <div xx-y="val"></div>;
+var o = <div x-yy="val"></div>;
+var p = <div xx-yy="val"></div>;
+
+// Investigation
+var a = <div x="val"></div>;
+var b = <div xx="val"></div>;
+var c = <div xxx="val"></div>;
+var d = <div xxxx="val"></div>;
+var e = <div xxxxx="val"></div>;
diff --git a/tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts b/tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts
index cad137cc88d..62c0153f224 100644
--- a/tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts
@@ -1,2 +1,4 @@
+// @allowUnusedLabels: true
+
 {a: 3}
 /x/
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3.ts b/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3.ts
index 9cef599692c..64a9357706f 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4.ts b/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4.ts
index 2c3eadca7db..3e00bca659b 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3.ts b/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3.ts
index 26bea241a7a..a7b47ff071b 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4.ts b/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4.ts
index e00c222aa9c..5ba2bd69b11 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target1:
 target2:
 while (true) {
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.ts b/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.ts
index d4db9399ed2..d6add980447 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 target:
 while (true) {
   function f() {
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4.ts b/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4.ts
index 2c62180a2ab..bf7ea5c22c6 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 target:
 while (true) {
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts b/tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts
index 88476ac4a78..b35204beb48 100644
--- a/tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 /// Copyright (c) 2012 Ecma International.  All rights reserved. 
 /// Ecma International makes this code available under the terms and conditions set
 /// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
diff --git a/tests/cases/conformance/statements/breakStatements/doWhileBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/doWhileBreakStatements.ts
index 49bfaaca13f..cca94947a5d 100644
--- a/tests/cases/conformance/statements/breakStatements/doWhileBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/doWhileBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 do {
     break;
 } while(true)
diff --git a/tests/cases/conformance/statements/breakStatements/forBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/forBreakStatements.ts
index 20a93db4418..9cf07e1eef7 100644
--- a/tests/cases/conformance/statements/breakStatements/forBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/forBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 for (; ;) {
     break;
 }
diff --git a/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts
index 5810d522182..ffc99ee904b 100644
--- a/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 for(var x in {}) {
     break;
 }
diff --git a/tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts
index 7c93553a726..d164691db68 100644
--- a/tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/invalidDoWhileBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked break not allowed
diff --git a/tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts
index cc21818b80f..142a8f8b3b5 100644
--- a/tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/invalidForBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked break not allowed
diff --git a/tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts
index 9cda003e6f5..db49a13c8f7 100644
--- a/tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/invalidForInBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked break not allowed
diff --git a/tests/cases/conformance/statements/breakStatements/switchBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/switchBreakStatements.ts
index f5ce6ffa52f..3080a6b38a8 100644
--- a/tests/cases/conformance/statements/breakStatements/switchBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/switchBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 switch ('') {
     case 'a':
         break;
diff --git a/tests/cases/conformance/statements/breakStatements/whileBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/whileBreakStatements.ts
index c471e6552b9..e2a836b62a3 100644
--- a/tests/cases/conformance/statements/breakStatements/whileBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/whileBreakStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 while(true) {
     break;
 } 
diff --git a/tests/cases/conformance/statements/continueStatements/doWhileContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/doWhileContinueStatements.ts
index d3d999ccb49..4685cc9f046 100644
--- a/tests/cases/conformance/statements/continueStatements/doWhileContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/doWhileContinueStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 do {
     continue;
 } while(true)
diff --git a/tests/cases/conformance/statements/continueStatements/forContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/forContinueStatements.ts
index 1f8a3fc7b68..9b852df80c7 100644
--- a/tests/cases/conformance/statements/continueStatements/forContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/forContinueStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 for (; ;) {
     continue;
 }
diff --git a/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts
index 863caec2ccf..b5ccd8189ca 100644
--- a/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 for(var x in {}) {
     continue;
 }
diff --git a/tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts
index 54192212ef7..dcf543ed7e3 100644
--- a/tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/invalidDoWhileContinueStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts
index 751cd9477ad..ba367ef87b7 100644
--- a/tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/invalidForContinueStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts
index be274005961..861d7e90629 100644
--- a/tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/invalidForInContinueStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts
index cf913671315..ef94466ffba 100644
--- a/tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/invalidWhileContinueStatements.ts
@@ -1,3 +1,6 @@
+// @allowUnusedLabels: true
+// @allowUnreachableCode: true
+
 // All errors
 
 // naked continue not allowed
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts b/tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts
new file mode 100644
index 00000000000..9f646e2c851
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts
@@ -0,0 +1,12 @@
+//@target: ES5
+
+var array = [1,2,3];
+var sum = 0;
+
+for (let num of array) {
+    if (sum === 0) {
+        array = [4,5,6]
+    }
+    
+    sum += num;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/forStatements/forStatements.ts b/tests/cases/conformance/statements/forStatements/forStatements.ts
index 567c49c1098..1e65bdc2932 100644
--- a/tests/cases/conformance/statements/forStatements/forStatements.ts
+++ b/tests/cases/conformance/statements/forStatements/forStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 interface I {
     id: number;
 }
diff --git a/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts b/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts
index 0c2bb3d40dc..64317b23336 100644
--- a/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts
+++ b/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 interface I {
     id: number;
 }
diff --git a/tests/cases/conformance/statements/forStatements/forStatementsMultipleValidDecl.ts b/tests/cases/conformance/statements/forStatements/forStatementsMultipleValidDecl.ts
index 9f5557e7756..af19fd404df 100644
--- a/tests/cases/conformance/statements/forStatements/forStatementsMultipleValidDecl.ts
+++ b/tests/cases/conformance/statements/forStatements/forStatementsMultipleValidDecl.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // all expected to be valid
 
 for (var x: number; ;) { }
diff --git a/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts b/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts
index f2cd9aa43ee..03f042401d8 100644
--- a/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts
+++ b/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 interface I {
     id: number;
 }
diff --git a/tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts b/tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts
index aa382d4ec34..8cc294d01f7 100644
--- a/tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts
+++ b/tests/cases/conformance/statements/throwStatements/invalidThrowStatement.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 throw; 
 
 export throw null;
diff --git a/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts b/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts
index 4b9675f9d63..c5875327b50 100644
--- a/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts
+++ b/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function fn(x) {
     throw x;
 }
diff --git a/tests/cases/conformance/statements/throwStatements/throwStatements.ts b/tests/cases/conformance/statements/throwStatements/throwStatements.ts
index 8d155cbc8cf..07c09da93fc 100644
--- a/tests/cases/conformance/statements/throwStatements/throwStatements.ts
+++ b/tests/cases/conformance/statements/throwStatements/throwStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // all legal
 
 interface I {
diff --git a/tests/cases/conformance/types/localTypes/localTypes4.ts b/tests/cases/conformance/types/localTypes/localTypes4.ts
index bd31e76a80f..388d5efb637 100644
--- a/tests/cases/conformance/types/localTypes/localTypes4.ts
+++ b/tests/cases/conformance/types/localTypes/localTypes4.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 function f1() {
     // Type parameters are in scope in parameters and return types
     function f<T>(x: T): T {
diff --git a/tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts b/tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts
index c249d2e5671..5cb52588644 100644
--- a/tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts
+++ b/tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts
@@ -1,3 +1,5 @@
+// @allowUnusedLabels: true
+
 // interfaces do not permit private members, these are errors
 
 interface I {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts
index 7ea4f414e15..1cc499c7d6e 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // Call signatures without a return type should infer one from the function body (if present)
 
 // Simple types
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts
new file mode 100644
index 00000000000..f13ce35e829
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts
@@ -0,0 +1,15 @@
+
+type S = "a" | "b";
+type T = S[] | S;
+
+function f(foo: T) {
+    if (foo === "a") {
+        return foo;
+    }
+    else if (foo === "b") {
+        return foo;
+    }
+    else { 
+        return (foo as S[])[0];
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts
new file mode 100644
index 00000000000..4eaf18ca7cc
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts
@@ -0,0 +1,16 @@
+
+type S = "a" | "b";
+type T = S[] | S;
+
+function isS(t: T): t is S {
+    return t === "a" || t === "b";
+}
+
+function f(foo: T) {
+    if (isS(foo)) {
+        return foo;
+    }
+    else { 
+        return foo[0];
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts
new file mode 100644
index 00000000000..141f5d12795
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts
@@ -0,0 +1,13 @@
+
+type S = "a" | "b";
+type T = S[] | S;
+
+var foo: T;
+switch (foo) {
+    case "a":
+    case "b":
+        break;
+    default:
+        foo = (foo as S[])[0];
+        break;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts
new file mode 100644
index 00000000000..ec1f1e5eb56
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts
@@ -0,0 +1,31 @@
+
+type S = "a" | "b";
+type T = S[] | S;
+
+var s: S;
+var t: T;
+var str: string;
+
+////////////////
+
+s = <S>t;
+s = t as S;
+
+s = <S>str;
+s = str as S;
+
+////////////////
+
+t = <T>s;
+t = s as T;
+
+t = <T>str;
+t = str as T;
+
+////////////////
+
+str = <string>s;
+str = s as string;
+
+str = <string>t;
+str = t as string;
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts
new file mode 100644
index 00000000000..8a257ae1caf
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts
@@ -0,0 +1,9 @@
+// @declaration: true
+
+declare function myRandBool(): boolean;
+
+let a: "foo" = "foo";
+let b = a || "foo";
+let c: "foo" = b;
+let d = b || "bar";
+let e: "foo" | "bar" = d;
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts
new file mode 100644
index 00000000000..7910c0e16b7
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts
@@ -0,0 +1,8 @@
+// @declaration: true
+
+declare function myRandBool(): boolean;
+
+let a: "foo" = ("foo");
+let b: "foo" | "bar" = ("foo");
+let c: "foo" = (myRandBool ? "foo" : ("foo"));
+let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar"));
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts
new file mode 100644
index 00000000000..388f4567ed7
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts
@@ -0,0 +1,20 @@
+// @declaration: true
+
+// Should all be strings.
+let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"];
+
+type RexOrRaptor = "t-rex" | "raptor"
+let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex'];
+
+rawr(dinosaur);
+
+function rawr(dino: RexOrRaptor) {
+    if (dino === "t-rex") {
+        return "ROAAAAR!";
+    }
+    if (dino === "raptor") {
+        return "yip yip!";
+    }
+
+    throw "Unexpected " + dino;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts
new file mode 100644
index 00000000000..cea04f0818e
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts
@@ -0,0 +1,43 @@
+// @declaration: true
+
+type Kind = "A" | "B"
+
+interface Entity {
+    kind: Kind;
+}
+
+interface A extends Entity {
+    kind: "A";
+    a: number;
+}
+
+interface B extends Entity {
+    kind: "B";
+    b: string;
+}
+
+function hasKind(entity: Entity, kind: "A"): entity is A;
+function hasKind(entity: Entity, kind: "B"): entity is B;
+function hasKind(entity: Entity, kind: Kind): entity is Entity;
+function hasKind(entity: Entity, kind: Kind): boolean {
+    return kind === is;
+}
+
+let x: A = {
+    kind: "A",
+    a: 100,
+}
+
+if (hasKind(x, "A")) {
+    let a = x;
+}
+else {
+    let b = x;
+}
+
+if (!hasKind(x, "B")) {
+    let c = x;
+}
+else {
+    let d = x;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts
new file mode 100644
index 00000000000..53f516f4209
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts
@@ -0,0 +1,19 @@
+// @declaration: true
+
+function foo<T extends "foo">(f: (x: T) => T) {
+    return f;
+}
+
+function bar<T extends "foo" | "bar">(f: (x: T) => T) {
+    return f;
+}
+
+let f = foo(x => x);
+let fResult = f("foo");
+
+let g = foo((x => x));
+let gResult = g("foo");
+
+let h = bar(x => x);
+let hResult = h("foo");
+hResult = h("bar");
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts
new file mode 100644
index 00000000000..fb3a019402d
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts
@@ -0,0 +1,8 @@
+// @declaration: true
+
+function foo<T extends "foo">(f: (x: T) => T) {
+    return f;
+}
+
+let f = foo((y: "foo" | "bar") => y === "foo" ? y : "foo");
+let fResult = f("foo");
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts
new file mode 100644
index 00000000000..b8ed1b47dd4
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts
@@ -0,0 +1,21 @@
+// @declaration: true
+
+type T = "foo" | "bar" | "baz";
+
+var x: "foo" | "bar" | "baz" = "foo";
+var y: T = "bar";
+
+if (x === "foo") {
+    let a = x;
+}
+else if (x !== "bar") {
+    let b = x || y;
+}
+else {
+    let c = x;
+    let d = y;
+    let e: (typeof x) | (typeof y) = c || d;
+}
+
+x = y;
+y = x;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts
new file mode 100644
index 00000000000..2cc63ab4460
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts
@@ -0,0 +1,21 @@
+// @declaration: true
+
+type T = string | "foo" | "bar" | "baz";
+
+var x: "foo" | "bar" | "baz" | string = "foo";
+var y: T = "bar";
+
+if (x === "foo") {
+    let a = x;
+}
+else if (x !== "bar") {
+    let b = x || y;
+}
+else {
+    let c = x;
+    let d = y;
+    let e: (typeof x) | (typeof y) = c || d;
+}
+
+x = y;
+y = x;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts
new file mode 100644
index 00000000000..d5c6a38af79
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts
@@ -0,0 +1,21 @@
+// @declaration: true
+
+type T = number | "foo" | "bar";
+
+var x: "foo" | "bar" | number;
+var y: T = "bar";
+
+if (x === "foo") {
+    let a = x;
+}
+else if (x !== "bar") {
+    let b = x || y;
+}
+else {
+    let c = x;
+    let d = y;
+    let e: (typeof x) | (typeof y) = c || d;
+}
+
+x = y;
+y = x;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts
new file mode 100644
index 00000000000..e9d062b0e5c
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts
@@ -0,0 +1,38 @@
+// @declaration: true
+
+type T = "" | "foo";
+
+let x: T = "";
+let y: T = "foo";
+
+if (x === "") {
+    let a = x;
+}
+
+if (x !== "") {
+    let b = x;
+}
+
+if (x == "") {
+    let c = x;
+}
+
+if (x != "") {
+    let d = x;
+}
+
+if (x) {
+    let e = x;
+}
+
+if (!x) {
+    let f = x;
+}
+
+if (!!x) {
+    let g = x;
+}
+
+if (!!!x) {
+    let h = x;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts
new file mode 100644
index 00000000000..4f006387687
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts
@@ -0,0 +1,19 @@
+// @declaration: true
+
+let a: "";
+var b: "foo";
+let c: "bar";
+const d: "baz";
+
+a = "";
+b = "foo";
+c = "bar";
+
+let e: "" = "";
+var f: "foo" = "foo";
+let g: "bar" = "bar";
+const h: "baz" = "baz";
+
+e = "";
+f = "foo";
+g = "bar";
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts
new file mode 100644
index 00000000000..d88167eaeff
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts
@@ -0,0 +1,53 @@
+// @declaration: true
+
+type PrimitiveName = 'string' | 'number' | 'boolean';
+
+function getFalsyPrimitive(x: "string"): string;
+function getFalsyPrimitive(x: "number"): number;
+function getFalsyPrimitive(x: "boolean"): boolean;
+function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+function getFalsyPrimitive(x: "number" | "string"): number | string;
+function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+function getFalsyPrimitive(x: PrimitiveName) {
+    if (x === "string") {
+        return "";
+    }
+    if (x === "number") {
+        return 0;
+    }
+    if (x === "boolean") {
+        return false;
+    }
+
+    // Should be unreachable.
+    throw "Invalid value";
+}
+
+namespace Consts1 {
+    const EMPTY_STRING = getFalsyPrimitive("string");
+    const ZERO = getFalsyPrimitive('number');
+    const FALSE = getFalsyPrimitive("boolean");
+}
+
+const string: "string" = "string"
+const number: "number" = "number"
+const boolean: "boolean" = "boolean"
+
+const stringOrNumber = string || number;
+const stringOrBoolean = string || boolean;
+const booleanOrNumber = number || boolean;
+const stringOrBooleanOrNumber = stringOrBoolean || number;
+
+namespace Consts2 {
+    const EMPTY_STRING = getFalsyPrimitive(string);
+    const ZERO = getFalsyPrimitive(number);
+    const FALSE = getFalsyPrimitive(boolean);
+
+    const a = getFalsyPrimitive(stringOrNumber);
+    const b = getFalsyPrimitive(stringOrBoolean);
+    const c = getFalsyPrimitive(booleanOrNumber);
+    const d = getFalsyPrimitive(stringOrBooleanOrNumber);
+}
+
+
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts
new file mode 100644
index 00000000000..5801aa50076
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts
@@ -0,0 +1,51 @@
+// @declaration: true
+
+function getFalsyPrimitive(x: "string"): string;
+function getFalsyPrimitive(x: "number"): number;
+function getFalsyPrimitive(x: "boolean"): boolean;
+function getFalsyPrimitive(x: "boolean" | "string"): boolean | string;
+function getFalsyPrimitive(x: "boolean" | "number"): boolean | number;
+function getFalsyPrimitive(x: "number" | "string"): number | string;
+function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean;
+function getFalsyPrimitive(x: string) {
+    if (x === "string") {
+        return "";
+    }
+    if (x === "number") {
+        return 0;
+    }
+    if (x === "boolean") {
+        return false;
+    }
+
+    // Should be unreachable.
+    throw "Invalid value";
+}
+
+namespace Consts1 {
+    const EMPTY_STRING = getFalsyPrimitive("string");
+    const ZERO = getFalsyPrimitive('number');
+    const FALSE = getFalsyPrimitive("boolean");
+}
+
+const string: "string" = "string"
+const number: "number" = "number"
+const boolean: "boolean" = "boolean"
+
+const stringOrNumber = string || number;
+const stringOrBoolean = string || boolean;
+const booleanOrNumber = number || boolean;
+const stringOrBooleanOrNumber = stringOrBoolean || number;
+
+namespace Consts2 {
+    const EMPTY_STRING = getFalsyPrimitive(string);
+    const ZERO = getFalsyPrimitive(number);
+    const FALSE = getFalsyPrimitive(boolean);
+
+    const a = getFalsyPrimitive(stringOrNumber);
+    const b = getFalsyPrimitive(stringOrBoolean);
+    const c = getFalsyPrimitive(booleanOrNumber);
+    const d = getFalsyPrimitive(stringOrBooleanOrNumber);
+}
+
+
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts
new file mode 100644
index 00000000000..a675c2c0eae
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts
@@ -0,0 +1,46 @@
+// @declaration: true
+
+interface Base {
+    x: string;
+    y: number;
+}
+
+interface HelloOrWorld extends Base {
+    p1: boolean;
+}
+
+interface JustHello extends Base {
+    p2: boolean;
+}
+
+interface JustWorld extends Base {
+    p3: boolean;
+}
+
+let hello: "hello";
+let world: "world";
+let helloOrWorld: "hello" | "world";
+
+function f(p: "hello"): JustHello;
+function f(p: "hello" | "world"): HelloOrWorld;
+function f(p: "world"): JustWorld;
+function f(p: string): Base;
+function f(...args: any[]): any {
+    return undefined;
+}
+
+let fResult1 = f(hello);
+let fResult2 = f(world);
+let fResult3 = f(helloOrWorld);
+
+function g(p: string): Base;
+function g(p: "hello"): JustHello;
+function g(p: "hello" | "world"): HelloOrWorld;
+function g(p: "world"): JustWorld;
+function g(...args: any[]): any {
+    return undefined;
+}
+
+let gResult1 = g(hello);
+let gResult2 = g(world);
+let gResult3 = g(helloOrWorld);
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts
new file mode 100644
index 00000000000..8bc2a0c94b8
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts
@@ -0,0 +1,8 @@
+// @declaration: true
+
+declare function f(x: (p: "foo" | "bar") => "foo");
+
+f(y => {
+    let z = y = "foo";
+    return z;
+})
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts
new file mode 100644
index 00000000000..a78918c8122
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts
@@ -0,0 +1,25 @@
+// @declaration: true
+
+type Kind = "A" | "B"
+
+function kindIs(kind: Kind, is: "A"): kind is "A";
+function kindIs(kind: Kind, is: "B"): kind is "B";
+function kindIs(kind: Kind, is: Kind): boolean {
+    return kind === is;
+}
+
+var x: Kind = "A";
+
+if (kindIs(x, "A")) {
+    let a = x;
+}
+else {
+    let b = x;
+}
+
+if (!kindIs(x, "B")) {
+    let c = x;
+}
+else {
+    let d = x;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts
new file mode 100644
index 00000000000..1920551abd8
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts
@@ -0,0 +1,7 @@
+// @declaration: true
+
+let ABC: "ABC" = `ABC`;
+let DE_NEWLINE_F: "DE\nF" = `DE
+F`;
+let G_QUOTE_HI: 'G"HI';
+let JK_BACKTICK_L: "JK`L" = `JK\`L`;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts
new file mode 100644
index 00000000000..12debae4e20
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts
@@ -0,0 +1,5 @@
+// @declaration: true
+
+let abc: "AB\r\nC" = `AB
+C`;
+let de_NEWLINE_f: "DE\nF" = `DE${"\n"}F`;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts
new file mode 100644
index 00000000000..28c34d3c74a
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts
@@ -0,0 +1,29 @@
+// @declaration: true
+
+let abc: "ABC" = "ABC";
+let xyz: "XYZ" = "XYZ";
+let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+
+let a = "" + abc;
+let b = abc + "";
+let c = 10 + abc;
+let d = abc + 10;
+let e = xyz + abc;
+let f = abc + xyz;
+let g = true + abc;
+let h = abc + true;
+let i = abc + abcOrXyz + xyz;
+let j = abcOrXyz + abcOrXyz;
+let k = +abcOrXyz;
+let l = -abcOrXyz;
+let m = abcOrXyzOrNumber + "";
+let n = "" + abcOrXyzOrNumber;
+let o = abcOrXyzOrNumber + abcOrXyz;
+let p = abcOrXyz + abcOrXyzOrNumber;
+let q = !abcOrXyzOrNumber;
+let r = ~abcOrXyzOrNumber;
+let s = abcOrXyzOrNumber < abcOrXyzOrNumber;
+let t = abcOrXyzOrNumber >= abcOrXyz;
+let u = abc === abcOrXyz;
+let v = abcOrXyz === abcOrXyzOrNumber;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts
new file mode 100644
index 00000000000..cf66f66e47c
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts
@@ -0,0 +1,19 @@
+// @declaration: true
+
+let abc: "ABC" = "ABC";
+let xyz: "XYZ" = "XYZ";
+let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+
+let a = abcOrXyzOrNumber + 100;
+let b = 100 + abcOrXyzOrNumber;
+let c = abcOrXyzOrNumber + abcOrXyzOrNumber;
+let d = abcOrXyzOrNumber + true;
+let e = false + abcOrXyzOrNumber;
+let f = abcOrXyzOrNumber++;
+let g = --abcOrXyzOrNumber;
+let h = abcOrXyzOrNumber ^ 10;
+let i = abcOrXyzOrNumber | 10;
+let j = abc < xyz;
+let k = abc === xyz;
+let l = abc != xyz;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts b/tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts
new file mode 100644
index 00000000000..08c971458e3
--- /dev/null
+++ b/tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts
@@ -0,0 +1,113 @@
+// @declaration: true
+
+declare function randBool(): boolean;
+declare function takeReturnString(str: string): string;
+declare function takeReturnHello(str: "Hello"): "Hello";
+declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World";
+
+function fun1<T>(x: T, y: T) {
+    return randBool() ? x : y;
+}
+
+function fun2<T, U>(x: T, y: U) {
+    return randBool() ? x : y;
+}
+
+function fun3<T>(...args: T[]): T {
+    return args[+randBool()];
+}
+
+namespace n1 {
+    // The following should all come back as strings.
+    // They should be assignable to/from something of a type 'string'.
+    // They should not be assignable to either "Hello" or "World".
+    export let a = fun1("Hello", "World");
+    export let b = fun1("Hello", "Hello");
+    export let c = fun2("Hello", "World");
+    export let d = fun2("Hello", "Hello");
+    export let e = fun3("Hello", "Hello", "World", "Foo");
+
+    // Should be valid
+    a = takeReturnString(a);
+    b = takeReturnString(b);
+    c = takeReturnString(c);
+    d = takeReturnString(d);
+    e = takeReturnString(e);
+    
+    // Passing these as arguments should cause an error.
+    a = takeReturnHello(a);
+    b = takeReturnHello(b);
+    c = takeReturnHello(c);
+    d = takeReturnHello(d);
+    e = takeReturnHello(e);
+
+    // Passing these as arguments should cause an error.
+    a = takeReturnHelloWorld(a);
+    b = takeReturnHelloWorld(b);
+    c = takeReturnHelloWorld(c);
+    d = takeReturnHelloWorld(d);
+    e = takeReturnHelloWorld(e);
+}
+
+namespace n2 {
+    // The following (regardless of errors) should come back typed
+    // as "Hello" (or "Hello" | "Hello").
+    export let a = fun1<"Hello">("Hello", "Hello");
+    export let b = fun1<"Hello">("Hello", "World");
+    export let c = fun2<"Hello", "Hello">("Hello", "Hello");
+    export let d = fun2<"Hello", "Hello">("Hello", "World");
+    export let e = fun3<"Hello">("Hello", "World");
+
+    // Assignment from the returned value should cause an error.
+    a = takeReturnString(a);
+    b = takeReturnString(b);
+    c = takeReturnString(c);
+    d = takeReturnString(d);
+    e = takeReturnString(e);
+
+    // Should be valid
+    a = takeReturnHello(a);
+    b = takeReturnHello(b);
+    c = takeReturnHello(c);
+    d = takeReturnHello(d);
+    e = takeReturnHello(e);
+
+    // Assignment from the returned value should cause an error.
+    a = takeReturnHelloWorld(a);
+    b = takeReturnHelloWorld(b);
+    c = takeReturnHelloWorld(c);
+    d = takeReturnHelloWorld(d);
+    e = takeReturnHelloWorld(e);
+}
+
+
+namespace n3 {
+    // The following (regardless of errors) should come back typed
+    // as "Hello" | "World" (or "World" | "Hello").
+    export let a = fun2<"Hello", "World">("Hello", "World");
+    export let b = fun2<"Hello", "World">("World", "Hello");
+    export let c = fun2<"World", "Hello">("Hello", "Hello");
+    export let d = fun2<"World", "Hello">("World", "World");
+    export let e = fun3<"Hello" | "World">("Hello", "World");
+
+    // Assignment from the returned value should cause an error.
+    a = takeReturnString(a);
+    b = takeReturnString(b);
+    c = takeReturnString(c);
+    d = takeReturnString(d);
+    e = takeReturnString(e);
+
+    // Passing these as arguments should cause an error.
+    a = takeReturnHello(a);
+    b = takeReturnHello(b);
+    c = takeReturnHello(c);
+    d = takeReturnHello(d);
+    e = takeReturnHello(e);
+
+    // Both should be valid.
+    a = takeReturnHelloWorld(a);
+    b = takeReturnHelloWorld(b);
+    c = takeReturnHelloWorld(c);
+    d = takeReturnHelloWorld(d);
+    e = takeReturnHelloWorld(e);
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/thisType/thisTypeAndConstraints.ts b/tests/cases/conformance/types/thisType/thisTypeAndConstraints.ts
new file mode 100644
index 00000000000..f46b251c3b2
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/thisTypeAndConstraints.ts
@@ -0,0 +1,21 @@
+class A {
+    self() {
+        return this;
+    }
+}
+
+function f<T extends A>(x: T) {
+    function g<U extends T>(x: U) {
+        x = x.self();
+    }
+    x = x.self();
+}
+
+class B<T extends A> {
+    foo(x: T) {
+        x = x.self();
+    }
+    bar<U extends T>(x: U) {
+        x = x.self();
+    }
+}
diff --git a/tests/cases/conformance/types/thisType/thisTypeErrors2.ts b/tests/cases/conformance/types/thisType/thisTypeErrors2.ts
new file mode 100644
index 00000000000..d29e714c4d0
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/thisTypeErrors2.ts
@@ -0,0 +1,13 @@
+class Base {
+    constructor(a: this) {
+    }
+}
+class Generic<T> {
+}
+class Derived {
+    n: number;
+    constructor(public host: Generic<this>) {
+        let self: this = this;
+        this.n = 12;
+    }
+}
diff --git a/tests/cases/conformance/types/thisType/thisTypeInClasses.ts b/tests/cases/conformance/types/thisType/thisTypeInClasses.ts
index 17dc13cf558..6c650341fbe 100644
--- a/tests/cases/conformance/types/thisType/thisTypeInClasses.ts
+++ b/tests/cases/conformance/types/thisType/thisTypeInClasses.ts
@@ -1,7 +1,6 @@
 class C1 {
     x: this;
     f(x: this): this { return undefined; }
-    constructor(x: this) { }
 }
 
 class C2 {
diff --git a/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts b/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts
index 9b12363ff08..9864ddab488 100644
--- a/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts
+++ b/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // return type of a function with multiple returns is the BCT of each return statement
 // it is an error if there is no single BCT, these are error cases
 
diff --git a/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts b/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts
index 41d4fddfbeb..03021bfdd10 100644
--- a/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts
+++ b/tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts
@@ -1,3 +1,5 @@
+// @allowUnreachableCode: true
+
 // return type of a function with multiple returns is the BCT of each return statement
 // no errors expected here
 
diff --git a/tests/cases/conformance/types/union/unionTypeCallSignatures.ts b/tests/cases/conformance/types/union/unionTypeCallSignatures.ts
index ca599329743..a25d27d9a29 100644
--- a/tests/cases/conformance/types/union/unionTypeCallSignatures.ts
+++ b/tests/cases/conformance/types/union/unionTypeCallSignatures.ts
@@ -69,3 +69,6 @@ strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter3('hello', "hello"); // error no call signature
 strOrNum = unionWithRestParameter3(); // error no call signature
 
+var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
+strOrNum = unionWithRestParameter4("hello", "world");
diff --git a/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts b/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts
new file mode 100644
index 00000000000..1e27acd2083
--- /dev/null
+++ b/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts
@@ -0,0 +1,25 @@
+type F1 = (a: string, b?: string) => void;
+type F2 = (a: string, b?: string, c?: string) => void;
+type F3 = (a: string, ...rest: string[]) => void;
+type F4 = (a: string, b?: string, ...rest: string[]) => void;
+type F5 = (a: string, b: string) => void;
+
+var f12: F1 | F2;
+f12("a");
+f12("a", "b");
+f12("a", "b", "c");  // error
+
+var f34: F3 | F4;
+f34("a");
+f34("a", "b");
+f34("a", "b", "c");
+
+var f1234: F1 | F2 | F3 | F4;
+f1234("a");
+f1234("a", "b");
+f1234("a", "b", "c");  // error
+
+var f12345: F1 | F2 | F3 | F4 | F5;
+f12345("a");  // error
+f12345("a", "b");
+f12345("a", "b", "c");  // error
diff --git a/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts b/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts
index 16d2efcd6d4..d66c1620751 100644
--- a/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts
+++ b/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts
@@ -3,16 +3,16 @@
 //// var f4 = <T>(x: T/**/ ) => {
 //// }
 
-fs.goTo.marker();
+goTo.marker();
 
 // Replace the "T" type with the non-existent type 'V'.
-fs.edit.backspace(1);
-fs.edit.insert("A");
+edit.backspace(1);
+edit.insert("A");
 
 // Bring up completion to force a pull resolve.  This will end up resolving several symbols and
 // producing unreported diagnostics (i.e. that 'V' wasn't found).
-fs.verify.completionListContains("T");
-fs.verify.completionEntryDetailIs("T", "(type parameter) T in <T>(x: any): void");
+verify.completionListContains("T");
+verify.completionEntryDetailIs("T", "(type parameter) T in <T>(x: any): void");
 
 // There should now be a single error.
-fs.verify.numberOfErrorsInCurrentFile(1);
\ No newline at end of file
+verify.numberOfErrorsInCurrentFile(1);
diff --git a/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts
new file mode 100644
index 00000000000..357b355971d
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts
@@ -0,0 +1,28 @@
+/// <reference path="./fourslash.ts" />
+
+////interface IFoo {
+////    [|a|]: string;
+////}
+////class C<T extends IFoo> {
+////    method() {
+////        var x: T = {
+////            [|a|]: ""
+////        };
+////        x.[|a|];
+////    }
+////}
+////
+////
+////var x: IFoo = {
+////    [|a|]: "ss"
+////};
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedReference of ranges) {
+        verify.referencesAtPositionContains(expectedReference);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/formatAfterMultilineComment.ts b/tests/cases/fourslash/formatAfterMultilineComment.ts
new file mode 100644
index 00000000000..b795ab5c8c9
--- /dev/null
+++ b/tests/cases/fourslash/formatAfterMultilineComment.ts
@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts"/>
+/////*foo
+////*/"123123";
+
+format.document();
+verify.currentFileContentIs(`/*foo
+*/"123123";`)
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 41e8d9005f7..f93ac76d6ed 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -24,10 +24,7 @@
 // @Module: Node
 // @Target: ES5
 
-// In the imperative section, you can write any valid TypeScript code. If
-// you need help finding a something in Intellisense, you can
-// type 'fs.' as an alternate way of accessing the top-level objects
-// (e.g. 'fs.goTo.eof();')
+// In the imperative section, you can write any valid TypeScript code.
 
 //---------------------------------------
 // For API editors:
@@ -45,52 +42,32 @@
 //
 // TODO: figure out a better solution to the API exposure problem.
 
-// /// <reference path="../../../built/local/typescriptServices.d.ts"/>
-// /// <reference path="../../../src/harness/fourslash.ts"/>
-
-declare var FourSlash;
-module ts {
-    export interface SymbolDisplayPart {
+declare module ts {
+    interface SymbolDisplayPart {
         text: string;
         kind: string;
     }
+
+    enum IndentStyle {
+        None = 0,
+        Block = 1,
+        Smart = 2,
+    }    
 }
 
-//---------------------------------------------
-
-// Return code used by getEmitOutput function to indicate status of the function
-// It is a duplicate of the one in types.ts to expose it to testcases in fourslash
-enum EmitReturnStatus {
-    Succeeded = 0,                      // All outputs generated if requested (.js, .map, .d.ts), no errors reported
-    AllOutputGenerationSkipped = 1,     // No .js generated because of syntax errors, or compiler options errors, nothing generated
-    JSGeneratedWithSemanticErrors = 2,  // .js and .map generated with semantic errors
-    DeclarationGenerationSkipped = 3,   // .d.ts generation skipped because of semantic errors or declaration emitter specific errors; Output .js with semantic errors
-    EmitErrorsEncountered = 4           // Emitter errors occurred during emitting process
-}
-
-// This is a duplicate of the indentstyle in services.ts to expose it to testcases in fourslash
-enum IndentStyle {
-    None,
-    Block,
-    Smart,
-}
-
-module FourSlashInterface {
-
-    export interface Marker {
+declare namespace FourSlashInterface {
+    interface Marker {
         fileName: string;
         position: number;
         data?: any;
     }
-    
-    export interface EditorOptions {
+    interface EditorOptions {
         IndentSize: number;
         TabSize: number;
         NewLineCharacter: string;
         ConvertTabsToSpaces: boolean;
     }
-
-    export interface FormatCodeOptions extends EditorOptions {
+    interface FormatCodeOptions extends EditorOptions {
         InsertSpaceAfterCommaDelimiter: boolean;
         InsertSpaceAfterSemicolonInForStatements: boolean;
         InsertSpaceBeforeAndAfterBinaryOperators: boolean;
@@ -100,646 +77,266 @@ module FourSlashInterface {
         InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
         PlaceOpenBraceOnNewLineForFunctions: boolean;
         PlaceOpenBraceOnNewLineForControlBlocks: boolean;
-        [s: string]: boolean | number| string;
+        [s: string]: boolean | number | string;
     }
-
-    export interface Range {
+    interface Range {
         fileName: string;
         start: number;
         end: number;
         marker?: Marker;
     }
-
-    export interface TextSpan {
+    interface TextSpan {
         start: number;
         end: number;
     }
-
-    export class test_ {
-        public markers(): Marker[] {
-            return FourSlash.currentTestState.getMarkers();
-        }
-
-        public marker(name?: string): Marker {
-            return FourSlash.currentTestState.getMarkerByName(name);
-        }
-
-        public ranges(): Range[] {
-            return FourSlash.currentTestState.getRanges();
-        }
-
-        public markerByName(s: string): Marker {
-            return FourSlash.currentTestState.getMarkerByName(s);
-        }
+    class test_ {
+        markers(): Marker[];
+        marker(name?: string): Marker;
+        ranges(): Range[];
+        markerByName(s: string): Marker;
     }
-
-    export class goTo {
-        // Moves the caret to the specified marker,
-        // or the anonymous marker ('/**/') if no name
-        // is given
-        public marker(name?: string) {
-            FourSlash.currentTestState.goToMarker(name);
-        }
-
-        public bof() {
-            FourSlash.currentTestState.goToBOF();
-        }
-
-        public eof() {
-            FourSlash.currentTestState.goToEOF();
-        }
-
-        public definition(definitionIndex: number = 0) {
-            FourSlash.currentTestState.goToDefinition(definitionIndex);
-        }
-
-        public type(definitionIndex: number = 0) {
-            FourSlash.currentTestState.goToTypeDefinition(definitionIndex);
-        }
-
-        public position(position: number, fileIndex?: number);
-        public position(position: number, fileName?: string);
-        public position(position: number, fileNameOrIndex?: any) {
-            if (fileNameOrIndex !== undefined) {
-                this.file(fileNameOrIndex);
-            }
-            FourSlash.currentTestState.goToPosition(position);
-        }
-
-        // Opens a file, given either its index as it
-        // appears in the test source, or its filename
-        // as specified in the test metadata
-        public file(index: number);
-        public file(name: string);
-        public file(indexOrName: any) {
-            FourSlash.currentTestState.openFile(indexOrName);
-        }
+    class goTo {
+        marker(name?: string): void;
+        bof(): void;
+        eof(): void;
+        definition(definitionIndex?: number): void;
+        type(definitionIndex?: number): void;
+        position(position: number, fileIndex?: number): any;
+        position(position: number, fileName?: string): any;
+        file(index: number, content?: string): any;
+        file(name: string, content?: string): any;
     }
-
-    export class verifyNegatable {
-        public not: verifyNegatable;
-
-        constructor(private negative = false) {
-            if (!negative) {
-                this.not = new verifyNegatable(true);
-            }
-        }
-
-        // Verifies the member list contains the specified symbol. The
-        // member list is brought up if necessary
-        public memberListContains(symbol: string, text?: string, documenation?: string, kind?: string) {
-            if (this.negative) {
-                FourSlash.currentTestState.verifyMemberListDoesNotContain(symbol);
-            } else {
-                FourSlash.currentTestState.verifyMemberListContains(symbol, text, documenation, kind);
-            }
-        }
-
-        public memberListCount(expectedCount: number) {
-            FourSlash.currentTestState.verifyMemberListCount(expectedCount, this.negative);
-        }
-
-        // Verifies the completion list contains the specified symbol. The
-        // completion list is brought up if necessary
-        public completionListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
-            if (this.negative) {
-                FourSlash.currentTestState.verifyCompletionListDoesNotContain(symbol, text, documentation, kind);
-            } else {
-                FourSlash.currentTestState.verifyCompletionListContains(symbol, text, documentation, kind);
-            }
-        }
-
-        // Verifies the completion list items count to be greater than the specified amount. The
-        // completion list is brought up if necessary
-        public completionListItemsCountIsGreaterThan(count: number) {
-            FourSlash.currentTestState.verifyCompletionListItemsCountIsGreaterThan(count, this.negative);
-        }
-
-        public completionListIsEmpty() {
-            FourSlash.currentTestState.verifyCompletionListIsEmpty(this.negative);
-        }
-
-        public completionListAllowsNewIdentifier() {
-            FourSlash.currentTestState.verifyCompletionListAllowsNewIdentifier(this.negative);
-        }
-
-        public memberListIsEmpty() {
-            FourSlash.currentTestState.verifyMemberListIsEmpty(this.negative);
-        }
-
-        public referencesCountIs(count: number) {
-            FourSlash.currentTestState.verifyReferencesCountIs(count, /*localFilesOnly*/ false);
-        }
-
-        public referencesAtPositionContains(range: Range, isWriteAccess?: boolean) {
-            FourSlash.currentTestState.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
-        }
-
-        public signatureHelpPresent() {
-            FourSlash.currentTestState.verifySignatureHelpPresent(!this.negative);
-        }
-
-        public errorExistsBetweenMarkers(startMarker: string, endMarker: string) {
-            FourSlash.currentTestState.verifyErrorExistsBetweenMarkers(startMarker, endMarker, !this.negative);
-        }
-
-        public errorExistsAfterMarker(markerName = "") {
-            FourSlash.currentTestState.verifyErrorExistsAfterMarker(markerName, !this.negative, true);
-        }
-
-        public errorExistsBeforeMarker(markerName = "") {
-            FourSlash.currentTestState.verifyErrorExistsAfterMarker(markerName, !this.negative, false);
-        }
-
-        public quickInfoIs(expectedText?: string, expectedDocumentation?: string) {
-            FourSlash.currentTestState.verifyQuickInfoString(this.negative, expectedText, expectedDocumentation);
-        }
-
-        public quickInfoExists() {
-            FourSlash.currentTestState.verifyQuickInfoExists(this.negative);
-        }
-
-        public definitionCountIs(expectedCount: number) {
-            FourSlash.currentTestState.verifyDefinitionsCount(this.negative, expectedCount);
-        }
-
-        public typeDefinitionCountIs(expectedCount: number) {
-            FourSlash.currentTestState.verifyTypeDefinitionsCount(this.negative, expectedCount);
-        }
-
-        public definitionLocationExists() {
-            FourSlash.currentTestState.verifyDefinitionLocationExists(this.negative);
-        }
-
-        public verifyDefinitionsName(name: string, containerName: string) {
-            FourSlash.currentTestState.verifyDefinitionsName(this.negative, name, containerName);
-        }
+    class verifyNegatable {
+        private negative;
+        not: verifyNegatable;
+        constructor(negative?: boolean);
+        memberListContains(symbol: string, text?: string, documenation?: string, kind?: string): void;
+        memberListCount(expectedCount: number): void;
+        completionListContains(symbol: string, text?: string, documentation?: string, kind?: string): void;
+        completionListItemsCountIsGreaterThan(count: number): void;
+        completionListIsEmpty(): void;
+        completionListAllowsNewIdentifier(): void;
+        memberListIsEmpty(): void;
+        referencesCountIs(count: number): void;
+        referencesAtPositionContains(range: Range, isWriteAccess?: boolean): void;
+        signatureHelpPresent(): void;
+        errorExistsBetweenMarkers(startMarker: string, endMarker: string): void;
+        errorExistsAfterMarker(markerName?: string): void;
+        errorExistsBeforeMarker(markerName?: string): void;
+        quickInfoIs(expectedText?: string, expectedDocumentation?: string): void;
+        quickInfoExists(): void;
+        definitionCountIs(expectedCount: number): void;
+        typeDefinitionCountIs(expectedCount: number): void;
+        definitionLocationExists(): void;
+        verifyDefinitionsName(name: string, containerName: string): void;
     }
-
-    export class verify extends verifyNegatable {
-        public caretAtMarker(markerName?: string) {
-            FourSlash.currentTestState.verifyCaretAtMarker(markerName);
-        }
-
-        public indentationIs(numberOfSpaces: number) {
-            FourSlash.currentTestState.verifyIndentationAtCurrentPosition(numberOfSpaces);
-        }
-
-        public indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle = IndentStyle.Smart) {
-            FourSlash.currentTestState.verifyIndentationAtPosition(fileName, position, numberOfSpaces, indentStyle);
-        }
-
-        public textAtCaretIs(text: string) {
-            FourSlash.currentTestState.verifyTextAtCaretIs(text);
-        }
-
+    class verify extends verifyNegatable {
+        caretAtMarker(markerName?: string): void;
+        indentationIs(numberOfSpaces: number): void;
+        indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle?: IndentStyle): void;
+        textAtCaretIs(text: string): void;
         /**
          * Compiles the current file and evaluates 'expr' in a context containing
          * the emitted output, then compares (using ===) the result of that expression
          * to 'value'. Do not use this function with external modules as it is not supported.
          */
-        public eval(expr: string, value: any) {
-            FourSlash.currentTestState.verifyEval(expr, value);
-        }
-
-        public currentLineContentIs(text: string) {
-            FourSlash.currentTestState.verifyCurrentLineContent(text);
-        }
-
-        public currentFileContentIs(text: string) {
-            FourSlash.currentTestState.verifyCurrentFileContent(text);
-        }
-
-        public verifyGetEmitOutputForCurrentFile(expected: string): void {
-            FourSlash.currentTestState.verifyGetEmitOutputForCurrentFile(expected);
-        }
-
-        public currentParameterHelpArgumentNameIs(name: string) {
-            FourSlash.currentTestState.verifyCurrentParameterHelpName(name);
-        }
-
-        public currentParameterSpanIs(parameter: string) {
-            FourSlash.currentTestState.verifyCurrentParameterSpanIs(parameter);
-        }
-
-        public currentParameterHelpArgumentDocCommentIs(docComment: string) {
-            FourSlash.currentTestState.verifyCurrentParameterHelpDocComment(docComment);
-        }
-
-        public currentSignatureHelpDocCommentIs(docComment: string) {
-            FourSlash.currentTestState.verifyCurrentSignatureHelpDocComment(docComment);
-        }
-
-        public signatureHelpCountIs(expected: number) {
-            FourSlash.currentTestState.verifySignatureHelpCount(expected);
-        }
-
-        public signatureHelpArgumentCountIs(expected: number) {
-            FourSlash.currentTestState.verifySignatureHelpArgumentCount(expected);
-        }
-
-        public currentSignatureParameterCountIs(expected: number) {
-            FourSlash.currentTestState.verifyCurrentSignatureHelpParameterCount(expected);
-        }
-
-        public currentSignatureTypeParameterCountIs(expected: number) {
-            FourSlash.currentTestState.verifyCurrentSignatureHelpTypeParameterCount(expected);
-        }
-
-        public currentSignatureHelpIs(expected: string) {
-            FourSlash.currentTestState.verifyCurrentSignatureHelpIs(expected);
-        }
-
-        public numberOfErrorsInCurrentFile(expected: number) {
-            FourSlash.currentTestState.verifyNumberOfErrorsInCurrentFile(expected);
-        }
-
-        public baselineCurrentFileBreakpointLocations() {
-            FourSlash.currentTestState.baselineCurrentFileBreakpointLocations();
-        }
-
-        public baselineCurrentFileNameOrDottedNameSpans() {
-            FourSlash.currentTestState.baselineCurrentFileNameOrDottedNameSpans();
-        }
-
-        public baselineGetEmitOutput() {
-            FourSlash.currentTestState.baselineGetEmitOutput();
-        }
-
-        public nameOrDottedNameSpanTextIs(text: string) {
-            FourSlash.currentTestState.verifyCurrentNameOrDottedNameSpanText(text);
-        }
-
-        public outliningSpansInCurrentFile(spans: TextSpan[]) {
-            FourSlash.currentTestState.verifyOutliningSpans(spans);
-        }
-
-        public todoCommentsInCurrentFile(descriptors: string[]) {
-            FourSlash.currentTestState.verifyTodoComments(descriptors, test.ranges());
-        }
-
-        public matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number) {
-            FourSlash.currentTestState.verifyMatchingBracePosition(bracePosition, expectedMatchPosition);
-        }
-
-        public noMatchingBracePositionInCurrentFile(bracePosition: number) {
-            FourSlash.currentTestState.verifyNoMatchingBracePosition(bracePosition);
-        }
-
-        public DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean) {
-            FourSlash.currentTestState.verifyDocCommentTemplate(empty ? undefined : { newText: expectedText, caretOffset: expectedOffset });
-        }
-
-        public noDocCommentTemplate() {
-            this.DocCommentTemplate(/*expectedText*/ undefined, /*expectedOffset*/ undefined, true);
-        }
-
-        public getScriptLexicalStructureListCount(count: number) {
-            FourSlash.currentTestState.verifyGetScriptLexicalStructureListCount(count);
-        }
-
-        // TODO: figure out what to do with the unused arguments.
-        public getScriptLexicalStructureListContains(
-            name: string,
-            kind: string,
-            fileName?: string,
-            parentName?: string,
-            isAdditionalSpan?: boolean,
-            markerPosition?: number) {
-            FourSlash.currentTestState.verifyGetScriptLexicalStructureListContains(name, kind);
-        }
-
-        public navigationItemsListCount(count: number, searchValue: string, matchKind?: string) {
-            FourSlash.currentTestState.verifyNavigationItemsCount(count, searchValue, matchKind);
-        }
-
-        public navigationItemsListContains(
-            name: string,
-            kind: string,
-            searchValue: string,
-            matchKind: string,
-            fileName?: string,
-            parentName?: string) {
-            FourSlash.currentTestState.verifyNavigationItemsListContains(
-                name,
-                kind,
-                searchValue,
-                matchKind,
-                fileName,
-                parentName);
-        }
-
-        public occurrencesAtPositionContains(range: Range, isWriteAccess?: boolean) {
-            FourSlash.currentTestState.verifyOccurrencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
-        }
-
-        public occurrencesAtPositionCount(expectedCount: number) {
-            FourSlash.currentTestState.verifyOccurrencesAtPositionListCount(expectedCount);
-        }
-
-        public documentHighlightsAtPositionContains(range: Range, fileNamesToSearch: string[], kind?: string) {
-            FourSlash.currentTestState.verifyDocumentHighlightsAtPositionListContains(range.fileName, range.start, range.end, fileNamesToSearch, kind);
-        }
-
-        public documentHighlightsAtPositionCount(expectedCount: number, fileNamesToSearch: string[]) {
-            FourSlash.currentTestState.verifyDocumentHighlightsAtPositionListCount(expectedCount, fileNamesToSearch);
-        }
-
-        public completionEntryDetailIs(entryName: string, text: string, documentation?: string, kind?: string) {
-            FourSlash.currentTestState.verifyCompletionEntryDetails(entryName, text, documentation, kind);
-        }
-
+        eval(expr: string, value: any): void;
+        currentLineContentIs(text: string): void;
+        currentFileContentIs(text: string): void;
+        verifyGetEmitOutputForCurrentFile(expected: string): void;
+        currentParameterHelpArgumentNameIs(name: string): void;
+        currentParameterSpanIs(parameter: string): void;
+        currentParameterHelpArgumentDocCommentIs(docComment: string): void;
+        currentSignatureHelpDocCommentIs(docComment: string): void;
+        signatureHelpCountIs(expected: number): void;
+        signatureHelpArgumentCountIs(expected: number): void;
+        currentSignatureParameterCountIs(expected: number): void;
+        currentSignatureTypeParameterCountIs(expected: number): void;
+        currentSignatureHelpIs(expected: string): void;
+        numberOfErrorsInCurrentFile(expected: number): void;
+        baselineCurrentFileBreakpointLocations(): void;
+        baselineCurrentFileNameOrDottedNameSpans(): void;
+        baselineGetEmitOutput(): void;
+        nameOrDottedNameSpanTextIs(text: string): void;
+        outliningSpansInCurrentFile(spans: TextSpan[]): void;
+        todoCommentsInCurrentFile(descriptors: string[]): void;
+        matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number): void;
+        noMatchingBracePositionInCurrentFile(bracePosition: number): void;
+        DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean): void;
+        noDocCommentTemplate(): void;
+        getScriptLexicalStructureListCount(count: number): void;
+        getScriptLexicalStructureListContains(name: string, kind: string, fileName?: string, parentName?: string, isAdditionalSpan?: boolean, markerPosition?: number): void;
+        navigationItemsListCount(count: number, searchValue: string, matchKind?: string): void;
+        navigationItemsListContains(name: string, kind: string, searchValue: string, matchKind: string, fileName?: string, parentName?: string): void;
+        occurrencesAtPositionContains(range: Range, isWriteAccess?: boolean): void;
+        occurrencesAtPositionCount(expectedCount: number): void;
+        documentHighlightsAtPositionContains(range: Range, fileNamesToSearch: string[], kind?: string): void;
+        documentHighlightsAtPositionCount(expectedCount: number, fileNamesToSearch: string[]): void;
+        completionEntryDetailIs(entryName: string, text: string, documentation?: string, kind?: string): void;
         /**
          * This method *requires* a contiguous, complete, and ordered stream of classifications for a file.
          */
-        public syntacticClassificationsAre(...classifications: { classificationType: string; text: string }[]) {
-            FourSlash.currentTestState.verifySyntacticClassifications(classifications);
-        }
-
+        syntacticClassificationsAre(...classifications: {
+            classificationType: string;
+            text: string;
+        }[]): void;
         /**
          * This method *requires* an ordered stream of classifications for a file, and spans are highly recommended.
          */
-        public semanticClassificationsAre(...classifications: { classificationType: string; text: string; textSpan?: TextSpan }[]) {
-            FourSlash.currentTestState.verifySemanticClassifications(classifications);
-        }
-
-        public renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) {
-            FourSlash.currentTestState.verifyRenameInfoSucceeded(displayName, fullDisplayName, kind, kindModifiers)
-        }
-
-        public renameInfoFailed(message?: string) {
-            FourSlash.currentTestState.verifyRenameInfoFailed(message)
-        }
-
-        public renameLocations(findInStrings: boolean, findInComments: boolean) {
-            FourSlash.currentTestState.verifyRenameLocations(findInStrings, findInComments);
-        }
-
-        public verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { start: number; length: number; },
-            displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]) {
-            FourSlash.currentTestState.verifyQuickInfoDisplayParts(kind, kindModifiers, textSpan, displayParts, documentation);
-        }
-
-        public getSyntacticDiagnostics(expected: string) {
-            FourSlash.currentTestState.getSyntacticDiagnostics(expected);
-        }
-
-        public getSemanticDiagnostics(expected: string) {
-            FourSlash.currentTestState.getSemanticDiagnostics(expected);
-        }
-
-        public ProjectInfo(expected: string []) {
-            FourSlash.currentTestState.verifyProjectInfo(expected);
-        }
+        semanticClassificationsAre(...classifications: {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        }[]): void;
+        renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string): void;
+        renameInfoFailed(message?: string): void;
+        renameLocations(findInStrings: boolean, findInComments: boolean): void;
+        verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: {
+            start: number;
+            length: number;
+        }, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]): void;
+        getSyntacticDiagnostics(expected: string): void;
+        getSemanticDiagnostics(expected: string): void;
+        ProjectInfo(expected: string[]): void;
     }
-
-    export class edit {
-        public backspace(count?: number) {
-            FourSlash.currentTestState.deleteCharBehindMarker(count);
-        }
-
-        public deleteAtCaret(times?: number) {
-            FourSlash.currentTestState.deleteChar(times);
-        }
-
-        public replace(start: number, length: number, text: string) {
-            FourSlash.currentTestState.replace(start, length, text);
-        }
-
-        public paste(text: string) {
-            FourSlash.currentTestState.paste(text);
-        }
-
-        public insert(text: string) {
-            this.insertLines(text);
-        }
-
-        public insertLine(text: string) {
-            this.insertLines(text + '\n');
-        }
-
-        public insertLines(...lines: string[]) {
-            FourSlash.currentTestState.type(lines.join('\n'));
-        }
-
-        public moveRight(count?: number) {
-            FourSlash.currentTestState.moveCaretRight(count);
-        }
-
-        public moveLeft(count?: number) {
-            if (typeof count === 'undefined') {
-                count = 1;
-            }
-            FourSlash.currentTestState.moveCaretRight(count * -1);
-        }
-
-        public enableFormatting() {
-            FourSlash.currentTestState.enableFormatting = true;
-        }
-
-        public disableFormatting() {
-            FourSlash.currentTestState.enableFormatting = false;
-        }
+    class edit {
+        backspace(count?: number): void;
+        deleteAtCaret(times?: number): void;
+        replace(start: number, length: number, text: string): void;
+        paste(text: string): void;
+        insert(text: string): void;
+        insertLine(text: string): void;
+        insertLines(...lines: string[]): void;
+        moveRight(count?: number): void;
+        moveLeft(count?: number): void;
+        enableFormatting(): void;
+        disableFormatting(): void;
     }
-
-    export class debug {
-        public printCurrentParameterHelp() {
-            FourSlash.currentTestState.printCurrentParameterHelp();
-        }
-
-        public printCurrentFileState() {
-            FourSlash.currentTestState.printCurrentFileState();
-        }
-
-        public printCurrentFileStateWithWhitespace() {
-            FourSlash.currentTestState.printCurrentFileState(/*withWhiteSpace=*/true);
-        }
-
-        public printCurrentFileStateWithoutCaret() {
-            FourSlash.currentTestState.printCurrentFileState(/*withWhiteSpace=*/false, /*withCaret=*/false);
-        }
-
-        public printCurrentQuickInfo() {
-            FourSlash.currentTestState.printCurrentQuickInfo();
-        }
-
-        public printCurrentSignatureHelp() {
-            FourSlash.currentTestState.printCurrentSignatureHelp();
-        }
-
-        public printMemberListMembers() {
-            FourSlash.currentTestState.printMemberListMembers();
-        }
-
-        public printCompletionListMembers() {
-            FourSlash.currentTestState.printCompletionListMembers();
-        }
-
-        public printBreakpointLocation(pos: number) {
-            FourSlash.currentTestState.printBreakpointLocation(pos);
-        }
-        public printBreakpointAtCurrentLocation() {
-            FourSlash.currentTestState.printBreakpointAtCurrentLocation();
-        }
-
-        public printNameOrDottedNameSpans(pos: number) {
-            FourSlash.currentTestState.printNameOrDottedNameSpans(pos);
-        }
-
-        public printErrorList() {
-            FourSlash.currentTestState.printErrorList();
-        }
-
-        public printNavigationItems(searchValue: string = ".*") {
-            FourSlash.currentTestState.printNavigationItems(searchValue);
-        }
-
-        public printScriptLexicalStructureItems() {
-            FourSlash.currentTestState.printScriptLexicalStructureItems();
-        }
-
-        public printReferences() {
-            FourSlash.currentTestState.printReferences();
-        }
-
-        public printContext() {
-            FourSlash.currentTestState.printContext();
-        }
+    class debug {
+        printCurrentParameterHelp(): void;
+        printCurrentFileState(): void;
+        printCurrentFileStateWithWhitespace(): void;
+        printCurrentFileStateWithoutCaret(): void;
+        printCurrentQuickInfo(): void;
+        printCurrentSignatureHelp(): void;
+        printMemberListMembers(): void;
+        printCompletionListMembers(): void;
+        printBreakpointLocation(pos: number): void;
+        printBreakpointAtCurrentLocation(): void;
+        printNameOrDottedNameSpans(pos: number): void;
+        printErrorList(): void;
+        printNavigationItems(searchValue?: string): void;
+        printScriptLexicalStructureItems(): void;
+        printReferences(): void;
+        printContext(): void;
     }
-
-    export class format {
-        public document() {
-            FourSlash.currentTestState.formatDocument();
-        }
-
-        public copyFormatOptions(): FormatCodeOptions {
-            return FourSlash.currentTestState.copyFormatOptions();
-        }
-
-        public setFormatOptions(options: FormatCodeOptions) {
-            return FourSlash.currentTestState.setFormatOptions(options);
-        }
-
-        public selection(startMarker: string, endMarker: string) {
-            FourSlash.currentTestState.formatSelection(FourSlash.currentTestState.getMarkerByName(startMarker).position, FourSlash.currentTestState.getMarkerByName(endMarker).position);
-        }
-
-        public setOption(name: string, value: number);
-        public setOption(name: string, value: string);
-        public setOption(name: string, value: boolean);
-        public setOption(name: string, value: any) {
-            FourSlash.currentTestState.formatCodeOptions[name] = value;
-        }
+    class format {
+        document(): void;
+        copyFormatOptions(): FormatCodeOptions;
+        setFormatOptions(options: FormatCodeOptions): any;
+        selection(startMarker: string, endMarker: string): void;
+        setOption(name: string, value: number): any;
+        setOption(name: string, value: string): any;
+        setOption(name: string, value: boolean): any;
     }
-
-    export class cancellation {
-        public resetCancelled() {
-            FourSlash.currentTestState.resetCancelled();
-        }
-
-        public setCancelled(numberOfCalls: number = 0) {
-            FourSlash.currentTestState.setCancelled(numberOfCalls);
-        }
+    class cancellation {
+        resetCancelled(): void;
+        setCancelled(numberOfCalls?: number): void;
     }
-
-    export module classification {
-        export function comment(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("comment", text, position);
-        }
-
-        export function identifier(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("identifier", text, position);
-        }
-
-        export function keyword(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("keyword", text, position);
-        }
-
-        export function numericLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("numericLiteral", text, position);
-        }
-
-        export function operator(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("operator", text, position);
-        }
-
-        export function stringLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("stringLiteral", text, position);
-        }
-
-        export function whiteSpace(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("whiteSpace", text, position);
-        }
-
-        export function text(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("text", text, position);
-        }
-
-        export function punctuation(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("punctuation", text, position);
-        }
-
-        export function docCommentTagName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("docCommentTagName", text, position);
-        }
-
-        export function className(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("className", text, position);
-        }
-
-        export function enumName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("enumName", text, position);
-        }
-
-        export function interfaceName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("interfaceName", text, position);
-        }
-
-        export function moduleName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("moduleName", text, position);
-        }
-
-        export function typeParameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("typeParameterName", text, position);
-        }
-
-        export function parameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("parameterName", text, position);
-        }
-
-        export function typeAliasName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } {
-            return getClassification("typeAliasName", text, position);
-        }
-
-        function getClassification(type: string, text: string, position?: number) {
-            return {
-                classificationType: type,
-                text: text,
-                textSpan: position === undefined ? undefined : { start: position, end: position + text.length }
-            };
-        }
+    module classification {
+        function comment(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function identifier(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function keyword(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function numericLiteral(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function operator(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function stringLiteral(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function whiteSpace(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function text(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function punctuation(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function docCommentTagName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function className(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function enumName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function interfaceName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function moduleName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function typeParameterName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function parameterName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
+        function typeAliasName(text: string, position?: number): {
+            classificationType: string;
+            text: string;
+            textSpan?: TextSpan;
+        };
     }
 }
-
-module fs {
-    export var test = new FourSlashInterface.test_();
-    export var goTo = new FourSlashInterface.goTo();
-    export var verify = new FourSlashInterface.verify();
-    export var edit = new FourSlashInterface.edit();
-    export var debug = new FourSlashInterface.debug();
-    export var format = new FourSlashInterface.format();
-    export var cancellation = new FourSlashInterface.cancellation();
-}
-
-function verifyOperationIsCancelled(f) {
-    FourSlash.verifyOperationIsCancelled(f);
-}
-
-var test = new FourSlashInterface.test_();
-var goTo = new FourSlashInterface.goTo();
-var verify = new FourSlashInterface.verify();
-var edit = new FourSlashInterface.edit();
-var debug = new FourSlashInterface.debug();
-var format = new FourSlashInterface.format();
-var cancellation = new FourSlashInterface.cancellation();
-var classification = FourSlashInterface.classification;
+declare function verifyOperationIsCancelled(f: any): void;
+declare var test: FourSlashInterface.test_;
+declare var goTo: FourSlashInterface.goTo;
+declare var verify: FourSlashInterface.verify;
+declare var edit: FourSlashInterface.edit;
+declare var debug: FourSlashInterface.debug;
+declare var format: FourSlashInterface.format;
+declare var cancellation: FourSlashInterface.cancellation;
+declare var classification: typeof FourSlashInterface.classification;
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics1.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics1.ts
deleted file mode 100644
index e409029276b..00000000000
--- a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics1.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-// @allowNonTsExtensions: true
-// @Filename: a.js
-//// /**
-////  * @type {number}
-////  * @type {string}
-////  */
-////  var v;
-
-verify.getSyntacticDiagnostics(`[
-  {
-    "message": "\'type\' tag already specified.",
-    "start": 26,
-    "length": 4,
-    "category": "error",
-    "code": 1223
-  }
-]`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/indentationBlock.ts b/tests/cases/fourslash/indentationBlock.ts
index e880c4a0957..853ff43b0d6 100644
--- a/tests/cases/fourslash/indentationBlock.ts
+++ b/tests/cases/fourslash/indentationBlock.ts
@@ -179,5 +179,5 @@
 ////{| "indent": 0 |}
 
 test.markers().forEach(marker => {
-    verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, IndentStyle.Block);
+    verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, ts.IndentStyle.Block);
 });
diff --git a/tests/cases/fourslash/indentationNone.ts b/tests/cases/fourslash/indentationNone.ts
index 078f5ab35f6..610a336cdda 100644
--- a/tests/cases/fourslash/indentationNone.ts
+++ b/tests/cases/fourslash/indentationNone.ts
@@ -179,5 +179,5 @@
 ////{| "indent": 0 |}
 
 test.markers().forEach(marker => {
-    verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, IndentStyle.None);
+    verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, ts.IndentStyle.None);
 });
diff --git a/tests/cases/fourslash/javaScriptModules12.ts b/tests/cases/fourslash/javaScriptModules12.ts
new file mode 100644
index 00000000000..c391f150963
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules12.ts
@@ -0,0 +1,57 @@
+///<reference path="fourslash.ts" />
+
+// Invocations of 'require' stop top-level variables from becoming global
+
+// @allowNonTsExtensions: true
+
+// @Filename: mod1.js
+//// var x = require('fs');
+//// /*1*/
+
+// @Filename: mod2.js
+//// var y;
+//// if(true) {
+////     y = require('fs');
+//// } 
+//// /*2*/
+
+// @Filename: glob1.js
+//// var a = require;
+//// /*3*/
+
+// @Filename: glob2.js
+//// var b = '';
+//// /*4*/
+
+// @Filename: consumer.js
+//// /*5*/
+
+goTo.marker('1');
+verify.completionListContains('x');
+verify.not.completionListContains('y');
+verify.completionListContains('a');
+verify.completionListContains('b');
+
+goTo.marker('2');
+verify.not.completionListContains('x');
+verify.completionListContains('y');
+verify.completionListContains('a');
+verify.completionListContains('b');
+
+goTo.marker('3');
+verify.not.completionListContains('x');
+verify.not.completionListContains('y');
+verify.completionListContains('a');
+verify.completionListContains('b');
+
+goTo.marker('4');
+verify.not.completionListContains('x');
+verify.not.completionListContains('y');
+verify.completionListContains('a');
+verify.completionListContains('b');
+
+goTo.marker('5');
+verify.not.completionListContains('x');
+verify.not.completionListContains('y');
+verify.completionListContains('a');
+verify.completionListContains('b');
diff --git a/tests/cases/fourslash/javaScriptModules13.ts b/tests/cases/fourslash/javaScriptModules13.ts
new file mode 100644
index 00000000000..8b22971009c
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules13.ts
@@ -0,0 +1,26 @@
+///<reference path="fourslash.ts" />
+
+// Assignments to 'module.exports' create an external module
+
+// @allowNonTsExtensions: true
+// @Filename: myMod.js
+//// if (true) {
+////     module.exports = { a: 10 };
+//// }
+//// var invisible = true;
+
+// @Filename: isGlobal.js
+//// var y = 10;
+
+// @Filename: consumer.js
+//// var x = require('myMod');
+//// /**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+
+verify.completionListContains('y');
+verify.not.completionListContains('invisible');
+
+edit.insert('x.');
+verify.completionListContains('a');
diff --git a/tests/cases/fourslash/javaScriptModules14.ts b/tests/cases/fourslash/javaScriptModules14.ts
new file mode 100644
index 00000000000..5434f94cf8d
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules14.ts
@@ -0,0 +1,28 @@
+///<reference path="fourslash.ts" />
+
+// Assignments to 'exports.p' stop global variables from being visible in other files
+
+// @allowNonTsExtensions: true
+// @Filename: myMod.js
+//// if (true) {
+////     exports.b = true;
+//// } else {
+////     exports.n = 3;
+//// }
+//// function fn() {
+////     exports.s = 'foo';
+//// }
+//// var invisible = true;
+
+// @Filename: isGlobal.js
+//// var y = 10;
+
+// @Filename: consumer.js
+//// var x = require('myMod');
+//// /**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+
+verify.completionListContains('y');
+verify.not.completionListContains('invisible');
diff --git a/tests/cases/fourslash/javaScriptModules15.ts b/tests/cases/fourslash/javaScriptModules15.ts
new file mode 100644
index 00000000000..ff888d99336
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules15.ts
@@ -0,0 +1,27 @@
+///<reference path="fourslash.ts" />
+
+// Assignments to 'exports.p' define a property 'p' even if they're not at top-level
+
+// @allowNonTsExtensions: true
+// @Filename: myMod.js
+//// if (true) {
+////     exports.b = true;
+//// } else {
+////     exports.n = 3;
+//// }
+//// function fn() {
+////     exports.s = 'foo';
+//// }
+
+// @Filename: consumer.js
+//// var x = require('myMod');
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/javaScriptModules16.ts b/tests/cases/fourslash/javaScriptModules16.ts
new file mode 100644
index 00000000000..c556f288145
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules16.ts
@@ -0,0 +1,22 @@
+///<reference path="fourslash.ts" />
+
+// Assignments to 'exports.p' define a property 'p'
+
+// @allowNonTsExtensions: true
+// @Filename: myMod.js
+//// exports.n = 3;
+//// exports.s = 'foo';
+//// exports.b = true;
+
+// @Filename: consumer.js
+//// var x = require('myMod');
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/javaScriptModules17.ts b/tests/cases/fourslash/javaScriptModules17.ts
new file mode 100644
index 00000000000..8514ed0ee18
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules17.ts
@@ -0,0 +1,18 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: myMod.js
+//// module.exports = { n: 3, s: 'foo', b: true };
+
+// @Filename: consumer.js
+//// var x = require('./myMod');
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/javaScriptModules18.ts b/tests/cases/fourslash/javaScriptModules18.ts
new file mode 100644
index 00000000000..d3117f86b3f
--- /dev/null
+++ b/tests/cases/fourslash/javaScriptModules18.ts
@@ -0,0 +1,14 @@
+///<reference path="fourslash.ts" />
+
+// CommonJS modules should not pollute the global namespace
+
+// @allowNonTsExtensions: true
+// @Filename: myMod.js
+//// var x = require('fs');
+
+// @Filename: other.js
+//// /**/;
+
+goTo.file('other.js');
+
+verify.not.completionListContains('x');
diff --git a/tests/cases/fourslash/overloadOnConstCallSignature.ts b/tests/cases/fourslash/overloadOnConstCallSignature.ts
index d729fd4da6f..101d7750e04 100644
--- a/tests/cases/fourslash/overloadOnConstCallSignature.ts
+++ b/tests/cases/fourslash/overloadOnConstCallSignature.ts
@@ -11,7 +11,7 @@
 
 goTo.marker('1');
 verify.signatureHelpCountIs(4);
-verify.currentSignatureHelpIs('foo(name: \'order\'): string');
+verify.currentSignatureHelpIs('foo(name: "order"): string');
 edit.insert('"hi"');
 
 goTo.marker('2');
diff --git a/tests/cases/fourslash/parameterWithNestedDestructuring.ts b/tests/cases/fourslash/parameterWithNestedDestructuring.ts
new file mode 100644
index 00000000000..fa3c4e55294
--- /dev/null
+++ b/tests/cases/fourslash/parameterWithNestedDestructuring.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts'/>
+
+////[[{foo: 'hello', bar: [1]}]]
+////  .map(([{foo, bar: [baz]}]) => /*1*/foo + /*2*/baz);
+
+goTo.marker('1');
+verify.quickInfoIs('var foo: string');
+
+goTo.marker('2');
+verify.quickInfoIs('var baz: number');
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts b/tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts
new file mode 100644
index 00000000000..b48c7cfa3de
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts
@@ -0,0 +1,41 @@
+/// <reference path='fourslash.ts'/>
+
+////let /*1*/hello: "hello" | 'hello' = "hello";
+////let /*2*/world: 'world' = "world";
+////let /*3*/helloOrWorld: "hello" | 'world';
+
+goTo.marker("1");
+verify.verifyQuickInfoDisplayParts("let", "", { start: test.markerByName('1').position, length: "hello".length }, [
+        { text: "let", kind: "keyword" },
+        { text: " ", kind: "space" },
+        { text: "hello", kind: "localName" },
+        { text: ":", kind: "punctuation" },
+        { text: " ", kind: "space" },
+        { text: '"hello"', kind: "stringLiteral" }, ],
+    /*documentation*/ []);
+
+goTo.marker("2");
+verify.verifyQuickInfoDisplayParts("let", "", { start: test.markerByName('2').position, length: "world".length }, [
+        { text: "let", kind: "keyword" },
+        { text: " ", kind: "space" },
+        { text: "world", kind: "localName" },
+        { text: ":", kind: "punctuation" },
+        { text: " ", kind: "space" },
+        { text: '"world"', kind: "stringLiteral" },
+    ],
+    /*documentation*/[]);
+
+goTo.marker("3");
+verify.verifyQuickInfoDisplayParts("let", "", { start: test.markerByName('3').position, length: "helloOrWorld".length }, [
+        { text: "let", kind: "keyword" },
+        { text: " ", kind: "space" },
+        { text: "helloOrWorld", kind: "localName" },
+        { text: ":", kind: "punctuation" },
+        { text: " ", kind: "space" },
+        { text: '"hello"', kind: "stringLiteral" },
+        { text: " ", kind: "space" },
+        { text: "|", kind: "punctuation" },
+        { text: " ", kind: "space" },
+        { text: '"world"', kind: "stringLiteral" },
+    ],
+    /*documentation*/[]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts b/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts
index f2ee37aa675..948c2fde999 100644
--- a/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts
+++ b/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts
@@ -20,22 +20,22 @@
 ////c.x1(1, (x/*10*/x) => { return 1; } );
 
 goTo.marker('1');
-verify.quickInfoIs("(method) I.x1(a: number, callback: (x: 'hi') => number): any");
+verify.quickInfoIs("(method) I.x1(a: number, callback: (x: \"hi\") => number): any");
 goTo.marker('2');
-verify.quickInfoIs("(method) C.x1(a: number, callback: (x: 'hi') => number): any");
+verify.quickInfoIs("(method) C.x1(a: number, callback: (x: \"hi\") => number): any");
 goTo.marker('3');
-verify.quickInfoIs("(parameter) callback: (x: 'hi') => number");
+verify.quickInfoIs("(parameter) callback: (x: \"hi\") => number");
 goTo.marker('4');
-verify.quickInfoIs("(method) C.x1(a: number, callback: (x: 'hi') => number): any");
+verify.quickInfoIs("(method) C.x1(a: number, callback: (x: \"hi\") => number): any");
 goTo.marker('5');
 verify.quickInfoIs('(parameter) callback: (x: string) => number');
 goTo.marker('6');
 verify.quickInfoIs('(parameter) callback: (x: string) => number');
 goTo.marker('7');
-verify.quickInfoIs("(method) C.x1(a: number, callback: (x: 'hi') => number): any");
+verify.quickInfoIs("(method) C.x1(a: number, callback: (x: \"hi\") => number): any");
 goTo.marker('8');
-verify.quickInfoIs("(parameter) xx: 'hi'");
+verify.quickInfoIs("(parameter) xx: \"hi\"");
 goTo.marker('9');
-verify.quickInfoIs("(parameter) xx: 'bye'");
+verify.quickInfoIs("(parameter) xx: \"bye\"");
 goTo.marker('10');
-verify.quickInfoIs("(parameter) xx: 'hi'");
\ No newline at end of file
+verify.quickInfoIs("(parameter) xx: \"hi\"");
\ No newline at end of file
diff --git a/tests/cases/fourslash/recursiveClassReference.ts b/tests/cases/fourslash/recursiveClassReference.ts
index d0e96ac90e3..81843711d65 100644
--- a/tests/cases/fourslash/recursiveClassReference.ts
+++ b/tests/cases/fourslash/recursiveClassReference.ts
@@ -11,4 +11,4 @@
 //// }
 
 goTo.marker();
-fs.verify.quickInfoExists();
+verify.quickInfoExists();
diff --git a/tests/cases/fourslash/renameModuleToVar.ts b/tests/cases/fourslash/renameModuleToVar.ts
index 023b0fa1c74..fc31f4040e8 100644
--- a/tests/cases/fourslash/renameModuleToVar.ts
+++ b/tests/cases/fourslash/renameModuleToVar.ts
@@ -10,7 +10,7 @@
 ////    var z = y + 5;
 ////}
 
-fs.goTo.marker();
-fs.edit.backspace(6);
-fs.edit.insert("var");
-fs.verify.numberOfErrorsInCurrentFile(0);
\ No newline at end of file
+goTo.marker();
+edit.backspace(6);
+edit.insert("var");
+verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/server/openFile.ts b/tests/cases/fourslash/server/openFile.ts
new file mode 100644
index 00000000000..320e52c9f5e
--- /dev/null
+++ b/tests/cases/fourslash/server/openFile.ts
@@ -0,0 +1,16 @@
+/// <reference path="../fourslash.ts"/>
+
+// @Filename: test1.ts
+////t.
+
+// @Filename: test.ts
+////var t = '10';
+
+// @Filename: tsconfig.json
+////{ "files": ["test.ts", "test1.ts"] }
+
+var overridingContent = "var t = 10; t.";
+goTo.file("test.ts", overridingContent);
+goTo.file("test1.ts");
+goTo.eof();
+verify.completionListContains("toExponential");
diff --git a/tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts b/tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts
new file mode 100644
index 00000000000..aab276403fe
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts
@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+////class Circle {
+////    /**
+////      * Initialize a circle.
+////      * @param  radius The radius of the circle.
+////      */
+////    constructor(private radius: number) {
+////    }
+////}
+////var a = new Circle(/**/
+
+goTo.marker('');
+verify.signatureHelpCountIs(1);
+verify.currentSignatureHelpIs("Circle(radius: number): Circle");
+verify.currentParameterHelpArgumentNameIs("radius");
+verify.currentParameterSpanIs("radius: number");
+verify.currentParameterHelpArgumentDocCommentIs("The radius of the circle.");
\ No newline at end of file
diff --git a/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts b/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts
index 8edd0617d70..e312b71aebe 100644
--- a/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts
+++ b/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts
@@ -18,9 +18,9 @@ verify.currentParameterSpanIs("z: string");
 goTo.marker('2');
 verify.signatureHelpCountIs(3);
 verify.currentParameterHelpArgumentNameIs("x");
-verify.currentParameterSpanIs("x: 'hi'");
+verify.currentParameterSpanIs("x: \"hi\"");
 
 goTo.marker('3');
 verify.signatureHelpCountIs(3);
 verify.currentParameterHelpArgumentNameIs("y");
-verify.currentParameterSpanIs("y: 'bye'");
+verify.currentParameterSpanIs("y: \"bye\"");
diff --git a/tests/cases/fourslash/unclosedFunctionErrorRecovery3.ts b/tests/cases/fourslash/unclosedFunctionErrorRecovery3.ts
index bcb79811a62..7a52ddc2c32 100644
--- a/tests/cases/fourslash/unclosedFunctionErrorRecovery3.ts
+++ b/tests/cases/fourslash/unclosedFunctionErrorRecovery3.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @allowUnreachableCode: true
 
 ////        class alpha { static beta() return 5; } }
 ////  /**/  var gamma = alpha.beta() * 5;             
diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts
index b5c2c70e491..9e316266bf6 100644
--- a/tests/cases/unittests/moduleResolution.ts
+++ b/tests/cases/unittests/moduleResolution.ts
@@ -6,21 +6,35 @@ declare namespace chai.assert {
 }
 
 module ts {
+    function diagnosticToString(diagnostic: Diagnostic) {
+        let output = "";
+
+        if (diagnostic.file) {
+            let loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
+
+            output += `${diagnostic.file.fileName}(${loc.line + 1},${loc.character + 1}): `;
+        }
+
+        let category = DiagnosticCategory[diagnostic.category].toLowerCase();
+        output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine)}${sys.newLine}`;
+
+        return output;
+    }
 
     interface File {
         name: string
-        content?: string 
+        content?: string
     }
 
     function createModuleResolutionHost(...files: File[]): ModuleResolutionHost {
         let map = arrayToMap(files, f => f.name);
-        
+
         return { fileExists, readFile };
-        
+
         function fileExists(path: string): boolean {
             return hasProperty(map, path);
         }
-        
+
         function readFile(path: string): string {
             return hasProperty(map, path) ? map[path].content : undefined;
         }
@@ -28,18 +42,18 @@ module ts {
 
     function splitPath(path: string): { dir: string; rel: string } {
         let index = path.indexOf(directorySeparator);
-        return index === -1 
+        return index === -1
             ? { dir: path, rel: undefined }
             : { dir: path.substr(0, index), rel: path.substr(index + 1) };
     }
 
     describe("Node module resolution - relative paths", () => {
-        
+
         function testLoadAsFile(containingFileName: string, moduleFileNameNoExt: string, moduleName: string): void {
             for (let ext of supportedExtensions) {
                 let containingFile = { name: containingFileName }
                 let moduleFile = { name: moduleFileNameNoExt + ext }
-                let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, moduleFile));                
+                let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, moduleFile));
                 assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
                 assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
 
@@ -53,11 +67,11 @@ module ts {
                         failedLookupLocations.push(normalizePath(getRootLength(moduleName) === 0 ? combinePaths(dir, moduleName) : moduleName) + e);
                     }
                 }
-                
+
                 assert.deepEqual(resolution.failedLookupLocations, failedLookupLocations);
             }
         }
-        
+
         it("module name that starts with './' resolved as relative file name", () => {
             testLoadAsFile("/foo/bar/baz.ts", "/foo/bar/foo", "./foo");
         });
@@ -73,7 +87,7 @@ module ts {
         it("module name that starts with 'c:/' script extension resolved as relative file name", () => {
             testLoadAsFile("c:/foo/bar/baz.ts", "c:/foo", "c:/foo");
         });
-        
+
         function testLoadingFromPackageJson(containingFileName: string, packageJsonFileName: string, fieldRef: string, moduleFileName: string, moduleName: string): void {
             let containingFile = { name: containingFileName };
             let packageJson = { name: packageJsonFileName, content: JSON.stringify({ "typings": fieldRef }) };
@@ -81,20 +95,20 @@ module ts {
             let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, packageJson, moduleFile));
             assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
             assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
-            // expect three failed lookup location - attempt to load module as file with all supported extensions
-            assert.equal(resolution.failedLookupLocations.length, 3);
+            // expect five failed lookup location - attempt to load module as file with all supported extensions
+            assert.equal(resolution.failedLookupLocations.length, 5);
         }
-        
+
         it("module name as directory - load from typings", () => {
             testLoadingFromPackageJson("/a/b/c/d.ts", "/a/b/c/bar/package.json", "c/d/e.d.ts", "/a/b/c/bar/c/d/e.d.ts", "./bar");
             testLoadingFromPackageJson("/a/b/c/d.ts", "/a/bar/package.json", "e.d.ts", "/a/bar/e.d.ts", "../../bar");
             testLoadingFromPackageJson("/a/b/c/d.ts", "/bar/package.json", "e.d.ts", "/bar/e.d.ts", "/bar");
             testLoadingFromPackageJson("c:/a/b/c/d.ts", "c:/bar/package.json", "e.d.ts", "c:/bar/e.d.ts", "c:/bar");
         });
-        
-        it ("module name as directory - load index.d.ts", () => {
-            let containingFile = {name: "/a/b/c.ts"};
-            let packageJson = {name: "/a/b/foo/package.json", content: JSON.stringify({main: "/c/d"})};
+
+        it("module name as directory - load index.d.ts", () => {
+            let containingFile = { name: "/a/b/c.ts" };
+            let packageJson = { name: "/a/b/foo/package.json", content: JSON.stringify({ main: "/c/d" }) };
             let indexFile = { name: "/a/b/foo/index.d.ts" };
             let resolution = nodeModuleNameResolver("./foo", containingFile.name, createModuleResolutionHost(containingFile, packageJson, indexFile));
             assert.equal(resolution.resolvedModule.resolvedFileName, indexFile.name);
@@ -103,12 +117,14 @@ module ts {
                 "/a/b/foo.ts",
                 "/a/b/foo.tsx",
                 "/a/b/foo.d.ts",
+                "/a/b/foo.js",
+                "/a/b/foo.jsx",
                 "/a/b/foo/index.ts",
                 "/a/b/foo/index.tsx",
             ]);
         });
     });
-    
+
     describe("Node module resolution - non-relative paths", () => {
         it("load module as file - ts files not loaded", () => {
             let containingFile = { name: "/a/b/c/d/e.ts" };
@@ -129,7 +145,7 @@ module ts {
                 "/a/b/c/node_modules/foo/package.json",
                 "/a/b/c/node_modules/foo/index.ts",
                 "/a/b/c/node_modules/foo/index.tsx",
-                "/a/b/c/node_modules/foo/index.d.ts"
+                "/a/b/c/node_modules/foo/index.d.ts",
             ])
         });
 
@@ -140,7 +156,7 @@ module ts {
             assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
             assert.equal(resolution.resolvedModule.isExternalLibraryImport, true);
         });
-        
+
         it("load module as directory", () => {
             let containingFile = { name: "/a/node_modules/b/c/node_modules/d/e.ts" };
             let moduleFile = { name: "/a/node_modules/foo/index.d.ts" };
@@ -178,31 +194,15 @@ module ts {
             ]);
         });
     });
-    
+
     describe("Module resolution - relative imports", () => {
-       it("should find all modules", () => {
-           const options: CompilerOptions = { module: ModuleKind.CommonJS };
-           const files: Map<string> = {
-               "/a/b/c/first/shared.ts": `
-class A {}
-export = A`,
-               "/a/b/c/first/second/class_a.ts": `
-import Shared = require('../shared');
-import C = require('../../third/class_c');
-class B {}
-export = B;`,
-               "/a/b/c/third/class_c.ts":`
-import Shared = require('../first/shared');
-class C {}
-export = C;
-                `
-           };
-           const currentDirectory = "/a/b/c/first/second";
-           const host: CompilerHost = {
-               getSourceFile: (fileName: string, languageVersion: ScriptTarget) => {
-                   let path = normalizePath(combinePaths(currentDirectory, fileName));
-                   return hasProperty(files, path) ? createSourceFile(fileName, files[path], languageVersion) : undefined;
-               },
+        function test(files: Map<string>, currentDirectory: string, rootFiles: string[], expectedFilesCount: number, relativeNamesToCheck: string[]) {
+            const options: CompilerOptions = { module: ModuleKind.CommonJS };
+            const host: CompilerHost = {
+                getSourceFile: (fileName: string, languageVersion: ScriptTarget) => {
+                    let path = normalizePath(combinePaths(currentDirectory, fileName));
+                    return hasProperty(files, path) ? createSourceFile(fileName, files[path], languageVersion) : undefined;
+                },
                 getDefaultLibFileName: () => "lib.d.ts",
                 writeFile: (fileName, content): void => { throw new Error("NotImplemented"); },
                 getCurrentDirectory: () => currentDirectory,
@@ -210,38 +210,175 @@ export = C;
                 getNewLine: () => "\r\n",
                 useCaseSensitiveFileNames: () => false,
                 fileExists: fileName => {
-                   let path = normalizePath(combinePaths(currentDirectory, fileName));
-                   return hasProperty(files, path);
+                    let path = normalizePath(combinePaths(currentDirectory, fileName));
+                    return hasProperty(files, path);
                 },
                 readFile: (fileName): string => { throw new Error("NotImplemented"); }
-           };
+            };
 
-           const program = createProgram(["class_a.ts"], options, host);
+            const program = createProgram(rootFiles, options, host);
 
-           assert.equal(program.getSourceFiles().length, 3);
-           const syntacticDiagnostics = program.getSyntacticDiagnostics();
-           assert.equal(syntacticDiagnostics.length, 0, `expect no syntactic diagnostics, got: ${JSON.stringify(syntacticDiagnostics.map(diagnosticToString))}`);
-           const semanticDiagnostics = program.getSemanticDiagnostics();
-           assert.equal(semanticDiagnostics.length, 0, `expect no semantic diagnostics, got: ${JSON.stringify(semanticDiagnostics.map(diagnosticToString))}`);
+            assert.equal(program.getSourceFiles().length, expectedFilesCount);
+            const syntacticDiagnostics = program.getSyntacticDiagnostics();
+            assert.equal(syntacticDiagnostics.length, 0, `expect no syntactic diagnostics, got: ${JSON.stringify(syntacticDiagnostics.map(diagnosticToString))}`);
+            const semanticDiagnostics = program.getSemanticDiagnostics();
+            assert.equal(semanticDiagnostics.length, 0, `expect no semantic diagnostics, got: ${JSON.stringify(semanticDiagnostics.map(diagnosticToString))}`);
 
-           // try to get file using a relative name
-           const fileC = program.getSourceFile("../../../c/third/class_c.ts");
-           assert.isTrue(fileC !== undefined, `expected to get file by relative name, got ${fileC}`);
-       });
-       
-        function diagnosticToString(diagnostic: Diagnostic) {
-            let output = "";
-    
-            if (diagnostic.file) {
-                let loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
-    
-                output += `${ diagnostic.file.fileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
+            // try to get file using a relative name
+            for (const relativeFileName of relativeNamesToCheck) {
+                assert.isTrue(program.getSourceFile(relativeFileName) !== undefined, `expected to get file by relative name, got undefined`);
             }
-    
-            let category = DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += `${ category } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }${ sys.newLine }`;
-    
-            return output;
         }
+
+        it("should find all modules", () => {
+            const files: Map<string> = {
+                "/a/b/c/first/shared.ts": `
+class A {}
+export = A`,
+                "/a/b/c/first/second/class_a.ts": `
+import Shared = require('../shared');
+import C = require('../../third/class_c');
+class B {}
+export = B;`,
+                "/a/b/c/third/class_c.ts": `
+import Shared = require('../first/shared');
+class C {}
+export = C;
+                `
+            };
+            test(files, "/a/b/c/first/second", ["class_a.ts"], 3, ["../../../c/third/class_c.ts"]);
+        });
+        
+        it("should find modules in node_modules", () => {
+            const files: Map<string> = {
+                "/parent/node_modules/mod/index.d.ts": "export var x",
+                "/parent/app/myapp.ts": `import {x} from "mod"`
+            };
+            test(files, "/parent/app",["myapp.ts"], 2, []);
+        });
+
+        it("should find file referenced via absolute and relative names", () => {
+            const files: Map<string> = {
+                "/a/b/c.ts": `/// <reference path="b.ts"/>`,
+                "/a/b/b.ts": "var x"
+            };
+            test(files, "/a/b", ["c.ts", "/a/b/b.ts"], 2, []);
+        });
+    });
+    
+    describe("Files with different casing", () => {
+        const library = createSourceFile("lib.d.ts", "", ScriptTarget.ES5);
+        function test(files: Map<string>, options: CompilerOptions, currentDirectory: string, useCaseSensitiveFileNames: boolean, rootFiles: string[], diagnosticCodes: number[]): void {
+            const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+            if (!useCaseSensitiveFileNames) {
+                let f: Map<string> = {};
+                for (let fileName in files) {
+                    f[getCanonicalFileName(fileName)] = files[fileName];
+                }
+                files = f;
+            }
+
+            const host: CompilerHost = {
+                getSourceFile: (fileName: string, languageVersion: ScriptTarget) => {
+                    if (fileName === "lib.d.ts") {
+                        return library;
+                    }
+                    let path = getCanonicalFileName(normalizePath(combinePaths(currentDirectory, fileName)));
+                    return hasProperty(files, path) ? createSourceFile(fileName, files[path], languageVersion) : undefined;
+                },
+                getDefaultLibFileName: () => "lib.d.ts",
+                writeFile: (fileName, content): void => { throw new Error("NotImplemented"); },
+                getCurrentDirectory: () => currentDirectory,
+                getCanonicalFileName,
+                getNewLine: () => "\r\n",
+                useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
+                fileExists: fileName => {
+                    let path = getCanonicalFileName(normalizePath(combinePaths(currentDirectory, fileName)));
+                    return hasProperty(files, path);
+                },
+                readFile: (fileName): string => { throw new Error("NotImplemented"); }
+            };
+            const program = createProgram(rootFiles, options, host);
+            const diagnostics = sortAndDeduplicateDiagnostics(program.getSemanticDiagnostics().concat(program.getOptionsDiagnostics()));
+            assert.equal(diagnostics.length, diagnosticCodes.length, `Incorrect number of expected diagnostics, expected ${diagnosticCodes.length}, got '${map(diagnostics, diagnosticToString).join("\r\n")}'`);
+            for (let i = 0; i < diagnosticCodes.length; ++i) {
+                assert.equal(diagnostics[i].code, diagnosticCodes[i], `Expected diagnostic code ${diagnosticCodes[i]}, got '${diagnostics[i].code}': '${diagnostics[i].messageText}'`);
+            }
+        }
+
+        it("should succeed when the same file is referenced using absolute and relative names", () => {
+            const files: Map<string> = {
+                "/a/b/c.ts": `/// <reference path="d.ts"/>`,
+                "/a/b/d.ts": "var x"
+            };
+            test(files, { module: ts.ModuleKind.AMD },  "/a/b", /* useCaseSensitiveFileNames */ false, ["c.ts", "/a/b/d.ts"], []);
+        });
+
+        it("should fail when two files used in program differ only in casing (tripleslash references)", () => {
+            const files: Map<string> = {
+                "/a/b/c.ts": `/// <reference path="D.ts"/>`,
+                "/a/b/d.ts": "var x"
+            };
+            test(files, { module: ts.ModuleKind.AMD, forceConsistentCasingInFileNames: true },  "/a/b", /* useCaseSensitiveFileNames */ false, ["c.ts", "d.ts"], [1149]);
+        });
+
+        it("should fail when two files used in program differ only in casing (imports)", () => {
+            const files: Map<string> = {
+                "/a/b/c.ts": `import {x} from "D"`,
+                "/a/b/d.ts": "export var x"
+            };
+            test(files, { module: ts.ModuleKind.AMD, forceConsistentCasingInFileNames: true },  "/a/b", /* useCaseSensitiveFileNames */ false, ["c.ts", "d.ts"], [1149]);
+        });
+
+        it("should fail when two files used in program differ only in casing (imports, relative module names)", () => {
+            const files: Map<string> = {
+                "moduleA.ts": `import {x} from "./ModuleB"`,
+                "moduleB.ts": "export var x"
+            };
+            test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true },  "", /* useCaseSensitiveFileNames */ false, ["moduleA.ts", "moduleB.ts"], [1149]);
+        });
+
+        it("should fail when two files exist on disk that differs only in casing", () => {
+            const files: Map<string> = {
+                "/a/b/c.ts": `import {x} from "D"`,
+                "/a/b/D.ts": "export var x",
+                "/a/b/d.ts": "export var y"
+            };
+            test(files, { module: ts.ModuleKind.AMD },  "/a/b", /* useCaseSensitiveFileNames */ true, ["c.ts", "d.ts"], [1149]);
+        });
+
+        it("should fail when module name in 'require' calls has inconsistent casing", () => {
+            const files: Map<string> = {
+                "moduleA.ts": `import a = require("./ModuleC")`,
+                "moduleB.ts": `import a = require("./moduleC")`,
+                "moduleC.ts": "export var x"
+            };
+            test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true },  "", /* useCaseSensitiveFileNames */ false, ["moduleA.ts", "moduleB.ts", "moduleC.ts"], [1149, 1149]);
+        });
+
+        it("should fail when module names in 'require' calls has inconsistent casing and current directory has uppercase chars", () => {
+            const files: Map<string> = {
+                "/a/B/c/moduleA.ts": `import a = require("./ModuleC")`,
+                "/a/B/c/moduleB.ts": `import a = require("./moduleC")`,
+                "/a/B/c/moduleC.ts": "export var x",
+                "/a/B/c/moduleD.ts": `
+import a = require("./moduleA.ts");
+import b = require("./moduleB.ts");
+                `
+            };
+            test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true },  "/a/B/c", /* useCaseSensitiveFileNames */ false, ["moduleD.ts"], [1149]);
+        });
+        it("should not fail when module names in 'require' calls has consistent casing and current directory has uppercase chars", () => {
+            const files: Map<string> = {
+                "/a/B/c/moduleA.ts": `import a = require("./moduleC")`,
+                "/a/B/c/moduleB.ts": `import a = require("./moduleC")`,
+                "/a/B/c/moduleC.ts": "export var x",
+                "/a/B/c/moduleD.ts": `
+import a = require("./moduleA.ts");
+import b = require("./moduleB.ts");
+                `
+            };
+            test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true },  "/a/B/c", /* useCaseSensitiveFileNames */ false, ["moduleD.ts"], []);
+        })
     });
 }
\ No newline at end of file
diff --git a/tests/cases/unittests/services/preProcessFile.ts b/tests/cases/unittests/services/preProcessFile.ts
index a3f8db5528f..d9ddaf0f256 100644
--- a/tests/cases/unittests/services/preProcessFile.ts
+++ b/tests/cases/unittests/services/preProcessFile.ts
@@ -2,8 +2,8 @@
 /// <reference path="..\..\..\..\src\harness\harnessLanguageService.ts" />
 
 describe('PreProcessFile:', function () {
-    function test(sourceText: string, readImportFile: boolean, expectedPreProcess: ts.PreProcessedFileInfo): void {
-        var resultPreProcess = ts.preProcessFile(sourceText, readImportFile);
+    function test(sourceText: string, readImportFile: boolean, detectJavaScriptImports: boolean, expectedPreProcess: ts.PreProcessedFileInfo): void {
+        var resultPreProcess = ts.preProcessFile(sourceText, readImportFile, detectJavaScriptImports);
 
         var resultIsLibFile = resultPreProcess.isLibFile;
         var resultImportedFiles = resultPreProcess.importedFiles;
@@ -45,7 +45,9 @@ describe('PreProcessFile:', function () {
     }
     describe("Test preProcessFiles,", function () {
         it("Correctly return referenced files from triple slash", function () {
-            test("///<reference path = \"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\"/>" + "\n" + "///<reference path=\"refFile3.ts\" />" + "\n" + "///<reference path= \"..\\refFile4d.ts\" />", true,
+            test("///<reference path = \"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\"/>" + "\n" + "///<reference path=\"refFile3.ts\" />" + "\n" + "///<reference path= \"..\\refFile4d.ts\" />", 
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [{ fileName: "refFile1.ts", pos: 0, end: 37 }, { fileName: "refFile2.ts", pos: 38, end: 73 },
                         { fileName: "refFile3.ts", pos: 74, end: 109 }, { fileName: "..\\refFile4d.ts", pos: 110, end: 150 }],
@@ -56,7 +58,9 @@ describe('PreProcessFile:', function () {
         }),
 
         it("Do not return reference path because of invalid triple-slash syntax", function () {
-            test("///<reference path\"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\">" + "\n" + "///<referencepath=\"refFile3.ts\" />" + "\n" + "///<reference pat= \"refFile4d.ts\" />", true,
+            test("///<reference path\"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\">" + "\n" + "///<referencepath=\"refFile3.ts\" />" + "\n" + "///<reference pat= \"refFile4d.ts\" />",
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
                     importedFiles: <ts.FileReference[]>[],
@@ -66,7 +70,9 @@ describe('PreProcessFile:', function () {
         }),
 
         it("Correctly return imported files", function () {
-            test("import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\"); import i3= require(\"r3.ts\"); import i4=require(\"r4.ts\"); import i5 = require  (\"r5.ts\");", true,
+            test("import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\"); import i3= require(\"r3.ts\"); import i4=require(\"r4.ts\"); import i5 = require  (\"r5.ts\");",
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
                     importedFiles: [{ fileName: "r1.ts", pos: 20, end: 25 }, { fileName: "r2.ts", pos: 49, end: 54 }, { fileName: "r3.ts", pos: 78, end: 83 },
@@ -77,7 +83,9 @@ describe('PreProcessFile:', function () {
         }),
 
         it("Do not return imported files if readImportFiles argument is false", function () {
-            test("import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\"); import i3= require(\"r3.ts\"); import i4=require(\"r4.ts\"); import i5 = require  (\"r5.ts\");", false,
+            test("import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\"); import i3= require(\"r3.ts\"); import i4=require(\"r4.ts\"); import i5 = require  (\"r5.ts\");",
+                /* readImports */ false,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
                     importedFiles: <ts.FileReference[]>[],
@@ -87,7 +95,9 @@ describe('PreProcessFile:', function () {
         }),
 
         it("Do not return import path because of invalid import syntax", function () {
-            test("import i1 require(\"r1.ts\"); import = require(\"r2.ts\") import i3= require(\"r3.ts\"); import i5", true,
+            test("import i1 require(\"r1.ts\"); import = require(\"r2.ts\") import i3= require(\"r3.ts\"); import i5",
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
                     importedFiles: [{ fileName: "r3.ts", pos: 73, end: 78 }],
@@ -97,7 +107,9 @@ describe('PreProcessFile:', function () {
         }),
 
         it("Correctly return referenced files and import files", function () {
-            test("///<reference path=\"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\"/>" + "\n" + "import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\");", true,
+            test("///<reference path=\"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\"/>" + "\n" + "import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\");",
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [{ fileName: "refFile1.ts", pos: 0, end: 35 }, { fileName: "refFile2.ts", pos: 36, end: 71 }],
                     importedFiles: [{ fileName: "r1.ts", pos: 92, end: 97 }, { fileName: "r2.ts", pos: 121, end: 126 }],
@@ -107,7 +119,9 @@ describe('PreProcessFile:', function () {
         }),
 
         it("Correctly return referenced files and import files even with some invalid syntax", function () {
-            test("///<reference path=\"refFile1.ts\" />" + "\n" + "///<reference path \"refFile2.ts\"/>" + "\n" + "import i1 = require(\"r1.ts\"); import = require(\"r2.ts\"); import i2 = require(\"r3.ts\");", true,
+            test("///<reference path=\"refFile1.ts\" />" + "\n" + "///<reference path \"refFile2.ts\"/>" + "\n" + "import i1 = require(\"r1.ts\"); import = require(\"r2.ts\"); import i2 = require(\"r3.ts\");",
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [{ fileName: "refFile1.ts", pos: 0, end: 35 }],
                     importedFiles: [{ fileName: "r1.ts", pos: 91, end: 96 }, { fileName: "r3.ts", pos: 148, end: 153 }],
@@ -124,7 +138,8 @@ describe('PreProcessFile:', function () {
                 "import {a as A} from \"m5\";" + "\n" +
                 "import {a as A, b, c as C} from \"m6\";" + "\n" +
                 "import def , {a, b, c as C} from \"m7\";" + "\n",
-                true,
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [],
                     importedFiles: [
@@ -146,7 +161,8 @@ describe('PreProcessFile:', function () {
                 "export {a} from \"m2\";" + "\n" +
                 "export {a as A} from \"m3\";" + "\n" +
                 "export {a as A, b, c as C} from \"m4\";" + "\n",
-                true,
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [],
                     importedFiles: [
@@ -166,7 +182,11 @@ describe('PreProcessFile:', function () {
                declare module "B" {}
                function foo() {
                }
-               `, false, {
+               `, 
+                /* readImports */ false,
+                /* detectJavaScriptImports */ false,
+ 
+               {
                    referencedFiles: [],
                    importedFiles: [],
                    ambientExternalModules: ["B"],
@@ -176,7 +196,8 @@ describe('PreProcessFile:', function () {
 
         it("Correctly handles export import declarations", function () {
             test("export import a = require(\"m1\");",
-                true,
+                /* readImports */true,
+                /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [],
                     importedFiles: [
@@ -186,7 +207,61 @@ describe('PreProcessFile:', function () {
                     isLibFile: false
                 })
         });
-
+        it("Correctly handles export require calls in JavaScript files", function () {
+            test(`
+            export import a = require("m1");
+            var x = require('m2');
+            foo(require('m3'));
+            var z = { f: require('m4') }
+            `,
+                /* readImports */true,
+                /* detectJavaScriptImports */ true,
+                {
+                    referencedFiles: [],
+                    importedFiles: [
+                        { fileName: "m1", pos: 39, end: 41 },
+                        { fileName: "m2", pos: 74, end: 76 },
+                        { fileName: "m3", pos: 105, end: 107 },
+                        { fileName: "m4", pos: 146, end: 148 },
+                    ],
+                    ambientExternalModules: undefined,
+                    isLibFile: false
+                })
+        });
+        it("Correctly handles dependency lists in define([deplist]) calls in JavaScript files", function () {
+            test(`
+            define(["mod1", "mod2"], (m1, m2) => {
+            });
+            `,
+                /* readImports */true,
+                /* detectJavaScriptImports */ true,
+                {
+                    referencedFiles: [],
+                    importedFiles: [
+                        { fileName: "mod1", pos: 21, end: 25 },
+                        { fileName: "mod2", pos: 29, end: 33 },
+                    ],
+                    ambientExternalModules: undefined,
+                    isLibFile: false
+                })
+        });
+        it("Correctly handles dependency lists in define(modName, [deplist]) calls in JavaScript files", function () {
+            test(`
+            define("mod", ["mod1", "mod2"], (m1, m2) => {
+            });
+            `,
+                /* readImports */true,
+                /* detectJavaScriptImports */ true,
+                {
+                    referencedFiles: [],
+                    importedFiles: [
+                        { fileName: "mod1", pos: 28, end: 32 },
+                        { fileName: "mod2", pos: 36, end: 40 },
+                    ],
+                    ambientExternalModules: undefined,
+                    isLibFile: false
+                })
+        });
     });
 });
 
diff --git a/tests/cases/unittests/tsconfigParsing.ts b/tests/cases/unittests/tsconfigParsing.ts
new file mode 100644
index 00000000000..3603d22f314
--- /dev/null
+++ b/tests/cases/unittests/tsconfigParsing.ts
@@ -0,0 +1,86 @@
+/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+
+namespace ts {
+    describe('parseConfigFileTextToJson', () => {
+        function assertParseResult(jsonText: string, expectedConfigObject: { config?: any; error?: Diagnostic }) {
+            let parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
+            assert.equal(JSON.stringify(parsed), JSON.stringify(expectedConfigObject));
+        }
+
+        function assertParseError(jsonText: string) {
+             let parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
+             assert.isTrue(undefined === parsed.config);
+             assert.isTrue(undefined !== parsed.error);
+        }
+
+        it("returns empty config for file with only whitespaces", () => {
+            assertParseResult("", { config : {} });
+            assertParseResult(" ", { config : {} });
+        });
+
+        it("returns empty config for file with comments only", () => {
+            assertParseResult("// Comment", { config: {} });
+            assertParseResult("/* Comment*/", { config: {} });
+        });
+
+        it("returns empty config when config is empty object", () => {
+            assertParseResult("{}", { config: {} });
+        });
+
+        it("returns config object without comments", () => {
+            assertParseResult(
+                `{ // Excluded files
+                    "exclude": [
+                        // Exclude d.ts
+                        "file.d.ts"
+                    ]
+                }`, { config: { exclude: ["file.d.ts"] } });
+
+            assertParseResult(
+                `{
+                    /* Excluded
+                         Files
+                    */
+                    "exclude": [
+                        /* multiline comments can be in the middle of a line */"file.d.ts"
+                    ]
+                }`, { config: { exclude: ["file.d.ts"] } });
+        });
+
+        it("keeps string content untouched", () => {
+            assertParseResult(
+                `{
+                    "exclude": [
+                        "xx//file.d.ts"
+                    ]
+                }`, { config: { exclude: ["xx//file.d.ts"] } });
+         assertParseResult(
+                `{
+                    "exclude": [
+                        "xx/*file.d.ts*/"
+                    ]
+                }`, { config: { exclude: ["xx/*file.d.ts*/"] } });
+        });
+
+        it("handles escaped characters in strings correctly", () => {
+            assertParseResult(
+                `{
+                    "exclude": [
+                        "xx\\"//files"
+                    ]
+                }`, { config: { exclude: ["xx\"//files"] } });
+
+            assertParseResult(
+                `{
+                    "exclude": [
+                        "xx\\\\" // end of line comment
+                    ]
+                }`, { config: { exclude: ["xx\\"] } });
+         });
+
+        it("returns object with error when json is invalid", () => {
+             assertParseError("invalid");
+        });
+    });
+}
diff --git a/tests/cases/unittests/versionCache.ts b/tests/cases/unittests/versionCache.ts
index 06c2cadbfe9..c1d283ca8cd 100644
--- a/tests/cases/unittests/versionCache.ts
+++ b/tests/cases/unittests/versionCache.ts
@@ -20,7 +20,10 @@ module ts {
     }
 
     describe('VersionCache TS code', () => {
-        var testContent = `/// <reference path="z.ts" />
+        let validateEditAtLineCharIndex: (line: number, char: number, deleteLength: number, insertString: string) => void;
+        
+        before(() => {
+            let testContent = `/// <reference path="z.ts" />
 var x = 10;
 var y = { zebra: 12, giraffe: "ell" };
 z.a;
@@ -31,16 +34,21 @@ k=y;
 var p:Point=new Point();
 var q:Point=<Point>p;`
 
-        let {lines, lineMap} = server.LineIndex.linesFromText(testContent);
-        assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line");
+            let {lines, lineMap} = server.LineIndex.linesFromText(testContent);
+            assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line");
 
-        let lineIndex = new server.LineIndex();
-        lineIndex.load(lines);
+            let lineIndex = new server.LineIndex();
+            lineIndex.load(lines);
 
-        function validateEditAtLineCharIndex(line: number, char: number, deleteLength: number, insertString: string): void {
-            let position = lineColToPosition(lineIndex, line, char);
-            validateEdit(lineIndex, testContent, position, deleteLength, insertString);
-        }
+            validateEditAtLineCharIndex = (line: number, char: number, deleteLength: number, insertString: string) => {
+                let position = lineColToPosition(lineIndex, line, char);
+                validateEdit(lineIndex, testContent, position, deleteLength, insertString);
+            };
+        });
+
+        after(() => {
+            validateEditAtLineCharIndex = undefined;
+        })
 
         it('change 9 1 0 1 {"y"}', () => {
             validateEditAtLineCharIndex(9, 1, 0, "y");
@@ -68,22 +76,35 @@ var q:Point=<Point>p;`
     });
 
     describe('VersionCache simple text', () => {
-        let testContent = `in this story:
+        let validateEditAtPosition: (position: number, deleteLength: number, insertString: string) => void;
+        let testContent: string;
+        let lines: string[];
+        let lineMap: number[];
+        before(() => {
+            testContent = `in this story:
 the lazy brown fox
 jumped over the cow
 that ate the grass
 that was purple at the tips
 and grew 1cm per day`;
 
-        let {lines, lineMap} = server.LineIndex.linesFromText(testContent);
-        assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line");
+            ({lines, lineMap} = server.LineIndex.linesFromText(testContent));
+            assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line");
 
-        let lineIndex = new server.LineIndex();
-        lineIndex.load(lines);
+            let lineIndex = new server.LineIndex();
+            lineIndex.load(lines);
 
-        function validateEditAtPosition(position: number, deleteLength: number, insertString: string): void {
-            validateEdit(lineIndex, testContent, position, deleteLength, insertString);
-        }
+            validateEditAtPosition = (position: number, deleteLength: number, insertString: string) => {
+                validateEdit(lineIndex, testContent, position, deleteLength, insertString);
+            }
+        });
+
+        after(() => {
+           validateEditAtPosition = undefined;
+           testContent = undefined;
+           lines = undefined;
+           lineMap = undefined; 
+        });
 
         it('Insert at end of file', () => {
             validateEditAtPosition(testContent.length, 0, "hmmmm...\r\n");
@@ -159,50 +180,69 @@ and grew 1cm per day`;
     });
 
     describe('VersionCache stress test', () => {
-        const iterationCount = 20;
-        //const interationCount = 20000; // uncomment for testing
-
-        // Use scanner.ts, decent size, does not change frequentlly
-        let testFileName = "src/compiler/scanner.ts";
-        let testContent = Harness.IO.readFile(testFileName);
-        let totalChars = testContent.length;
-        assert.isTrue(totalChars > 0, "Failed to read test file.");
-
-        let {lines, lineMap} = server.LineIndex.linesFromText(testContent);
-        assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line");
-
-        let lineIndex = new server.LineIndex();
-        lineIndex.load(lines);
-
         let rsa: number[] = [];
         let la: number[] = [];
         let las: number[] = [];
         let elas: number[] = [];
         let ersa: number[] = [];
         let ela: number[] = [];
-        let etotalChars = totalChars;
+        const iterationCount = 20;
+        //const iterationCount = 20000; // uncomment for testing
+        let lines: string[];
+        let lineMap: number[];
+        let lineIndex: server.LineIndex;
+        let testContent: string;
 
-        for (let j = 0; j < 100000; j++) {
-            rsa[j] = Math.floor(Math.random() * totalChars);
-            la[j] = Math.floor(Math.random() * (totalChars - rsa[j]));
-            if (la[j] > 4) {
-                las[j] = 4;
-            }
-            else {
-                las[j] = la[j];
-            }
-            if (j < 4000) {
-                ersa[j] = Math.floor(Math.random() * etotalChars);
-                ela[j] = Math.floor(Math.random() * (etotalChars - ersa[j]));
-                if (ela[j] > 4) {
-                    elas[j] = 4;
+        before(() => {
+            // Use scanner.ts, decent size, does not change frequently
+            let testFileName = "src/compiler/scanner.ts";
+            testContent = Harness.IO.readFile(testFileName);
+            let totalChars = testContent.length;
+            assert.isTrue(totalChars > 0, "Failed to read test file.");
+
+            ({lines, lineMap} = server.LineIndex.linesFromText(testContent));
+            assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line");
+
+            lineIndex = new server.LineIndex();
+            lineIndex.load(lines);
+
+            let etotalChars = totalChars;
+
+            for (let j = 0; j < 100000; j++) {
+                rsa[j] = Math.floor(Math.random() * totalChars);
+                la[j] = Math.floor(Math.random() * (totalChars - rsa[j]));
+                if (la[j] > 4) {
+                    las[j] = 4;
                 }
                 else {
-                    elas[j] = ela[j];
+                    las[j] = la[j];
+                }
+                if (j < 4000) {
+                    ersa[j] = Math.floor(Math.random() * etotalChars);
+                    ela[j] = Math.floor(Math.random() * (etotalChars - ersa[j]));
+                    if (ela[j] > 4) {
+                        elas[j] = 4;
+                    }
+                    else {
+                        elas[j] = ela[j];
+                    }
+                    etotalChars += (las[j] - elas[j]);
                 }
-                etotalChars += (las[j] - elas[j]);
             }
-        }
+        });
+
+        after(() => {
+            rsa = undefined;
+            la = undefined;
+            las = undefined;
+            elas = undefined;
+            ersa = undefined;
+            ela = undefined;
+            lines = undefined;
+            lineMap = undefined;
+            lineIndex = undefined;
+            testContent = undefined;
+        });
 
         it("Range (average length 1/4 file size)", () => {
             for (let i = 0; i < iterationCount; i++) {
diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts
index 6d3144eeaec..dab552e2619 100644
--- a/tests/webTestServer.ts
+++ b/tests/webTestServer.ts
@@ -5,6 +5,7 @@ import fs = require("fs");
 import path = require("path");
 import url = require("url");
 import child_process = require("child_process");
+import os = require("os");
 
 /// Command line processing ///
 
@@ -191,7 +192,6 @@ function getRequestOperation(req: http.ServerRequest, filename: string) {
         }
         return RequestType.Unknown
     }
-    return RequestType.Unknown
 }
 
 function handleRequestOperation(req: http.ServerRequest, res: http.ServerResponse, operation: RequestType, reqPath: string) {
@@ -263,7 +263,22 @@ http.createServer(function (req: http.ServerRequest, res: http.ServerResponse) {
 
 var browserPath: string;
 if ((browser && browser === 'chrome')) {
-    var defaultChromePath = "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe";
+    let defaultChromePath = "";
+    switch (os.platform()) {
+        case "win32":
+        case "win64":
+            defaultChromePath = "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe";
+            break;
+        case "darwin":
+            defaultChromePath = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome";
+            break;
+        case "linux":
+            defaultChromePath = "/opt/google/chrome/chrome"
+            break;
+        default:
+            console.log(`default Chrome location is unknown for platform '${os.platform()}'`);
+            break;
+    }
     if (fs.existsSync(defaultChromePath)) {
         browserPath = defaultChromePath;
     } else {
diff --git a/tslint.json b/tslint.json
index 19ccd30ca9f..3cafdbfd39c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -38,6 +38,8 @@
         "no-trailing-whitespace": true,
         "no-inferrable-types": true,
         "no-null": true,
-        "boolean-trivia": true
+        "boolean-trivia": true,
+        "type-operator-spacing": true,
+        "prefer-const": true
   }
 }